bump, tweak lokinet-vpn

6 files changed, 23 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 385fc1b45342..d1685d760751 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = lokinet
 	pkgdesc = Anonymous, decentralized and IP based overlay network for the internet.
-	pkgver = 0.9.8
+	pkgver = 0.9.9
 	pkgrel = 1
 	url = https://lokinet.org
 	install = lokinet.install
 	arch = x86_64
 	arch = aarch64
 	license = GPL3
-	makedepends = git
 	makedepends = cmake
+	makedepends = git
 	depends = libuv
 	depends = libsodium
 	depends = curl
@@ -16,14 +16,11 @@ pkgbase = lokinet
 	depends = unbound
 	depends = sqlite
 	depends = jemalloc
-	noextract = zeromq-4.3.3.tar.gz
-	backup = etc/conf.d/lokinet
-	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.8/lokinet-v0.9.8.tar.xz
-	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.8/lokinet-v0.9.8.tar.xz.sig
-	source = https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz
+	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
 	source = lokinet.conf
 	source = lokinet.service
-	source = lokinet-vpn.service
+	source = lokinet-vpn@.service
 	source = lokinet-bootstrap.service
 	source = lokinet-default-config.service
 	source = lokinet-resume.service
@@ -31,13 +28,12 @@ pkgbase = lokinet
 	source = lokinet.tmpfiles
 	source = lokinet.pkla
 	source = lokinet.rules
-	validpgpkeys = 67EF6BA68E7B0B0D6EB4F7D4F357B3B42F6F9B05
-	sha256sums = c129b942022634899f21706378bba0a3cf79f1f44d22f707267407a57206f190
+	validpgpkeys = 2CE6F2743138825B7A7E521D025C02EE3A092F2D
+	sha256sums = 084a515103f32d8dcb519837054348b04e35157dd062e87bbee38b214973b72c
 	sha256sums = SKIP
-	sha256sums = 9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2
 	sha256sums = ff5e7db4e65463e50978da0185487bd4a7f213f04bdb6256e221089f833c6ab6
-	sha256sums = d23a6e591dfa141de11ff9646dd10f3e2e6fccd6936f6ff390030363e05128c4
-	sha256sums = cb31c1783998ec11d3d6eb4e5e4e138a8d423ee1aeb0ae2ebe66a52b0f87b642
+	sha256sums = 3394974bee43a920e2c5bc6363b50cb7de85cce1c189b727edc43f5b8fcee9ea
+	sha256sums = 1c90e7e362bf33d824af70fcf7da509dcc166f9d1f9c90111d25c28905b81857
 	sha256sums = 21c9bc83f8466ab17fa927561d7f24f930f97c996a8aa0fbbbbb2b65cb97b342
 	sha256sums = 6ef779170b72856bbb8df40c34a808acffddd156684bdb66a55e71d50cf95841
 	sha256sums = bcf4bd7b38d2f054e25cc243353d3c9a56d1948b42ad07ee5c0260de06e8dd6c
diff --git a/.gitignore b/.gitignore
index 6532ce4ba0b5..30fd76589d94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /src
 /pkg
 /lokinet-*.tar.*
-/zeromq-*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index fcc99abd9e56..550b88b126f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # Maintainer: nekgem2 <nekgem2@firemail.cc>
 pkgname=lokinet
-pkgver=0.9.8
+pkgver=0.9.9
 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')
-makedepends=('git' 'cmake')
+makedepends=('cmake' 'git')
 install='lokinet.install'
-backup=('etc/conf.d/lokinet')
 source=("https://github.com/oxen-io/lokinet/releases/download/v$pkgver/lokinet-v$pkgver.tar.xz"{,.sig}
-        "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"
         'lokinet.conf'
         'lokinet.service'
-        'lokinet-vpn.service'
+        'lokinet-vpn@.service'
         'lokinet-bootstrap.service'
         'lokinet-default-config.service'
         'lokinet-resume.service'
@@ -22,13 +20,11 @@ source=("https://github.com/oxen-io/lokinet/releases/download/v$pkgver/lokinet-v
         'lokinet.tmpfiles'
         'lokinet.pkla'
         'lokinet.rules')
-noextract=('zeromq-4.3.3.tar.gz')
-sha256sums=('c129b942022634899f21706378bba0a3cf79f1f44d22f707267407a57206f190'
+sha256sums=('084a515103f32d8dcb519837054348b04e35157dd062e87bbee38b214973b72c'
             'SKIP'
-            '9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2'
             'ff5e7db4e65463e50978da0185487bd4a7f213f04bdb6256e221089f833c6ab6'
-            'd23a6e591dfa141de11ff9646dd10f3e2e6fccd6936f6ff390030363e05128c4'
-            'cb31c1783998ec11d3d6eb4e5e4e138a8d423ee1aeb0ae2ebe66a52b0f87b642'
+            '3394974bee43a920e2c5bc6363b50cb7de85cce1c189b727edc43f5b8fcee9ea'
+            '1c90e7e362bf33d824af70fcf7da509dcc166f9d1f9c90111d25c28905b81857'
             '21c9bc83f8466ab17fa927561d7f24f930f97c996a8aa0fbbbbb2b65cb97b342'
             '6ef779170b72856bbb8df40c34a808acffddd156684bdb66a55e71d50cf95841'
             'bcf4bd7b38d2f054e25cc243353d3c9a56d1948b42ad07ee5c0260de06e8dd6c'
@@ -36,17 +32,13 @@ sha256sums=('c129b942022634899f21706378bba0a3cf79f1f44d22f707267407a57206f190'
             '53837c9cfc90b93d55558045108a5d1d7a8b8a75a266af264d7f9101363d043f'
             'e37178d0edaca5b764ed2381e4c670cb4a8c3565c6ab59533f2a783155fe1efc'
             '6ea4d917ce2e46b2c31af31b8c8c28054c5f977bab5b050c44e2029ab3248713')
-validpgpkeys=('67EF6BA68E7B0B0D6EB4F7D4F357B3B42F6F9B05') # Jeff Becker (probably not evil) <jeff@i2p.rocks>
+validpgpkeys=('2CE6F2743138825B7A7E521D025C02EE3A092F2D') # Jeff Becker (probably not evil) <jeff@lokinet.io> https://lokinet.io/jeff.asc
 
 build() {
 	cd "lokinet-v$pkgver"
 
 	rm -rf build && mkdir build && cd build
 
-	# do not let cmake access network
-	mkdir -p libzmq/src
-	cp "$srcdir/zeromq-4.3.3.tar.gz" libzmq/src/
-
 	# XXX cmake stuff overrides CFLAGS
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -62,6 +54,7 @@ build() {
 		-DWITH_SETCAP=OFF \
 		-DBUILD_LIBLOKINET=OFF \
 		-DFORCE_OXENMQ_SUBMODULE=ON \
+		-DFORCE_OXENC_SUBMODULE=ON \
 		-Wno-dev \
 		..
 	make
@@ -69,13 +62,12 @@ build() {
 
 package() {
 	cd "lokinet-v$pkgver"
-	install -D -m 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -D -m 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	cd build
 	make DESTDIR="$pkgdir" install
 
-	install -D -m 644 "$srcdir/lokinet.conf"                   "$pkgdir/etc/conf.d/lokinet"
 	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-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"
diff --git a/fix-stl-oob.patch b/fix-stl-oob.patch
deleted file mode 100644
index 95b0acab2e0f..000000000000
--- a/fix-stl-oob.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/llarp/util/str.cpp b/llarp/util/str.cpp
-index a87cfd9e..60090c3a 100644
---- a/llarp/util/str.cpp
-+++ b/llarp/util/str.cpp
-@@ -84,7 +84,7 @@ namespace llarp
-         last = next;
-
-         // advance to next non-delimiter
--        while (str[last] == delimiter and last < str_size)
-+        while (last < str_size and str[last] == delimiter)
-           last++;
-       }
-       else
diff --git a/lokinet-vpn.service b/lokinet-vpn@.service
index 61c0089dc9a7..d9254f5341d1 100644
--- a/lokinet-vpn.service
+++ b/lokinet-vpn@.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=LokiNET VPN tunnel: shove all traffic over lokinet
+Description=Lokinet VPN tunnel: shove all traffic over lokinet
 Requires=lokinet.service
 After=lokinet.service
 
 [Service]
-EnvironmentFile=/etc/conf.d/lokinet
+User=lokinet
 Type=oneshot
-ExecStart=/usr/bin/lokinet-vpn --up --exit $LOKINET_VPN_EXIT
+ExecStart=/usr/bin/lokinet-vpn --up --exit %i
 ExecStop=/usr/bin/lokinet-vpn --down
 RemainAfterExit=true
 
diff --git a/lokinet.service b/lokinet.service
index 11c737c558e2..ce82e11d8185 100644
--- a/lokinet.service
+++ b/lokinet.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=LokiNET: Anonymous Network layer thingydoo
+Description=Lokinet: Anonymous Network layer thingydoo
 Wants=network-online.target
 After=network-online.target
 Wants=lokinet-bootstrap.service