Update patch and SPEC

SOURCES/default-dns.patch

@@ -1,26 +1,28 @@
-From: Jason Rhinelander <jason@imaginary.ca>
-Date: Wed, 18 May 2022 12:47:59 -0300
-Subject: Change default DNS to 127.0.0.1:953
+From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001
+From: necro-nemsis <necro_nemesis@hotmail.com>
+Date: Sun, 19 Jun 2022 06:47:01 -0400
+Subject: [PATCH] Change default port to 953
 
-This is a needed workaround for a systemd resolved bug 23010, until
-0.9.10 comes out (which will have a better fix to listen on both
-127.3.2.1 + 127.0.0.1:random-high-port).
 ---
- llarp/config/config.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ llarp/config/config.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
-index 6bff961..a01f560 100644
+index 6bff9611..9c89bce6 100644
 --- a/llarp/config/config.cpp
 +++ b/llarp/config/config.cpp
-@@ -760,7 +760,9 @@ namespace llarp
+@@ -760,7 +760,10 @@ namespace llarp
      // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on
      // 127.0.0.1:53.
  #ifdef __linux__
 -    constexpr Default DefaultDNSBind{"127.3.2.1:53"};
-+    // Workaround for systemd bug #23010 that breaks 127.0.0.0/8 resolvers on anything other than
-+    // 127.0.0.1.  (This is temporary, until lokinet PR #1888 is merged in 0.9.10).
-+    constexpr Default DefaultDNSBind{"127.0.0.1:953"};
++    // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons,
++    // however since systemd-resolved is perfectly happy with a different port so listen on
++    // localhost:953 as a workaround.
++    constexpr Default DefaultDNSBind{"127.3.2.1:953"};
  #else
      constexpr Default DefaultDNSBind{"127.0.0.1:53"};
  #endif
+-- 
+2.30.2
+

SOURCES/default-dns.patch.bak

@@ -1,28 +0,0 @@
-From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001
-From: necro-nemsis <necro_nemesis@hotmail.com>
-Date: Sun, 19 Jun 2022 06:47:01 -0400
-Subject: [PATCH] Change default port to 953
-
----
- llarp/config/config.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
-index 6bff9611..9c89bce6 100644
---- a/llarp/config/config.cpp
-+++ b/llarp/config/config.cpp
-@@ -760,7 +760,10 @@ namespace llarp
-     // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on
-     // 127.0.0.1:53.
- #ifdef __linux__
--    constexpr Default DefaultDNSBind{"127.3.2.1:53"};
-+    // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons,
-+    // however since systemd-resolved is perfectly happy with a different port so listen on
-+    // localhost:953 as a workaround.
-+    constexpr Default DefaultDNSBind{"127.3.2.1:953"};
- #else
-     constexpr Default DefaultDNSBind{"127.0.0.1:53"};
- #endif
--- 
-2.30.2
-

SOURCES/default-dns.patch.jason

@@ -0,0 +1,26 @@
+From: Jason Rhinelander <jason@imaginary.ca>
+Date: Wed, 18 May 2022 12:47:59 -0300
+Subject: Change default DNS to 127.0.0.1:953
+
+This is a needed workaround for a systemd resolved bug 23010, until
+0.9.10 comes out (which will have a better fix to listen on both
+127.3.2.1 + 127.0.0.1:random-high-port).
+---
+ llarp/config/config.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
+index 6bff961..a01f560 100644
+--- a/llarp/config/config.cpp
++++ b/llarp/config/config.cpp
+@@ -760,7 +760,9 @@ namespace llarp
+     // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on
+     // 127.0.0.1:53.
+ #ifdef __linux__
+-    constexpr Default DefaultDNSBind{"127.3.2.1:53"};
++    // Workaround for systemd bug #23010 that breaks 127.0.0.0/8 resolvers on anything other than
++    // 127.0.0.1.  (This is temporary, until lokinet PR #1888 is merged in 0.9.10).
++    constexpr Default DefaultDNSBind{"127.0.0.1:953"};
+ #else
+     constexpr Default DefaultDNSBind{"127.0.0.1:53"};
+ #endif

SPECS/lokinet.spec

@@ -154,8 +154,11 @@ fi
 %systemd_postun lokinet.service
 
 %changelog
-* Sat Jun 18 2022 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.8-1
-- 0.9.9 release
+* Wed Jun 29 2022 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.9-1
+- bump version
+- cmake flags for no system library search
+- update port patch
+- remove version patch
 
 * Wed Nov 17 2021 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.8-1
 - bump version