Subject: [alpine-aports] [PATCH] testing/nginx-naxsi: update to 1.7.11

From: Stuart Cardall <[email-masked]>
Date: Fri, 3 Apr 2015 00:36:58 +0000

2 new modules included by default:

http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_request_buffering
http://nginx.org/en/docs/http/ngx_http_core_module.html#aio

see also http://nginx.org/en/CHANGES
---
 testing/nginx-naxsi/APKBUILD             | 22 +++++++++-------------
 testing/nginx-naxsi/musl-crypt-fix.patch | 13 -------------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 testing/nginx-naxsi/musl-crypt-fix.patch

diff --git a/testing/nginx-naxsi/APKBUILD b/testing/nginx-naxsi/APKBUILD
index 1b7e62c..4ade9e0 100644
--- a/testing/nginx-naxsi/APKBUILD
+++ b/testing/nginx-naxsi/APKBUILD
@@ -1,12 +1,12 @@
+# Maintainer: Stuart Cardall <[email-masked]>
 # Maintainer: Cameron Banta <[email-masked]>
 # Contributor: Jeff Bilyk <[email-masked]>
 # Contributor: Bartłomiej Piotrowski <[email-masked]>
-# Contributor: Stuart Cardall <[email-masked]>
 
 pkgname=nginx-naxsi
 _pkgname=nginx
-pkgver=1.6.2
-_ngx_naxsi_ver=0.53-2
+pkgver=1.7.11
+_ngx_naxsi_ver=0.54rc1
 _ngx_cache_purge_ver=2.3
 pkgrel=0
 pkgdesc="lightweight HTTP and reverse proxy server with Naxsi WAF support, see also 'naxsi-utils'"
@@ -23,7 +23,6 @@ source="http://nginx.org/download/$_pkgname-$pkgver.tar.gz
 	sysguard.zip::https://github.com/alibaba/nginx-http-sysguard/archive/master.zip
 
 	anonymise.patch
-	musl-crypt-fix.patch
 	ipv6.patch
 	sysguard.patch
 
@@ -92,35 +91,32 @@ package() {
 	install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 	install -m644 -D "$srcdir"/naxsi-$_ngx_naxsi_ver/naxsi_config/naxsi_core.rules "$pkgdir"/etc/nginx/naxsi_core.rules
 }
-md5sums="d1b55031ae6e4bce37f8776b94d8b930  nginx-1.6.2.tar.gz
-348b50914a1eedaed09a2509621adf43  naxsi-0.53-2.tar.gz
+md5sums="22912ba71eebd6987be47eeaff79f0f0  nginx-1.7.11.tar.gz
+c1b449903786317ffa7096c1a594a3ff  naxsi-0.54rc1.tar.gz
 dc4c0688ed03ca7f5563097c2a8a76ca  ngx_cache_purge-2.3.tar.gz
 2c8537e2c6eb11baebd26d863d528d64  upstream-fair.zip
 a72a0ec1176b47c6ceecc3b30c85d07c  sysguard.zip
 a07569b8a023f1b89dcd11e0beda4df6  anonymise.patch
-3aeb488921109e60d02ed64d36790aeb  musl-crypt-fix.patch
 801a87f7f9d27f8ad85b41a78b4c4461  ipv6.patch
 50357b75049d878c0bcce10d0c60f9ed  sysguard.patch
 a00403a764478f5459d850bb387ca19b  nginx.initd
 8823274a834332d3db4f62bf7dd1fb7d  nginx.logrotate"
-sha256sums="b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18  nginx-1.6.2.tar.gz
-3eadff1d91995beae41b92733ade28091c2075a24ae37058f4d6aa90b0f4b660  naxsi-0.53-2.tar.gz
+sha256sums="dad9d740210e638bfd480536910083ed13f04c04775eedf877984e1c61a69695  nginx-1.7.11.tar.gz
+b931600d6f97073f88cf09a4a1a304158679d27fe6f762f58331253a243bcf8f  naxsi-0.54rc1.tar.gz
 cb7d5f22919c613f1f03341a1aeb960965269302e9eb23425ccaabd2f5dcbbec  ngx_cache_purge-2.3.tar.gz
 e7c4208f19175db896dd2aede9326960314fc131c3a8829b19d3024d475562cf  upstream-fair.zip
 800536eb9f269e1478500758e859ef7c4b4c7852580f2aeee8d7eb4c1fb51f18  sysguard.zip
 1923ebdb4a64a22f8903c3da619677bd3aaf769c99bee1aa4262edac58f05ba3  anonymise.patch
-8c398640bd379c1c6a2fafcd2b3848a72902e47924e8e2490b312c141eec5d70  musl-crypt-fix.patch
 a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b  ipv6.patch
 18090329435c32d91621a5943acc5b8bbe89aaa3c2fa334c3a4cdeb00efb6226  sysguard.patch
 67df748bd7ef4f3c3b5eef9dd7e3b352ef671dd7cfb9db56e096eed77a442d67  nginx.initd
 cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d  nginx.logrotate"
-sha512sums="5698655ebe847bab7cc2531711f02e17257e361559ecf13d424019a5f8f07f54e78c4c73f97e5de063c4a70d13a236ca855b73a962053cd21d44f9621a5ac600  nginx-1.6.2.tar.gz
-ada592f5e7f80a6d549cc435ee8720df01a788dc88cf27a7d55521bb7e4c66fa11b9ec28216aff7e13c70a5faf12cb745bd398b8a782ed4dea1eecd04b07e24c  naxsi-0.53-2.tar.gz
+sha512sums="549b132ac5249afbd968e9b50ba21a7b1513835b368b01c9d06566086439b3f2dde2775183e91ceb548d765d9a21e5cfc71c57866f4c2cc80cbf82f4658c2f24  nginx-1.7.11.tar.gz
+411cde7dd52d7728c2fe0ff5d62ec7306fcd2dc4687f2c894f5ddd32e691b8609f2b4b468308d9a8ba79bc214515459c86d096b7dff27573248beb6ba6794082  naxsi-0.54rc1.tar.gz
 81929ca57ce5c2e1af6ec43882a54ff1da8dc77786bfb7505ff94fbcf970ae8870b419dc5c0bc7b80794d75a359e0100f360c1cf458a300f802b1d8bd7053811  ngx_cache_purge-2.3.tar.gz
 bbe1330e86a9650326858d893a1143df9b431873062b64a89b0befdbaca9f135e872225c7a7874231537c74da85ca8c56ac3d80739227721246c096cf4f2b7da  upstream-fair.zip
 b361a8316d6e1f419d63f229756d3af08b32e235199285a18f8478be42a57a9c0b2ff126e7018ba750c6e9d1e33bb053f83aacd96ebc5d3b876bedb973a92712  sysguard.zip
 5899097b6b6ed04deb7ae474fb65205d9c50843f30929c1370c0c1d70df3f02fe51b8ea90d3d2c3b4c53aeb3895717729e0c9773b880ca529e89a5b07fc26a5b  anonymise.patch
-21114c775e4bdd1f7b8b9abc143284945e96ed1d8c49904ddf918abad87b16253f918ba47976cd2df32f0fdb8a7dad399d4200e879db2da6cf93a28aab236a75  musl-crypt-fix.patch
 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f  ipv6.patch
 2dca2ac74fb92e330fde7b6b6120b2fd2565c377a629c9536cf77beebe41aa4b092d4229d5b487b0fb02be4f2cc5b897c429c87bbbbc7b0d31e1cbb94231ddce  sysguard.patch
 9c6b357c460998187d7a26c0f3c8abc69c91b523a6f340c1f6ed3c863101a39eeb61e92b4cfec6a04af2b495c354c33f232ce5e59ed29edd6855e430ca73d168  nginx.initd
diff --git a/testing/nginx-naxsi/musl-crypt-fix.patch b/testing/nginx-naxsi/musl-crypt-fix.patch
deleted file mode 100644
index 2f11fe2..0000000
--- a/testing/nginx-naxsi/musl-crypt-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- nginx-1.4.4/src/os/unix/ngx_user.c.orig
-+++ nginx-1.4.4/src/os/unix/ngx_user.c
-@@ -31,8 +31,10 @@
-     struct crypt_data   cd;
- 
-     cd.initialized = 0;
-+#ifdef __GLIBC__
-     /* work around the glibc bug */
-     cd.current_salt[0] = ~salt[0];
-+#endif
- 
-     value = crypt_r((char *) key, (char *) salt, &cd);
- 
-- 
2.3.5

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---