bump v0.9.10

8 files changed, 44 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5efa30ee359..80e503a739e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lokinet
 	pkgdesc = Anonymous, decentralized and IP based overlay network for the internet.
-	pkgver = 0.9.9
-	pkgrel = 2
+	pkgver = 0.9.10
+	pkgrel = 1
 	url = https://lokinet.org
 	install = lokinet.install
 	arch = x86_64
@@ -16,33 +16,29 @@ pkgbase = lokinet
 	depends = curl
 	depends = zeromq
 	depends = unbound
-	depends = sqlite
 	depends = jemalloc
 	depends = systemd-libs
-	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.9/lokinet-v0.9.9.tar.xz
-	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.9/lokinet-v0.9.9.tar.xz.sig
+	depends = spdlog
+	depends = fmt
+	backup = etc/loki/lokinet.ini
+	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.10/lokinet-v0.9.10.tar.xz
+	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.10/lokinet-v0.9.10.tar.xz.sig
 	source = lokinet.conf
 	source = lokinet.service
 	source = lokinet-vpn@.service
-	source = lokinet-bootstrap.service
-	source = lokinet-default-config.service
 	source = lokinet-resume.service
 	source = lokinet.sysusers
 	source = lokinet.tmpfiles
-	source = lokinet.pkla
 	source = lokinet.rules
 	validpgpkeys = 2CE6F2743138825B7A7E521D025C02EE3A092F2D
-	sha256sums = 084a515103f32d8dcb519837054348b04e35157dd062e87bbee38b214973b72c
+	sha256sums = 63425acf842a047704036390f311ef21bbbf1c1788dfb4eb3c490afdf9d36ccd
 	sha256sums = SKIP
 	sha256sums = ff5e7db4e65463e50978da0185487bd4a7f213f04bdb6256e221089f833c6ab6
-	sha256sums = 3394974bee43a920e2c5bc6363b50cb7de85cce1c189b727edc43f5b8fcee9ea
+	sha256sums = ffd87df5d7a6d8b7416577a87e89f79c54930e0f14824c9831ad16f0ecfb6f42
 	sha256sums = 1c90e7e362bf33d824af70fcf7da509dcc166f9d1f9c90111d25c28905b81857
-	sha256sums = 21c9bc83f8466ab17fa927561d7f24f930f97c996a8aa0fbbbbb2b65cb97b342
-	sha256sums = 6ef779170b72856bbb8df40c34a808acffddd156684bdb66a55e71d50cf95841
 	sha256sums = bcf4bd7b38d2f054e25cc243353d3c9a56d1948b42ad07ee5c0260de06e8dd6c
 	sha256sums = 137cf7eeebc8737d62f3ccfad2398fb1c442a91cb9db7d650429b218dd949a00
-	sha256sums = 53837c9cfc90b93d55558045108a5d1d7a8b8a75a266af264d7f9101363d043f
-	sha256sums = e37178d0edaca5b764ed2381e4c670cb4a8c3565c6ab59533f2a783155fe1efc
+	sha256sums = b0d87fd610bbc7ef56148590dbc6ed6a68f36ec88db783f408a66c815705fd75
 	sha256sums = 6ea4d917ce2e46b2c31af31b8c8c28054c5f977bab5b050c44e2029ab3248713
 
 pkgname = lokinet
diff --git a/PKGBUILD b/PKGBUILD
index 54504980f9c1..a7b4560a6c46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,34 @@
 # Maintainer: nekgem2 <nekgem2@firemail.cc>
 pkgname=lokinet
-pkgver=0.9.9
-pkgrel=2
+pkgver=0.9.10
+pkgrel=1
 pkgdesc="Anonymous, decentralized and IP based overlay network for the internet."
 arch=('x86_64' 'aarch64')
 url="https://lokinet.org"
 license=('GPL3')
-depends=('libuv' 'libsodium' 'curl' 'zeromq' 'unbound' 'sqlite' 'jemalloc' 'systemd-libs')
+depends=('libuv' 'libsodium' 'curl' 'zeromq' 'unbound' 'jemalloc' 'systemd-libs' 'spdlog' 'fmt')
 makedepends=('cmake' 'git' 'python' 'systemd')
 install='lokinet.install'
+backup=('etc/loki/lokinet.ini')
 source=("https://github.com/oxen-io/lokinet/releases/download/v$pkgver/lokinet-v$pkgver.tar.xz"{,.sig}
         'lokinet.conf'
         'lokinet.service'
         'lokinet-vpn@.service'
-        'lokinet-bootstrap.service'
-        'lokinet-default-config.service'
         'lokinet-resume.service'
         'lokinet.sysusers'
         'lokinet.tmpfiles'
-        'lokinet.pkla'
         'lokinet.rules')
-sha256sums=('084a515103f32d8dcb519837054348b04e35157dd062e87bbee38b214973b72c'
+sha256sums=('63425acf842a047704036390f311ef21bbbf1c1788dfb4eb3c490afdf9d36ccd'
             'SKIP'
             'ff5e7db4e65463e50978da0185487bd4a7f213f04bdb6256e221089f833c6ab6'
-            '3394974bee43a920e2c5bc6363b50cb7de85cce1c189b727edc43f5b8fcee9ea'
+            'ffd87df5d7a6d8b7416577a87e89f79c54930e0f14824c9831ad16f0ecfb6f42'
             '1c90e7e362bf33d824af70fcf7da509dcc166f9d1f9c90111d25c28905b81857'
-            '21c9bc83f8466ab17fa927561d7f24f930f97c996a8aa0fbbbbb2b65cb97b342'
-            '6ef779170b72856bbb8df40c34a808acffddd156684bdb66a55e71d50cf95841'
             'bcf4bd7b38d2f054e25cc243353d3c9a56d1948b42ad07ee5c0260de06e8dd6c'
             '137cf7eeebc8737d62f3ccfad2398fb1c442a91cb9db7d650429b218dd949a00'
-            '53837c9cfc90b93d55558045108a5d1d7a8b8a75a266af264d7f9101363d043f'
-            'e37178d0edaca5b764ed2381e4c670cb4a8c3565c6ab59533f2a783155fe1efc'
+            'b0d87fd610bbc7ef56148590dbc6ed6a68f36ec88db783f408a66c815705fd75'
             '6ea4d917ce2e46b2c31af31b8c8c28054c5f977bab5b050c44e2029ab3248713')
 validpgpkeys=('2CE6F2743138825B7A7E521D025C02EE3A092F2D') # Jeff Becker (probably not evil) <jeff@lokinet.io> https://lokinet.io/jeff.asc
 
-prepare() {
-	cd "lokinet-v$pkgver"
-
-	# endless warnings because this undef won't work so just strip it out
-	sed -i 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 //' CMakeLists.txt
-}
-
 build() {
 	cd "lokinet-v$pkgver"
 
@@ -62,6 +50,7 @@ build() {
 		-DBUILD_LIBLOKINET=OFF \
 		-DFORCE_OXENMQ_SUBMODULE=ON \
 		-DFORCE_OXENC_SUBMODULE=ON \
+		-DWITH_PEERSTATS_BACKEND=OFF \
 		-Wno-dev \
 		..
 	make
@@ -75,12 +64,10 @@ package() {
 
 	install -D -m 644 "$srcdir/lokinet.service"                "$pkgdir/usr/lib/systemd/system/lokinet.service"
 	install -D -m 644 "$srcdir/lokinet-vpn@.service"           "$pkgdir/usr/lib/systemd/system/lokinet-vpn@.service"
-	install -D -m 644 "$srcdir/lokinet-bootstrap.service"      "$pkgdir/usr/lib/systemd/system/lokinet-bootstrap.service"
-	install -D -m 644 "$srcdir/lokinet-default-config.service" "$pkgdir/usr/lib/systemd/system/lokinet-default-config.service"
 	install -D -m 644 "$srcdir/lokinet-resume.service"         "$pkgdir/usr/lib/systemd/system/lokinet-resume.service"
 	install -D -m 644 "$srcdir/lokinet.sysusers"               "$pkgdir/usr/lib/sysusers.d/lokinet.conf"
 	install -D -m 644 "$srcdir/lokinet.tmpfiles"               "$pkgdir/usr/lib/tmpfiles.d/lokinet.conf"
-	install -D -m 644 "$srcdir/lokinet.pkla"                   "$pkgdir/var/lib/polkit-1/localauthority/10-vendor.d/lokinet.pkla"
 	install -D -m 750 -d "$pkgdir/usr/share/polkit-1/rules.d"
 	install -D -m 644 "$srcdir/lokinet.rules"                  "$pkgdir/usr/share/polkit-1/rules.d/lokinet.rules"
+	install -D -m 750 -d "$pkgdir/etc/loki"
 }
diff --git a/lokinet-bootstrap.service b/lokinet-bootstrap.service
deleted file mode 100644
index bfaa21059708..000000000000
--- a/lokinet-bootstrap.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Lokinet bootstrap
-ConditionFileNotEmpty=!/var/lib/lokinet/bootstrap.signed
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=oneshot
-User=lokinet
-WorkingDirectory=/var/lib/lokinet
-ExecStart=/usr/bin/lokinet-bootstrap lokinet bootstrap.signed
diff --git a/lokinet-default-config.service b/lokinet-default-config.service
deleted file mode 100644
index aa2523263b09..000000000000
--- a/lokinet-default-config.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Lokinet default config generator
-ConditionPathExists=!/var/lib/lokinet/lokinet.ini
-Wants=local-fs.target
-After=local-fs.target
-
-[Service]
-Type=oneshot
-User=lokinet
-WorkingDirectory=/var/lib/lokinet
-# at the time of writing it generates wrong paths when invoked without explicit path
-ExecStart=/usr/bin/lokinet -g ./lokinet.ini
diff --git a/lokinet.install b/lokinet.install
index 114ea34cc319..1040d115c35a 100644
--- a/lokinet.install
+++ b/lokinet.install
@@ -1,26 +1,35 @@
 
-del_seed() {
-	seed_date=$(date -r var/lib/lokinet/bootstrap.signed +%s 2>/dev/null || :)
-	if [ -z "$seed_date" ]
+migrate_config() {
+	if [ ! -e etc/loki/lokinet.ini ]
 	then
-		# no seed
-		return
+		if [ -f var/lib/lokinet/lokinet.ini ]
+		then
+			cp -f var/lib/lokinet/lokinet.ini etc/loki/lokinet.ini.new
+			mv -f etc/loki/lokinet.ini{.new,}
+			ln -sf /etc/loki/lokinet.ini var/lib/lokinet/lokinet.ini.new
+			mv -f var/lib/lokinet/lokinet.ini{.new,}
+		else
+			pushd etc/loki/ >/dev/null
+			rm -f lokinet.ini.new
+			/usr/bin/lokinet -g ./lokinet.ini.new >/dev/null 2>&1
+			mv -f lokinet.ini{.new,}
+			popd >/dev/null
+			ln -sf /etc/loki/lokinet.ini var/lib/lokinet/lokinet.ini.new
+			mv -f var/lib/lokinet/lokinet.ini{.new,}
+		fi
 	fi
+}
 
-	if [ "$seed_date" -lt 1623964915 ]
-	then
-		# remove old seed because it changed at some point
-		rm -f var/lib/lokinet/bootstrap.signed
-	fi
+del_seed() {
+	rm -f var/lib/lokinet/bootstrap.signed
 }
 
 post_install() {
+	migrate_config
 	del_seed
 
 	cat <<-EOF
-		  To generate default config (optional, will be invoked by lokinet service if needed):
-		    systemctl start lokinet-default-config
-		  To adjust upstream DNS servers and other options, edit /var/lib/lokinet/lokinet.ini
+		  To adjust upstream DNS servers and other options, edit /etc/loki/lokinet.ini
 		  To start lokinet:
 		    systemctl start lokinet
 		  To get .loki domains resolve, enable systemd-resolved: https://wiki.archlinux.org/index.php/Systemd-resolved
@@ -30,5 +39,6 @@ post_install() {
 }
 
 post_upgrade() {
+	migrate_config
 	del_seed
 }
diff --git a/lokinet.pkla b/lokinet.pkla
deleted file mode 100644
index ccd15cb8343f..000000000000
--- a/lokinet.pkla
+++ /dev/null
@@ -1,4 +0,0 @@
-[Allow lokinet to set DNS settings]
-Identity=unix-user:lokinet
-Action=org.freedesktop.resolve1.set-dns-servers;org.freedesktop.resolve1.set-domains
-ResultAny=yes
diff --git a/lokinet.service b/lokinet.service
index ce82e11d8185..ec98886e486b 100644
--- a/lokinet.service
+++ b/lokinet.service
@@ -2,10 +2,6 @@
 Description=Lokinet: Anonymous Network layer thingydoo
 Wants=network-online.target
 After=network-online.target
-Wants=lokinet-bootstrap.service
-After=lokinet-bootstrap.service
-Wants=lokinet-default-config.service
-After=lokinet-default-config.service
 Wants=modprobe@tun.service
 After=modprobe@tun.service
 
@@ -17,7 +13,7 @@ SyslogIdentifier=lokinet
 WorkingDirectory=/var/lib/lokinet
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
 AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/lokinet lokinet.ini
+ExecStart=/usr/bin/lokinet ./lokinet.ini
 Restart=always
 RestartSec=5s
 
diff --git a/lokinet.tmpfiles b/lokinet.tmpfiles
index 2afd4a4bc7a8..6cd121ff6ce1 100644
--- a/lokinet.tmpfiles
+++ b/lokinet.tmpfiles
@@ -1 +1,2 @@
 d /var/lib/lokinet 0700 lokinet lokinet - -
+z /etc/loki        0750 root    lokinet - -