Commit 5620eba1 authored by Stuart Cardall's avatar Stuart Cardall Committed by Natanael Copa

testing/nginx-naxsi: update to 1.11.3

http://nginx.org/en/CHANGES
parent 8b5e2d40
......@@ -5,12 +5,12 @@
pkgname=nginx-naxsi
_pkgname=nginx
pkgver=1.9.15
pkgver=1.11.3
_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
pkgrel=2
pkgrel=0
pkgdesc="lightweight HTTP and reverse proxy server with Naxsi WAF support, see also 'nxapi'"
url="http://www.nginx.org | https://github.com/nbs-system/naxsi"
arch="all"
......@@ -48,8 +48,6 @@ prepare() {
build() {
cd "$_builddir"
./configure \
--add-module="$srcdir/naxsi-$_ngx_naxsi_ver/naxsi_src" \
--add-module="$srcdir/nginx-http-sysguard-$_ngx_http_sysguard_ver" \
--prefix=/usr \
--conf-path=/etc/$_pkgname/$_pkgname.conf \
--pid-path=/var/run/$_pkgname.pid \
......@@ -61,24 +59,34 @@ build() {
--http-fastcgi-temp-path=/tmp/$_pkgname/fastcgi \
--user=nginx \
--group=nginx \
--with-ipv6 \
--with-threads \
--with-file-aio \
--with-pcre-jit \
--with-http_ssl_module \
--with-http_gzip_static_module \
--with-http_v2_module \
--with-mail \
--with-mail_ssl_module \
--with-http_realip_module \
--with-http_addition_module \
--with-http_sub_module \
--with-http_dav_module \
--with-http_flv_module \
--with-http_mp4_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
--with-http_random_index_module \
--with-http_secure_link_module \
--with-http_stub_status_module \
--with-http_auth_request_module \
--with-threads \
--with-stream \
--with-stream_ssl_module \
--with-http_slice_module \
--with-mail \
--with-mail_ssl_module \
--with-file-aio \
--with-http_v2_module \
--with-ipv6 \
--without-http_uwsgi_module \
--without-http_scgi_module \
--add-module="$srcdir/naxsi-$_ngx_naxsi_ver/naxsi_src" \
--add-module="$srcdir/ngx_cache_purge-$_ngx_cache_purge_ver" \
--add-module="$srcdir/nginx-upstream-fair-$_ngx_upstream_fair_ver" \
--add-module="$srcdir/nginx-http-sysguard-$_ngx_http_sysguard_ver" \
|| return 1
make || return 1
}
......@@ -111,33 +119,33 @@ vim() {
done
}
md5sums="13cd38e9da3789035750dd45882c4a26 nginx-1.9.15.tar.gz
md5sums="18275c1daa39c5fac12e56c34907d45b nginx-1.11.3.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
31d29937da95b31714faa399aeb07407 anonymise.patch
801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch
f478d8391dafa32a8b0b3a9f21d7a080 ipv6.patch
50357b75049d878c0bcce10d0c60f9ed sysguard.patch
609ea97ab6c3c30f9e8329968aadc4f3 nginx.initd
8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate"
sha256sums="cc89b277cc03f403c0b746d60aa5943cdecf59ae48278f8cb7e2df0cbdb6dac3 nginx-1.9.15.tar.gz
sha256sums="4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610 nginx-1.11.3.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
28adf3605875197d5822fa382f5fd3c9c80f7d3a561e904fee223fa051f98810 anonymise.patch
a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b ipv6.patch
4a1a24a92657432012f08c52e8099c7abae390c9c4cb76483cacd012e26a57ac ipv6.patch
18090329435c32d91621a5943acc5b8bbe89aaa3c2fa334c3a4cdeb00efb6226 sysguard.patch
8cbef405295eac299dfc3b9b119c02bda354a9b335923bed6ff6992c1fd8f493 nginx.initd
cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d nginx.logrotate"
sha512sums="563cec7828d1e398ded83579c3c4afcd83fd809662e64a0212e25a34ce1b599135558e9fd8cee3e07ba028ee4b308e40ce9910a5071a3d8e3b7ec9f9bdef95f0 nginx-1.9.15.tar.gz
sha512sums="b983aca61335facf5778675b80fc28341ec9cfee2190319ed130b9c5d5ceff8133677f4609ecafd5a782daa5962e41bb6cb6a857380bbbe9cee67cd0ab2026d4 nginx-1.11.3.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
f8e46dafcf553edd35699dc2a47a54756e0a4c690fc13f81436ad9db1026739ba331ad99d3d05d8a7c089a5c067bf45f4aca3a98fdd9483b7b0123a837e695be anonymise.patch
68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f ipv6.patch
cae9f842c3d1188730d4355440476ad2338b19c027c4b329efe88d4487e90d96bf60dea6feb4be6a6f96d4b356fc154345e32c2bb643d70f68e428df26330a49 ipv6.patch
2dca2ac74fb92e330fde7b6b6120b2fd2565c377a629c9536cf77beebe41aa4b092d4229d5b487b0fb02be4f2cc5b897c429c87bbbbc7b0d31e1cbb94231ddce sysguard.patch
6e9a37176c0ca5a463a2745401bc5a6f9c002a236244b615a2803ec04404cc768678a1fa27ee047f81f4ccf002f7bea4b803522049f4ef839c61bb83577b9d65 nginx.initd
01b77cff16f6e8bfd7fa1d4d20f625bbcddd08f0509173452d060c342c93dc315a7b0560f4734323a5d29ea294de0491f2e3f32e5337574e1a28ebc005eceea8 nginx.logrotate"
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2442,7 +2442,11 @@
--- 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;
......@@ -12,12 +12,12 @@
ngx_http_conf_ctx_t *ctx, *http_ctx;
ngx_http_listen_opt_t lsopt;
ngx_http_core_srv_conf_t *cscf, **cscfp;
@@ -2526,6 +2530,19 @@
@@ -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.u.sockaddr_in6;
+ sin6 = &lsopt.sockaddr.sockaddr_in6;
+
+ sin6->sin6_family = AF_INET6;
+#if (NGX_WIN32)
......@@ -29,14 +29,14 @@
+
+ lsopt.socklen = sizeof(struct sockaddr_in6);
+#else
sin = &lsopt.u.sockaddr_in;
sin = &lsopt.sockaddr.sockaddr_in;
sin->sin_family = AF_INET;
@@ -2537,6 +2554,7 @@
@@ -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;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment