From 55a95967241f37130d57efc321f59a2074f0d917 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Mon, 19 Dec 2022 15:29:29 -0400 Subject: [PATCH] RPM cleanups - We don't need sqlite anymore (it will likely come back at some point, but for .10/.11 it isn't used). - Drop the file-not-empty assertion from the service file. This isn't wanted anymore as having no bootstrap is now perfectly acceptable (lokinet has the default bootstrap built-in now). - Remove obsolete patch (applied in .10). - Copy bootstrap.signed from contrib rather than having an extra copy in SOURCES. --- SOURCES/default-dns.patch | 27 --------------------------- SOURCES/lokinet.service | 1 - SPECS/lokinet.spec | 9 +++------ 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 SOURCES/default-dns.patch diff --git a/SOURCES/default-dns.patch b/SOURCES/default-dns.patch deleted file mode 100644 index 32b7cc014..000000000 --- a/SOURCES/default-dns.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001 -From: necro-nemsis -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.0.0.1:953"}; - #else - constexpr Default DefaultDNSBind{"127.0.0.1:53"}; - #endif --- -2.30.2 diff --git a/SOURCES/lokinet.service b/SOURCES/lokinet.service index 3b0e990d0..a54a51a6c 100644 --- a/SOURCES/lokinet.service +++ b/SOURCES/lokinet.service @@ -1,6 +1,5 @@ [Unit] Description=LokiNET: Anonymous Network layer thingydoo, client -AssertFileNotEmpty=/var/lib/lokinet/bootstrap.signed Wants=network-online.target After=network-online.target diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index fb5afcb2c..9096bfacb 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -19,11 +19,6 @@ BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros BuildRequires: libcurl-devel BuildRequires: jemalloc-devel -BuildRequires: libsqlite3x-devel - -# 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. -# Patch1: default-dns.patch Requires: lokinet-bin = %{version}-%{release} %{?systemd_requires} @@ -92,7 +87,7 @@ install -m755 contrib/py/admin/lokinetmon $RPM_BUILD_ROOT/%{_bindir}/ install -Dm644 SOURCES/lokinet.service $RPM_BUILD_ROOT/%{_unitdir}/lokinet.service install -Dm644 contrib/systemd-resolved/lokinet.rules $RPM_BUILD_ROOT/%{_datadir}/polkit-1/rules.d/50-lokinet.rules install -Dm644 SOURCES/dnssec-lokinet.negative $RPM_BUILD_ROOT%{_exec_prefix}/lib/dnssec-trust-anchors.d/lokinet.negative -install -Dm644 SOURCES/bootstrap.signed $RPM_BUILD_ROOT%{_sharedstatedir}/lokinet/bootstrap.signed +install -Dm644 contrib/bootstrap/mainnet.signed $RPM_BUILD_ROOT%{_sharedstatedir}/lokinet/bootstrap.signed %files @@ -158,6 +153,8 @@ fi - remove dns Patch1 - remove external/date submodule - external/oxen-logging & gui submodule added during merge +- [jason@oxen.io] remove no-longer-rerequired sqlite dependency +- [jason@oxen.io] remove no-longer-wanted assertion from service file * Wed Jun 29 2022 Technical Tumbleweed - 0.9.9-1 - bump version