bump

2 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63039c5322de..0f8747f5e9de 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.5
-	pkgrel = 3
+	pkgver = 0.9.7
+	pkgrel = 1
 	url = https://lokinet.org
 	install = lokinet.install
 	arch = x86_64
@@ -17,9 +17,11 @@ pkgbase = lokinet
 	depends = sqlite
 	depends = ngtcp2
 	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.5/lokinet-v0.9.5.tar.xz
-	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.5/lokinet-v0.9.5.tar.xz.sig
+	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.7/lokinet-v0.9.7.tar.xz
+	source = https://github.com/oxen-io/lokinet/releases/download/v0.9.7/lokinet-v0.9.7.tar.xz.sig
+	source = https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz
 	source = lokinet.conf
 	source = lokinet.service
 	source = lokinet-vpn.service
@@ -30,10 +32,10 @@ pkgbase = lokinet
 	source = lokinet.tmpfiles
 	source = lokinet.pkla
 	source = lokinet.rules
-	source = fix-stl-oob.patch
 	validpgpkeys = 67EF6BA68E7B0B0D6EB4F7D4F357B3B42F6F9B05
-	sha256sums = 456d4e6baf2357c98a46c3453f98bb7b5f906620d4fb07984df1bad46faed307
+	sha256sums = 5471bd00d9d22de98be191c57745e37f4a72f50b42abf73acd9b61fa4f3006c4
 	sha256sums = SKIP
+	sha256sums = 9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2
 	sha256sums = ff5e7db4e65463e50978da0185487bd4a7f213f04bdb6256e221089f833c6ab6
 	sha256sums = 41f02f6ca693cd596165a7431795f36a2559504361857063278d31f833b3b7b1
 	sha256sums = cb31c1783998ec11d3d6eb4e5e4e138a8d423ee1aeb0ae2ebe66a52b0f87b642
@@ -44,6 +46,5 @@ pkgbase = lokinet
 	sha256sums = 53837c9cfc90b93d55558045108a5d1d7a8b8a75a266af264d7f9101363d043f
 	sha256sums = e37178d0edaca5b764ed2381e4c670cb4a8c3565c6ab59533f2a783155fe1efc
 	sha256sums = 6ea4d917ce2e46b2c31af31b8c8c28054c5f977bab5b050c44e2029ab3248713
-	sha256sums = b0a9e5500f225d103737b7525f824bfca58034623e8bc93ff355d857170932cd
 
 pkgname = lokinet
diff --git a/PKGBUILD b/PKGBUILD
index 944b29af5dea..7bdc0a8a2095 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: nekgem2 <nekgem2@firemail.cc>
 pkgname=lokinet
-pkgver=0.9.5
-pkgrel=3
+pkgver=0.9.7
+pkgrel=1
 pkgdesc="Anonymous, decentralized and IP based overlay network for the internet."
 arch=('x86_64' 'aarch64')
 url="https://lokinet.org"
@@ -11,6 +11,7 @@ makedepends=('git' 'cmake')
 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'
@@ -20,10 +21,11 @@ source=("https://github.com/oxen-io/lokinet/releases/download/v$pkgver/lokinet-v
         'lokinet.sysusers'
         'lokinet.tmpfiles'
         'lokinet.pkla'
-        'lokinet.rules'
-        'fix-stl-oob.patch')
-sha256sums=('456d4e6baf2357c98a46c3453f98bb7b5f906620d4fb07984df1bad46faed307'
+        'lokinet.rules')
+noextract=('zeromq-4.3.3.tar.gz')
+sha256sums=('5471bd00d9d22de98be191c57745e37f4a72f50b42abf73acd9b61fa4f3006c4'
             'SKIP'
+            '9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2'
             'ff5e7db4e65463e50978da0185487bd4a7f213f04bdb6256e221089f833c6ab6'
             '41f02f6ca693cd596165a7431795f36a2559504361857063278d31f833b3b7b1'
             'cb31c1783998ec11d3d6eb4e5e4e138a8d423ee1aeb0ae2ebe66a52b0f87b642'
@@ -33,19 +35,18 @@ sha256sums=('456d4e6baf2357c98a46c3453f98bb7b5f906620d4fb07984df1bad46faed307'
             '137cf7eeebc8737d62f3ccfad2398fb1c442a91cb9db7d650429b218dd949a00'
             '53837c9cfc90b93d55558045108a5d1d7a8b8a75a266af264d7f9101363d043f'
             'e37178d0edaca5b764ed2381e4c670cb4a8c3565c6ab59533f2a783155fe1efc'
-            '6ea4d917ce2e46b2c31af31b8c8c28054c5f977bab5b050c44e2029ab3248713'
-            'b0a9e5500f225d103737b7525f824bfca58034623e8bc93ff355d857170932cd')
+            '6ea4d917ce2e46b2c31af31b8c8c28054c5f977bab5b050c44e2029ab3248713')
 validpgpkeys=('67EF6BA68E7B0B0D6EB4F7D4F357B3B42F6F9B05') # Jeff Becker (probably not evil) <jeff@i2p.rocks>
 
-prepare() {
-    cd "$pkgname-v$pkgver"
-    patch --forward --strip=1 --input="${srcdir}/fix-stl-oob.patch"
-}
-
 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 \
@@ -53,15 +54,14 @@ build() {
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DNATIVE_BUILD=OFF \
-		-DUSE_NETNS=OFF \
 		-DUSE_AVX2=OFF \
-		-DXSAN=OFF \
 		-DWITH_TESTS=OFF \
 		-DDOWNLOAD_SODIUM=OFF \
 		-DSUBMODULE_CHECK=OFF \
 		-DWITH_SYSTEMD=ON \
+		-DWITH_SETCAP=OFF \
+		-DBUILD_LIBLOKINET=OFF \
 		-DFORCE_OXENMQ_SUBMODULE=ON \
-		-DBUILD_SHARED_LIBS=ON \
 		-Wno-dev \
 		..
 	make