Fedora/34 v0.9.9 upgrade

.gitmodules

@@ -17,9 +17,6 @@
 	path = external/pybind11
 	url = https://github.com/pybind/pybind11
 	branch = stable
-[submodule "external/clang-format-hooks"]
-	path = external/clang-format-hooks
-	url = https://github.com/barisione/clang-format-hooks/
 [submodule "external/sqlite_orm"]
 	path = external/sqlite_orm
 	url = https://github.com/fnc12/sqlite_orm
@@ -35,3 +32,7 @@
 [submodule "external/ngtcp2"]
 	path = external/ngtcp2
 	url = https://github.com/ngtcp2/ngtcp2.git
+	branch = v0.1.0
+[submodule "external/oxen-encoding"]
+	path = external/oxen-encoding
+	url = https://github.com/oxen-io/oxen-encoding.git

CMakeLists.txt

@@ -5,8 +5,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # Has to be set before `project()`, and ignored on non-macos:
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)")
 
+option(BUILD_DAEMON "build lokinet daemon and associated utils" ON)
+
+
 set(LANGS C CXX)
-if(APPLE)
+if(APPLE AND BUILD_DAEMON)
   set(LANGS ${LANGS} OBJC Swift)
 endif()
 
@@ -22,7 +25,7 @@ endif()
 
 
 project(lokinet
-    VERSION 0.9.8
+    VERSION 0.9.9
     DESCRIPTION "lokinet - IP packet onion router"
     LANGUAGES ${LANGS})
 
@@ -32,16 +35,15 @@ if(APPLE)
     set(LOKINET_APPLE_BUILD 0)
 endif()
 
-set(RELEASE_MOTTO "A Series of Tubes" CACHE STRING "Release motto")
+set(RELEASE_MOTTO "Gluten Free Edition" CACHE STRING "Release motto")
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
-add_definitions(-DLLARP_VERSION_MAJOR=${lokinet_VERSION_MAJOR})
-add_definitions(-DLLARP_VERSION_MINOR=${lokinet_VERSION_MINOR})
-add_definitions(-DLLARP_VERSION_PATCH=${lokinet_VERSION_PATCH})
-if(RELEASE_MOTTO AND CMAKE_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]")
-  add_definitions(-DLLARP_RELEASE_MOTTO="${RELEASE_MOTTO}")
+set(DEFAULT_WITH_BOOTSTRAP ON)
+if(APPLE)
+  set(DEFAULT_WITH_BOOTSTRAP OFF)
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
 # Core options
 option(USE_AVX2 "enable avx2 code" OFF)
@@ -57,12 +59,16 @@ option(WITH_COVERAGE "generate coverage data" OFF)
 option(USE_SHELLHOOKS "enable shell hooks on compile time (dangerous)" OFF)
 option(WARNINGS_AS_ERRORS "treat all warnings as errors. turn off for development, on for release" OFF)
 option(TRACY_ROOT "include tracy profiler source" OFF)
-option(WITH_TESTS "build unit tests" ON)
+option(WITH_TESTS "build unit tests" OFF)
 option(WITH_HIVE "build simulation stubs" OFF)
 option(BUILD_PACKAGE "builds extra components for making an installer (with 'make package')" OFF)
+option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ${DEFAULT_WITH_BOOTSTRAP})
 
 include(cmake/enable_lto.cmake)
 
+option(CROSS_PLATFORM "cross compiler platform" "Linux")
+option(CROSS_PREFIX "toolchain cross compiler prefix" "")
+
 option(BUILD_STATIC_DEPS "Download, build, and statically link against core dependencies" OFF)
 option(STATIC_LINK "link statically against dependencies" ${BUILD_STATIC_DEPS})
 if(BUILD_STATIC_DEPS AND NOT STATIC_LINK)
@@ -95,7 +101,6 @@ include(cmake/target_link_libraries_system.cmake)
 include(cmake/add_import_library.cmake)
 include(cmake/add_log_tag.cmake)
 include(cmake/libatomic.cmake)
-include(cmake/link_dep_libs.cmake)
 
 if (STATIC_LINK)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
@@ -170,19 +175,36 @@ if(NOT TARGET sodium)
   export(TARGETS sodium NAMESPACE sodium:: FILE sodium-exports.cmake)
 endif()
 
+option(FORCE_OXENC_SUBMODULE "force using oxen-encoding submodule" OFF)
+if(NOT FORCE_OXENC_SUBMODULE)
+  pkg_check_modules(OXENC liboxenc>=1.0.3 IMPORTED_TARGET)
+endif()
+
+if(OXENC_FOUND)
+  if(NOT TARGET PkgConfig::OXENC AND CMAKE_VERSION VERSION_LESS "3.21")
+    # Work around cmake bug 22180 (PkgConfig::OXENC not set if no flags needed):
+    add_library(_empty_oxenc INTERFACE)
+    add_library(oxenc::oxenc ALIAS _empty_oxenc)
+  else()
+    add_library(oxenc::oxenc ALIAS PkgConfig::OXENC)
+  endif()
+  message(STATUS "Found system liboxenc ${OXENC_VERSION}")
+else()
+  message(STATUS "using oxen-encoding submodule")
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/oxen-encoding)
+  add_library(oxenc::oxenc ALIAS oxenc)
+endif()
+
 option(FORCE_OXENMQ_SUBMODULE "force using oxenmq submodule" OFF)
 if(NOT FORCE_OXENMQ_SUBMODULE)
-  pkg_check_modules(OXENMQ liboxenmq>=1.2.4)
+  pkg_check_modules(OXENMQ liboxenmq>=1.2.12 IMPORTED_TARGET)
 endif()
 if(OXENMQ_FOUND)
-  add_library(oxenmq INTERFACE)
-  link_dep_libs(oxenmq INTERFACE "${OXENMQ_LIBRARY_DIRS}" ${OXENMQ_LIBRARIES})
-  target_include_directories(oxenmq INTERFACE ${OXENMQ_INCLUDE_DIRS})
-  add_library(oxenmq::oxenmq ALIAS oxenmq)
+  add_library(oxenmq::oxenmq ALIAS PkgConfig::OXENMQ)
   message(STATUS "Found system liboxenmq ${OXENMQ_VERSION}")
 else()
   message(STATUS "using oxenmq submodule")
-  add_subdirectory(${CMAKE_SOURCE_DIR}/external/oxen-mq)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/oxen-mq)
 endif()
 
 
@@ -327,8 +349,9 @@ endif()
 
 add_subdirectory(crypto)
 add_subdirectory(llarp)
-add_subdirectory(daemon)
-
+if(BUILD_DAEMON)
+  add_subdirectory(daemon)
+endif()
 
 if(WITH_HIVE)
   add_subdirectory(pybind)

LICENSE.txt → LICENSE

@@ -1,16 +1,3 @@
-LokiNET is the reference implementation of LLARP (Low Latency Anonymous 
-Routing Protocol).
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Copyright (c) 2018-2020 The Loki Project
-Copyright (c) 2018-2020 Jeff Becker
-Windows NT port and portions Copyright (c) 2018-2020 Rick V.
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -684,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

SOURCES/default-dns.patch

@@ -1,8 +1,17 @@
+From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001
+From: necro-nemsis <[email protected]>
+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__
@@ -14,3 +23,5 @@ index 78d152602..8b07b0cec 100644
  #else
      constexpr Default DefaultDNSBind{"127.0.0.1:53"};
  #endif
+--
+2.30.2

SPECS/lokinet.spec

@@ -1,5 +1,5 @@
 Name:           lokinet
-Version:        0.9.8
+Version:        0.9.9
 Release:        1%{?dist}
 Summary:        Lokinet anonymous, decentralized overlay network
 
@@ -13,7 +13,6 @@ BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
 BuildRequires:  libuv-devel
-BuildRequires:  oxenmq-devel
 BuildRequires:  unbound-devel
 BuildRequires:  libsodium-devel
 BuildRequires:  systemd-devel
@@ -22,11 +21,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 +81,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 +97,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,6 +153,12 @@ fi
 %systemd_postun lokinet.service
 
 %changelog
+* Wed Jun 29 2022 Technical Tumbleweed <[email protected]> - 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 <[email protected]> - 0.9.8-1
 - bump version
 

cmake/GenVersion.cmake

@@ -57,4 +57,4 @@ else()
     endif()
 endif()
 
-configure_file("${SRC}" "${DEST}")
+configure_file("${SRC}" "${DEST}" @ONLY)