diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2015-12-29 16:11:49 +0000 |
|---|---|---|
| committer | Christian Kampka <christian@kampka.net> | 2015-12-29 17:22:09 +0100 |
| commit | e865d0f2e8896edaf423a6782ebea6cbd5ae5864 (patch) | |
| tree | d654e6856acbf927dcd1b20e474988820cb36e16 | |
| parent | 676bbd290fd7c933d9f330c0d2d2eb30f20ed802 (diff) | |
| download | aports-e865d0f2e8896edaf423a6782ebea6cbd5ae5864.tar.bz2 aports-e865d0f2e8896edaf423a6782ebea6cbd5ae5864.tar.xz | |
testing/nginx-naxsi: update to 1.9.9
also enables --with-threads
https://www.nginx.com/blog/thread-pools-boost-performance-9x/
| -rw-r--r-- | testing/nginx-naxsi/APKBUILD | 15 | ||||
| -rw-r--r-- | testing/nginx-naxsi/anonymise.patch | 37 |
2 files changed, 27 insertions, 25 deletions
diff --git a/testing/nginx-naxsi/APKBUILD b/testing/nginx-naxsi/APKBUILD index 200a8ecc9d..cf794e52df 100644 --- a/testing/nginx-naxsi/APKBUILD +++ b/testing/nginx-naxsi/APKBUILD @@ -5,7 +5,7 @@ pkgname=nginx-naxsi _pkgname=nginx -pkgver=1.9.5 +pkgver=1.9.9 _ngx_naxsi_ver=0.54 _ngx_cache_purge_ver=2.3 _ngx_upstream_fair_ver=0.1.0 @@ -62,6 +62,7 @@ build() { --user=nginx \ --group=nginx \ --with-ipv6 \ + --with-threads \ --with-file-aio \ --with-pcre-jit \ --with-http_ssl_module \ @@ -110,32 +111,32 @@ vim() { done } -md5sums="2562320f1535e3e31d165e337ae94f21 nginx-1.9.5.tar.gz +md5sums="50fdfa08e93ead7a111cba5a5f5735af nginx-1.9.9.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 -789840e9c834805b52d960477a0946e0 anonymise.patch +f378a642b256091b73a3f856b520837d anonymise.patch 801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch 50357b75049d878c0bcce10d0c60f9ed sysguard.patch 609ea97ab6c3c30f9e8329968aadc4f3 nginx.initd 8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate" -sha256sums="48e2787a6b245277e37cb7c5a31b1549a0bbacf288aa4731baacf9eaacdb481b nginx-1.9.5.tar.gz +sha256sums="de66bb2b11c82533aa5cb5ccc27cbce736ab87c9f2c761e5237cda0b00068d73 nginx-1.9.9.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 -a3664d361fac1a0dca24989fcd5092a8497e8294d04466d39a052fd0503f6e0c anonymise.patch +0d27c1e7e28ee67dff59230a495d6cc3a7127f9383b537ea619d289c07212c30 anonymise.patch a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b ipv6.patch 18090329435c32d91621a5943acc5b8bbe89aaa3c2fa334c3a4cdeb00efb6226 sysguard.patch 8cbef405295eac299dfc3b9b119c02bda354a9b335923bed6ff6992c1fd8f493 nginx.initd cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d nginx.logrotate" -sha512sums="a3f12ca919b9750141c323d58e5be32d1f6ed086c6ecf45c559baa911606cbae1bb3b2eafd84f67294b6b23366ef5be7d24edc1dae7b3fa5b3aff5ecbaefb31d nginx-1.9.5.tar.gz +sha512sums="9b8a82cccb834a1647f0d0ea5e202d8bebae273ed9865c232dae228746e7c4334aa03616a7553494550dbbd99d41f790ba4d880b10381da50513c8659cb5e9b3 nginx-1.9.9.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 -4fcfee996c54abefa45baf8dee913bdc2d3826028445599f0ca85433ee6160de1632a48f959d63ace26e6b70c7338abab8a8d616017d0f8e54dafa8bd5bd2301 anonymise.patch +17bd8994a24e4f4b873be731b87f5d6b9591565e29d8d8599692a7ac968561f7f7b6352bc302a92e38598d399e03e0d5c0c27581c5dd4b587d071665f54e51bd 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 4723bec97a..74841e0509 100644 --- a/testing/nginx-naxsi/anonymise.patch +++ b/testing/nginx-naxsi/anonymise.patch @@ -41,14 +41,14 @@ "</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 @@ +--- nginx-1.9.9/src/http/v2/ngx_http_v2_filter_module.c ++++ nginx-1.9.9/src/http/v2/ngx_http_v2_filter_module.c.new +@@ -214,10 +214,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) { ++/* if (r->headers_out.server == NULL) { len += 1 + clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER) : ngx_http_v2_literal_size("nginx"); } @@ -56,20 +56,21 @@ 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); -- } -+ } */ +@@ -404,7 +405,7 @@ + pos = ngx_sprintf(pos, "%03ui", r->headers_out.status); + } + +- if (r->headers_out.server == NULL) { ++/* if (r->headers_out.server == NULL) { + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); + + if (clcf->server_tokens) { +@@ -416,6 +417,7 @@ + pos = ngx_cpymem(pos, "nginx", sizeof("nginx") - 1); + } } ++*/ if (r->headers_out.date == NULL) { + *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX); + |