From 8bc0953c4fa094ffa156ad3e7b758cdcd9e85c73 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Sat, 20 Oct 2018 18:03:57 +0200
Subject: testing/nginx-naxsi: modernize and upgrade to 0.56

---
 testing/nginx-naxsi/APKBUILD | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'testing/nginx-naxsi')

diff --git a/testing/nginx-naxsi/APKBUILD b/testing/nginx-naxsi/APKBUILD
index 91c8938d03..aa364c3978 100644
--- a/testing/nginx-naxsi/APKBUILD
+++ b/testing/nginx-naxsi/APKBUILD
@@ -5,16 +5,16 @@
 
 pkgname=nginx-naxsi
 _pkgname=nginx
-pkgver=1.13.8
-pkgrel=2
+pkgver=1.15.5
+pkgrel=0
 pkgdesc="Lightweight HTTP and reverse proxy server with Naxsi WAF support, see also 'nxapi'"
-url="https://www.nginx.org/ | https://github.com/nbs-system/naxsi"
+url="https://github.com/nbs-system/naxsi"
 arch="all"
 license="custom"
 
 # Modules
 _ngx_naxsi_name=naxsi
-_ngx_naxsi_ver=0.55.3
+_ngx_naxsi_ver=0.56
 _ngx_naxsi_dir="$srcdir/$_ngx_naxsi_name-$_ngx_naxsi_ver/naxsi_src"
 
 _ngx_cache_purge_name=ngx_cache_purge
@@ -22,7 +22,7 @@ _ngx_cache_purge_ver=2.3.0.1
 _ngx_cache_purge_dir="$srcdir/$_ngx_cache_purge_name-$_ngx_cache_purge_ver"
 
 _ngx_upstream_fair_name=nginx-upstream-fair
-_ngx_upstream_fair_ver=0.1.2
+_ngx_upstream_fair_ver=0.1.3
 _ngx_upstream_fair_dir="$srcdir/$_ngx_upstream_fair_name-$_ngx_upstream_fair_ver"
 
 _ngx_http_sysguard_name=tengine-http-sysguard
@@ -42,7 +42,7 @@ subpackages="$pkgname-doc"
 source="https://nginx.org/download/$_pkgname-$pkgver.tar.gz
 	naxsi-$_ngx_naxsi_ver.tar.gz::https://github.com/nbs-system/$_ngx_naxsi_name/archive/$_ngx_naxsi_ver.tar.gz
 	ngx_cache_purge-$_ngx_cache_purge_ver.tar.gz::https://github.com/itoffshore/$_ngx_cache_purge_name/archive/v$_ngx_cache_purge_ver.tar.gz
-	upstream-fair-$_ngx_upstream_fair_ver.tar.gz::https://github.com/itoffshore/$_ngx_upstream_fair_name/archive/v$_ngx_upstream_fair_ver.tar.gz
+	upstream-fair-$_ngx_upstream_fair_ver.tar.gz::https://github.com/itoffshore/$_ngx_upstream_fair_name/archive/$_ngx_upstream_fair_ver.tar.gz
 	sysguard-$_ngx_http_sysguard_ver.tar.gz::https://github.com/itoffshore/$_ngx_http_sysguard_name/archive/v$_ngx_http_sysguard_ver.tar.gz
 
 	anonymise.patch
@@ -126,9 +126,8 @@ build() {
 		--add-dynamic-module="$_ngx_naxsi_dir" \
 		--add-dynamic-module="$_ngx_cache_purge_dir" \
 		--add-dynamic-module="$_ngx_upstream_fair_dir" \
-		--add-dynamic-module="$_ngx_http_sysguard_dir" \
-		|| return 1
-	make || return 1
+		--add-dynamic-module="$_ngx_http_sysguard_dir"
+	make
 }
 
 package() {
@@ -175,7 +174,7 @@ _module() {
 	mkdir -p "$subpkgdir"/$_modules_dir
 	cd "$subpkgdir"
 
-	mv "$pkgdir"/$_modules_dir/$soname ./$_modules_dir/$soname || return 1
+	mv "$pkgdir"/$_modules_dir/$soname ./$_modules_dir/$soname
 	mkdir -p "$subpkgdir"/etc/nginx/modules
 	echo "load_module \"modules/$soname\";" > ./etc/nginx/modules/$name.conf
 }
@@ -184,10 +183,10 @@ _mod_conf() {
 	local conf=$1 module=$2
 	install -Dm644 "$srcdir"/$conf ${pkgdir%/*}/$module/etc/nginx/conf.d/$conf
 }
-sha512sums="f2a4d41941ec223afcb57a6deb6523e0d4f54f96c7362835d366fa04a4b4578f6c4f27aa7774c1ecd40a42087df83e5c03d024e72caba83c558ec7e580c756a1  nginx-1.13.8.tar.gz
-9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0  naxsi-0.55.3.tar.gz
+sha512sums="90b3d8148fca183bd3f6d16fd9212e2eedbe13f151c079d67086fca5a9f58256b99a87b4444ee18b1f9fb2b65fbe2d5353985145e1c075b6236b31d0ce7e9051  nginx-1.15.5.tar.gz
+4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd  naxsi-0.56.tar.gz
 c49c81dbdb8bd507fccf31295e603cea8f0a964867c27eff0436dcea3b4a547c8ae2f11ecf49c4d82c693cf8138c17ebbed395738539d0d61254951e5f0db7e3  ngx_cache_purge-2.3.0.1.tar.gz
-4da7734301d21cd696fcc3aed1a496a93be15af373307487622c0a5920e79d9b580fd5836de7f9c0b60c01485021ba85afae1abb471e703c2d6e23c60ffe7d0a  upstream-fair-0.1.2.tar.gz
+8adb7453c27748f4e685e3352e9b318b408da818754dc5b6244e908423941a8ba337561104f6e481f2553cbc0e334dcea73b57f8e810a9d6e974bb69ff8859e5  upstream-fair-0.1.3.tar.gz
 2743d9aea60bd4984b650213e571cf27e6ff5b3db708242ccb53b8fc669d1cc82ee224ba79aee2f6969b6e13821cfdd3df7b412541e1fdbb867ecc95326e07e1  sysguard-2.2.0.tar.gz
 1117ca5887822e002d9995c041435fda53890614fd7309ea011a59bfb0df3261fc7ba8670e93aaee9116cda16b9806921a85f52c9959b093f2e5ac5df4d9b0fb  anonymise.patch
 cae9f842c3d1188730d4355440476ad2338b19c027c4b329efe88d4487e90d96bf60dea6feb4be6a6f96d4b356fc154345e32c2bb643d70f68e428df26330a49  ipv6.patch
-- 
cgit v1.2.3