From cece691c51a90694a84bd8442fe548a700e104b1 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Mon, 20 May 2019 23:49:47 +0200
Subject: testing/nginx-naxsi: upgrade to 1.16.0

Closes GH-6504
---
 testing/nginx-naxsi/APKBUILD   | 11 +++--------
 testing/nginx-naxsi/ipv6.patch | 42 ------------------------------------------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 testing/nginx-naxsi/ipv6.patch

(limited to 'testing/nginx-naxsi')

diff --git a/testing/nginx-naxsi/APKBUILD b/testing/nginx-naxsi/APKBUILD
index 386022d8b1..30899b08b4 100644
--- a/testing/nginx-naxsi/APKBUILD
+++ b/testing/nginx-naxsi/APKBUILD
@@ -5,8 +5,8 @@
 
 pkgname=nginx-naxsi
 _pkgname=nginx
-pkgver=1.15.5
-pkgrel=2
+pkgver=1.16.0
+pkgrel=0
 pkgdesc="Lightweight HTTP and reverse proxy server with Naxsi WAF support, see also 'nxapi'"
 url="https://github.com/nbs-system/naxsi"
 arch="all"
@@ -46,7 +46,6 @@ source="https://nginx.org/download/$_pkgname-$pkgver.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
-	ipv6.patch
 	sysguard.patch
 
 	nginx.initd
@@ -77,7 +76,6 @@ done
 
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/var/lib/$_pkgname \
 		--sbin-path=/usr/sbin/$_pkgname \
@@ -131,8 +129,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
@@ -183,13 +179,12 @@ _mod_conf() {
 	local conf=$1 module=$2
 	install -Dm644 "$srcdir"/$conf ${pkgdir%/*}/$module/etc/nginx/conf.d/$conf
 }
-sha512sums="90b3d8148fca183bd3f6d16fd9212e2eedbe13f151c079d67086fca5a9f58256b99a87b4444ee18b1f9fb2b65fbe2d5353985145e1c075b6236b31d0ce7e9051  nginx-1.15.5.tar.gz
+sha512sums="e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d  nginx-1.16.0.tar.gz
 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd  naxsi-0.56.tar.gz
 c49c81dbdb8bd507fccf31295e603cea8f0a964867c27eff0436dcea3b4a547c8ae2f11ecf49c4d82c693cf8138c17ebbed395738539d0d61254951e5f0db7e3  ngx_cache_purge-2.3.0.1.tar.gz
 8adb7453c27748f4e685e3352e9b318b408da818754dc5b6244e908423941a8ba337561104f6e481f2553cbc0e334dcea73b57f8e810a9d6e974bb69ff8859e5  upstream-fair-0.1.3.tar.gz
 2743d9aea60bd4984b650213e571cf27e6ff5b3db708242ccb53b8fc669d1cc82ee224ba79aee2f6969b6e13821cfdd3df7b412541e1fdbb867ecc95326e07e1  sysguard-2.2.0.tar.gz
 1117ca5887822e002d9995c041435fda53890614fd7309ea011a59bfb0df3261fc7ba8670e93aaee9116cda16b9806921a85f52c9959b093f2e5ac5df4d9b0fb  anonymise.patch
-cae9f842c3d1188730d4355440476ad2338b19c027c4b329efe88d4487e90d96bf60dea6feb4be6a6f96d4b356fc154345e32c2bb643d70f68e428df26330a49  ipv6.patch
 2dca2ac74fb92e330fde7b6b6120b2fd2565c377a629c9536cf77beebe41aa4b092d4229d5b487b0fb02be4f2cc5b897c429c87bbbbc7b0d31e1cbb94231ddce  sysguard.patch
 72888c43cec3203cafe1c5e018be464129a220913c21e0abe5ca57ad0649b7120d419ede9b37181def3daad7f08b1c1afdacb33a20aa148ce1d1b9ce3b5b2a33  nginx.initd
 01b77cff16f6e8bfd7fa1d4d20f625bbcddd08f0509173452d060c342c93dc315a7b0560f4734323a5d29ea294de0491f2e3f32e5337574e1a28ebc005eceea8  nginx.logrotate
diff --git a/testing/nginx-naxsi/ipv6.patch b/testing/nginx-naxsi/ipv6.patch
deleted file mode 100644
index 74762c9580..0000000000
--- a/testing/nginx-naxsi/ipv6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- nginx-1.11.3/src/http/ngx_http_core_module.c
-+++ nginx-1.11.3/src/http/ngx_http_core_module.c.new
-@@ -2948,7 +2948,11 @@
-     ngx_uint_t                   i;
-     ngx_conf_t                   pcf;
-     ngx_http_module_t           *module;
-+#if (NGX_HAVE_INET6)
-+    struct sockaddr_in6         *sin6;
-+#else
-     struct sockaddr_in          *sin;
-+#endif
-     ngx_http_conf_ctx_t         *ctx, *http_ctx;
-     ngx_http_listen_opt_t        lsopt;
-     ngx_http_core_srv_conf_t    *cscf, **cscfp;
-@@ -3032,6 +3036,19 @@
-     if (rv == NGX_CONF_OK && !cscf->listen) {
-         ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t));
- 
-+#if (NGX_HAVE_INET6)
-+        sin6 = &lsopt.sockaddr.sockaddr_in6;
-+
-+        sin6->sin6_family = AF_INET6;
-+#if (NGX_WIN32)
-+        sin6->sin6_port = htons(80);
-+#else
-+        sin6->sin6_port = htons((getuid() == 0) ? 80 : 8000);
-+#endif
-+        sin6->sin6_addr = in6addr_any;
-+
-+        lsopt.socklen = sizeof(struct sockaddr_in6);
-+#else
-         sin = &lsopt.sockaddr.sockaddr_in;
- 
-         sin->sin_family = AF_INET;
-@@ -3043,6 +3060,7 @@
-         sin->sin_addr.s_addr = INADDR_ANY;
- 
-         lsopt.socklen = sizeof(struct sockaddr_in);
-+#endif
- 
-         lsopt.backlog = NGX_LISTEN_BACKLOG;
-         lsopt.rcvbuf = -1;
-- 
cgit v1.2.3