Merge branch 'fedora/34' into fedora/35

SOURCES/default-dns.patch

@@ -1,8 +1,17 @@
+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 78d152602..8b07b0cec 100644
+index 6bff9611..9c89bce6 100644
 --- a/llarp/config/config.cpp
 +++ b/llarp/config/config.cpp
-@@ -703,7 +703,10 @@ 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__
@@ -10,7 +19,10 @@ index 78d152602..8b07b0cec 100644
 +    // 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.0.0.1:953"};
++    constexpr Default DefaultDNSBind{"127.3.2.1:953"};
  #else
      constexpr Default DefaultDNSBind{"127.0.0.1:53"};
  #endif
+-- 
+2.30.2
+

SOURCES/version-as-rpm-version.patch

@@ -1,28 +0,0 @@
-From: Jason Rhinelander <jason@imaginary.ca>
-Date: Fri, 13 Dec 2019 17:23:41 -0400
-Subject: Pass debian version as GIT_VERSION
-
----
- cmake/Version.cmake | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/cmake/Version.cmake b/cmake/Version.cmake
-index 45037a0..d9fdaef 100644
---- a/cmake/Version.cmake
-+++ b/cmake/Version.cmake
-@@ -1,4 +1,8 @@
- 
-+if(GIT_VERSION)
-+  set(VERSIONTAG "${GIT_VERSION}")
-+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
-+else()
- find_package(Git QUIET)
- set(GIT_INDEX_FILE "${PROJECT_SOURCE_DIR}/.git/index")
- if(EXISTS ${GIT_INDEX_FILE} AND ( GIT_FOUND OR Git_FOUND) )
-@@ -18,5 +22,6 @@ else()
-   set(VERSIONTAG "nogit")
-   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")
- endif()
-+endif()
- 
- add_custom_target(genversion DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")

SPECS/lokinet.spec

@@ -1,5 +1,9 @@
 Name:           lokinet
+<<<<<<< HEAD
 Version:        0.9.8
+=======
+Version:        0.9.9
+>>>>>>> fedora/34
 Release:        1%{?dist}
 Summary:        Lokinet anonymous, decentralized overlay network
 
@@ -22,11 +26,9 @@ BuildRequires:  libcurl-devel
 BuildRequires:  jemalloc-devel
 BuildRequires:  libsqlite3x-devel
 
-# Puts the rpm version instead of the git tag in the version string:
-Patch1: version-as-rpm-version.patch
 # Changes the default dns listener to 127.0.0.1:953 because Fedora's systemd-resolved doesn't like
 # talking to 127.3.2.1:53 for unknown reasons.
-Patch2: default-dns.patch
+Patch1: default-dns.patch
 
 Requires: lokinet-bin = %{version}-%{release}
 %{?systemd_requires}
@@ -84,7 +86,7 @@ export CFLAGS="%{optflags} -march=armv6 -mtune=cortex-a53 -mfloat-abi=hard -mfpu
 %endif
 
 %undefine __cmake_in_source_build
-%cmake -DNATIVE_BUILD=OFF -DUSE_AVX2=OFF -DWITH_TESTS=OFF %{cmake_extra_args} -DCMAKE_BUILD_TYPE=Release -DGIT_VERSION="%{release}" -DWITH_SETCAP=OFF -DSUBMODULE_CHECK=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_LIBLOKINET=OFF
+%cmake -DFORCE_OXENC_SUBMODULE=ON -DFORCE_OXENMQ_SUBMODULE=ON -DNATIVE_BUILD=OFF -DUSE_AVX2=OFF -DWITH_TESTS=OFF %{cmake_extra_args} -DCMAKE_BUILD_TYPE=Release -DLOKINET_VERSIONTAG=%{release} -DWITH_SETCAP=OFF -DSUBMODULE_CHECK=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_LIBLOKINET=OFF
 %cmake_build
 
 %install
@@ -100,7 +102,7 @@ install -Dm644 SOURCES/bootstrap.signed $RPM_BUILD_ROOT%{_sharedstatedir}/lokine
 
 %files
 
-%license LICENSE.txt
+%license LICENSE
 %doc readme.*
 %{_datadir}/polkit-1/rules.d/50-lokinet.rules
 %{_unitdir}/lokinet.service
@@ -156,9 +158,20 @@ fi
 %systemd_postun lokinet.service
 
 %changelog
+<<<<<<< HEAD
 * Wed Nov 17 2021 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.8-1
 - bump version
 - bumped to build Sat Nov 20 2021
+=======
+* 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
+>>>>>>> fedora/34
 
 * Wed Oct 20 2021 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.7-1
 - bump version