From 2bb1118a89715e9dc6fa6a026951475c3460f0aa Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Thu, 15 Dec 2022 05:32:49 -0500 Subject: [PATCH] Merge stable branch and bump version --- SPECS/lokinet.spec | 9 +++++++-- external/date | 1 - external/oxen-logging | 1 + gui | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 160000 external/date create mode 160000 external/oxen-logging create mode 160000 gui diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index e9a0c0a97..1d181823a 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -1,5 +1,5 @@ Name: lokinet -Version: 0.9.9 +Version: 0.9.11 Release: 1%{?dist} Summary: Lokinet anonymous, decentralized overlay network @@ -23,7 +23,7 @@ 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 +# Patch1: default-dns.patch Requires: lokinet-bin = %{version}-%{release} %{?systemd_requires} @@ -153,6 +153,11 @@ fi %systemd_postun lokinet.service %changelog +* Thurs Dec 15 2022 Technical Tumbleweed - 0.9.11-1 +- bump version +- remove dns Patch1 +- remove external/date submodule +- external/oxen-logging & gui submodule added during merge * Wed Jun 29 2022 Technical Tumbleweed - 0.9.9-1 - bump version - cmake flags for no system library search diff --git a/external/date b/external/date deleted file mode 160000 index cac99da8d..000000000 --- a/external/date +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cac99da8dc88be719a728dc1b597b0ac307c1800 diff --git a/external/oxen-logging b/external/oxen-logging new file mode 160000 index 000000000..9f2323a2d --- /dev/null +++ b/external/oxen-logging @@ -0,0 +1 @@ +Subproject commit 9f2323a2db5fc54fe8394892769eff859967f735 diff --git a/gui b/gui new file mode 160000 index 000000000..37f274e86 --- /dev/null +++ b/gui @@ -0,0 +1 @@ +Subproject commit 37f274e86fea7fe0fcc472727398d118a6917854