testing/nginx-naxsi: update to nginx 1.9.5 / naxsi 0.54

2 files changed, 46 insertions, 45 deletions

diff --git a/testing/nginx-naxsi/APKBUILD b/testing/nginx-naxsi/APKBUILD
index fb0eae6166..200a8ecc9d 100644
--- a/testing/nginx-naxsi/APKBUILD
+++ b/testing/nginx-naxsi/APKBUILD
@@ -5,8 +5,8 @@
 
 pkgname=nginx-naxsi
 _pkgname=nginx
-pkgver=1.9.3
-_ngx_naxsi_ver=0.54rc3
+pkgver=1.9.5
+_ngx_naxsi_ver=0.54
 _ngx_cache_purge_ver=2.3
 _ngx_upstream_fair_ver=0.1.0
 _ngx_http_sysguard_ver=2.1.0
@@ -66,12 +66,14 @@ build() {
 		--with-pcre-jit \
 		--with-http_ssl_module \
 		--with-http_gzip_static_module \
-		--with-http_spdy_module \
+		--with-http_v2_module \
 		--with-mail \
 		--with-mail_ssl_module \
 		--with-http_realip_module \
 		--with-http_stub_status_module \
 		--with-http_auth_request_module \
+		--with-stream \
+		--with-stream_ssl_module \
 		--without-http_uwsgi_module \
 		--without-http_scgi_module \
 		--add-module="$srcdir/ngx_cache_purge-$_ngx_cache_purge_ver" \
@@ -108,32 +110,32 @@ vim() {
         done
 }
 
-md5sums="125282e2a7321265e7dfd7d05e4e2a3d  nginx-1.9.3.tar.gz
-f24940b9cf0a3c2271091bcf68e2f491  naxsi-0.54rc3.tar.gz
+md5sums="2562320f1535e3e31d165e337ae94f21  nginx-1.9.5.tar.gz
+1bc31058991268e4cfdb44e9b6d8b3b3  naxsi-0.54.tar.gz
 dc4c0688ed03ca7f5563097c2a8a76ca  ngx_cache_purge-2.3.tar.gz
 f3562ef6573f616e254d382d6f86b8e1  upstream-fair-0.1.0.tar.gz
 fdb072dc8d67b573a0ea7983530a7d2b  sysguard-2.1.0.tar.gz
-a07569b8a023f1b89dcd11e0beda4df6  anonymise.patch
+789840e9c834805b52d960477a0946e0  anonymise.patch
 801a87f7f9d27f8ad85b41a78b4c4461  ipv6.patch
 50357b75049d878c0bcce10d0c60f9ed  sysguard.patch
 609ea97ab6c3c30f9e8329968aadc4f3  nginx.initd
 8823274a834332d3db4f62bf7dd1fb7d  nginx.logrotate"
-sha256sums="4298c5341b2a262fdb8dbc0a1389756181af8f098c7720abfb30bd3060f673eb  nginx-1.9.3.tar.gz
-14f47cc793fa5336ce2b0d538b7b69a88b3135b3bdd24da101a423bc3ea3ce06  naxsi-0.54rc3.tar.gz
+sha256sums="48e2787a6b245277e37cb7c5a31b1549a0bbacf288aa4731baacf9eaacdb481b  nginx-1.9.5.tar.gz
+9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5  naxsi-0.54.tar.gz
 cb7d5f22919c613f1f03341a1aeb960965269302e9eb23425ccaabd2f5dcbbec  ngx_cache_purge-2.3.tar.gz
 dd0bfb79d2489f48ea63ac004d91890cd471eb4020500ce9179c3612cb13246c  upstream-fair-0.1.0.tar.gz
 97e0cc9a36fcce375c5b0667b002d2f7acd580e968a2318e3276fbdc1b99f8e4  sysguard-2.1.0.tar.gz
-1923ebdb4a64a22f8903c3da619677bd3aaf769c99bee1aa4262edac58f05ba3  anonymise.patch
+a3664d361fac1a0dca24989fcd5092a8497e8294d04466d39a052fd0503f6e0c  anonymise.patch
 a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b  ipv6.patch
 18090329435c32d91621a5943acc5b8bbe89aaa3c2fa334c3a4cdeb00efb6226  sysguard.patch
 8cbef405295eac299dfc3b9b119c02bda354a9b335923bed6ff6992c1fd8f493  nginx.initd
 cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d  nginx.logrotate"
-sha512sums="923309de03c86815023f190bda0c3138f3b9e6dba76939e721273bca3ddb6abd06506afe0621dff4e936358e4d4570a8b4dca095b9246a8e13a22c465f31855b  nginx-1.9.3.tar.gz
-b410118ae0eec4cb1af75557012e7c870a29d3394bce10a069306424d7563357f7e1da798d2c5bcee7e74f22efbb34aca15a7993c176e7188b0b3425593309f4  naxsi-0.54rc3.tar.gz
+sha512sums="a3f12ca919b9750141c323d58e5be32d1f6ed086c6ecf45c559baa911606cbae1bb3b2eafd84f67294b6b23366ef5be7d24edc1dae7b3fa5b3aff5ecbaefb31d  nginx-1.9.5.tar.gz
+91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43  naxsi-0.54.tar.gz
 81929ca57ce5c2e1af6ec43882a54ff1da8dc77786bfb7505ff94fbcf970ae8870b419dc5c0bc7b80794d75a359e0100f360c1cf458a300f802b1d8bd7053811  ngx_cache_purge-2.3.tar.gz
 2ff9894986c5cd483ecee97d8818675ef6d063e5f45bb66e8cf56c78bbd043b9c0c37eb3cf650b7cfb6d40da9f7a4ba0e030fe39de5ef1f715cbcd6560248428  upstream-fair-0.1.0.tar.gz
 f9587b8aa7a2b09be016dc6f7a07fe3fee154d16172194e899bf3c78a3f4e373c78f79932794cd9ac75793514c606ab878f88be9400b70e37528d263f1541b34  sysguard-2.1.0.tar.gz
-5899097b6b6ed04deb7ae474fb65205d9c50843f30929c1370c0c1d70df3f02fe51b8ea90d3d2c3b4c53aeb3895717729e0c9773b880ca529e89a5b07fc26a5b  anonymise.patch
+4fcfee996c54abefa45baf8dee913bdc2d3826028445599f0ca85433ee6160de1632a48f959d63ace26e6b70c7338abab8a8d616017d0f8e54dafa8bd5bd2301  anonymise.patch
 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f  ipv6.patch
 2dca2ac74fb92e330fde7b6b6120b2fd2565c377a629c9536cf77beebe41aa4b092d4229d5b487b0fb02be4f2cc5b897c429c87bbbbc7b0d31e1cbb94231ddce  sysguard.patch
 6e9a37176c0ca5a463a2745401bc5a6f9c002a236244b615a2803ec04404cc768678a1fa27ee047f81f4ccf002f7bea4b803522049f4ef839c61bb83577b9d65  nginx.initd
diff --git a/testing/nginx-naxsi/anonymise.patch b/testing/nginx-naxsi/anonymise.patch
index ebedc7fa26..4723bec97a 100644
--- a/testing/nginx-naxsi/anonymise.patch
+++ b/testing/nginx-naxsi/anonymise.patch
@@ -22,39 +22,6 @@
      }
  
      if (r->headers_out.date == NULL) {
---- nginx-1.6.1/src/http/ngx_http_spdy_filter_module.c
-+++ nginx-1.6.1/src/http/ngx_http_spdy_filter_module.c
-@@ -175,11 +175,12 @@
- 
-     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
- 
--    if (r->headers_out.server == NULL) {
-+/*  if (r->headers_out.server == NULL) {
-         len += ngx_http_spdy_nv_nsize("server");
-         len += clcf->server_tokens ? ngx_http_spdy_nv_vsize(NGINX_VER)
-                                    : ngx_http_spdy_nv_vsize("nginx");
-     }
-+*/
- 
-     if (r->headers_out.date == NULL) {
-         len += ngx_http_spdy_nv_nsize("date")
-@@ -326,7 +327,7 @@
- 
-     count = 2;
- 
--    if (r->headers_out.server == NULL) {
-+ /* if (r->headers_out.server == NULL) {
-         last = ngx_http_spdy_nv_write_name(last, "server");
-         last = clcf->server_tokens
-                ? ngx_http_spdy_nv_write_val(last, NGINX_VER)
-@@ -334,6 +335,7 @@
- 
-         count++;
-     }
-+*/
- 
-     if (r->headers_out.date == NULL) {
-         last = ngx_http_spdy_nv_write_name(last, "date");
 --- nginx-1.6.1/src/http/ngx_http_special_response.c
 +++ nginx-1.6.1/src/http/ngx_http_special_response.c
 @@ -19,14 +19,14 @@
@@ -74,3 +41,35 @@
  "</body>" CRLF
  "</html>" CRLF
  ;
+--- nginx-1.9.5/src/http/v2/ngx_http_v2_filter_module.c
++++ nginx-1.9.5/src/http/v2/ngx_http_v2_filter_module.c
+@@ -212,10 +212,11 @@
+ 
+     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+ 
+-    if (r->headers_out.server == NULL) {
++/*  if (r->headers_out.server == NULL) {
+         len += 1 + clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
+                                        : ngx_http_v2_literal_size("nginx");
+     }
++*/
+ 
+     if (r->headers_out.date == NULL) {
+         len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
+@@ -413,14 +414,14 @@
+     if (r->headers_out.server == NULL) {
+         *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
+ 
+-        if (clcf->server_tokens) {
++/*      if (clcf->server_tokens) {
+             *b->last++ = sizeof(NGINX_VER) - 1;
+             b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1);
+ 
+         } else {
+             *b->last++ = sizeof("nginx") - 1;
+             b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1);
+-        }
++        } */
+     }
+ 
+     if (r->headers_out.date == NULL) {