[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Conrad Kostecki]

commit: fd0e508ff6bd477682cf8c156a23248808744e6d
Author: Tomáš Mózes  gmail  com>
AuthorDate: Sat Oct 22 06:34:16 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 23 20:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0e508f

www-servers/nginx: various improvements

- update nginx modules
- change naxsi upstream as previous fails to build and is considered obsolete
- use mime types from app-misc/mime-types by default

Closes: https://bugs.gentoo.org/762964
Closes: https://bugs.gentoo.org/836454
Closes: https://bugs.gentoo.org/850571
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27887
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-servers/nginx/Manifest   |6 +
 www-servers/nginx/files/nginx.conf-r3|   70 ++
 www-servers/nginx/nginx-1.23.2-r1.ebuild | 1066 ++
 3 files changed, 1142 insertions(+)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 336dd48cb76f..dfe0526efc02 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -8,18 +8,24 @@ DIST ngx_http_auth_pam-1.5.2.tar.gz 7016 BLAKE2B 
1efc8d2d12aa09a2b2a36f6f6d0132a
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B 
f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e
 SHA512 
50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 
0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4
 SHA512 
d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
 DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 
7d92184f7fb878cb5261be1c68de4432d472469028e20c2150925ab3d9a1c472ef557a11b84ee60d7ae6b48d08b35890c50161540668918492f2092dd0272962
 SHA512 
240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
+DIST ngx_http_echo-0.63.tar.gz 53421 BLAKE2B 
613d4f265b9bcf9b4a44a18749314075e797dca4b350e6c4bc2e7ddd52edadc52660504ee57d0c859ec0a20f6b2e425727e5ec4b30282e67498010fc8d959baa
 SHA512 
c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B 
a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80
 SHA512 
bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.4.tar.gz 8877 BLAKE2B 
cd59ebbd2ca47f6af0b22b8b91768053d2c991f7adf19941625e3570d81dcb73989101795d641e4efce1eed37d454bca73d603b5d0e4511e3bd63100c7acf750
 SHA512 
18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
+DIST ngx_http_headers_more-0.34.tar.gz 28827 BLAKE2B 
48badf603b93601b11c837057760f768ef2579062786bb366795617635747b654cecafa3a230eec1a3e442ab768fb068867ceb93385b14b6452b621764acfd3f
 SHA512 
2c0c140feeb29f0154a223dc3020ff956f894d63e0232a7bc0ca33fcb26f8b807bda868159ae30b6cac7456ec25b831c3d299ea18e234202ae5d14c1ff471a4b
 DIST ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz 
28810 BLAKE2B 
cb71e6b8a9da6c72bc542e837391e932c5803d52cbf01eab0b70f501b620d7de03009a25d10e9ba9de46a6c9ffca109b50dea47cded687412eb55210ba6e68c8
 SHA512 
80193f95f9754b1d6fb784cde6b4c4d6f72b5cff406c26329a93ad87a5833cd87ef7a8113d719bbe6913fd8e1fb29f438fa81e6dada8c0fc39bf0f2e47fe08ae
 DIST ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz 718179 
BLAKE2B 
ac4893892dd2836e46055d57feb492e3122ab2c3c91e56917e52cb8ccc683469ab77d26990b9ee4a4bb3bf639267cce7ded7b07463912cc5579a7a09730da8b2
 SHA512 
f547c4f0490a25600b4533050db3b5d2ea595ad72e0737fc0be8060eddf7b5712e3dcca59e4d2415c9455798e232a7de53a9380cbd38f264b4ea371e86c1
 DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B 
cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15
 SHA512 
4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
+DIST ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz 166325 
BLAKE2B 
f80353bfc1f3fc009b847de1c1c5d623a84682efc588649cbd156f669336c95f337442ebf350c79321bf59477215f083817929f13550b22dc7f393583aa16ba1
 SHA512 
6d6565189d9fabdcf318270107455bb4915d2a43284fb2f77b5cf025a4b4843e990c1c1dbc254e0f3879ca7d30ac7bcd7eb8637f491d5b7f05193aa9865be7cc
+DIST 
ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz 
2123473 BLAKE2B 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Conrad Kostecki]

commit: fef9c212cc857654acea385e37a492e818e3d417
Author: Tomáš Mózes  gmail  com>
AuthorDate: Mon Jul 11 13:37:11 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jul 13 19:01:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef9c212

www-servers/nginx: bump to 1.23.0

Bug: https://bugs.gentoo.org/838247
Closes: https://bugs.gentoo.org/852953
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26347
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-servers/nginx/Manifest |6 +
 .../files/http_headers_more-nginx-1.23.0.patch |  187 
 .../nginx/files/http_sticky-nginx-1.23.0.patch |   25 +
 .../files/http_uploadprogress-nginx-1.23.0.patch   |   74 ++
 www-servers/nginx/nginx-1.23.0.ebuild  | 1028 
 5 files changed, 1320 insertions(+)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index af5566fb23fa..c19149f8e8c0 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,5 +1,6 @@
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 
337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d
 SHA512 
4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
 DIST nginx-1.21.6.tar.gz 1073364 BLAKE2B 
815d035df33bd947eec41a2f5c993d1f179aa0bd4d069280916aa089a2f96fd3bada7a7192b4a0ef7b8f43036f3a2def0e93d8c8f720dd7145a5d55ea058652f
 SHA512 
10b0cdd13b26687104bf11e6b850fd851e9d8881bdf67f72c062d956e661da4d70482e6ec3123405b324ad7ed821a8bcc67b742dce9f59e972407fa437ddcad4
+DIST nginx-1.23.0.tar.gz 1102940 BLAKE2B 
375e63449dda4bb8df3535cc3f31bede03bf6cdc374c46fe5f5e1107fbf9e829d15f329123bd19d96f8236ca665cde3000366967372193fc023a3212bac562a9
 SHA512 
c76619e42e7715898cce7e13f5672b36e9d9401f815d912a453aae8364b6f8a4365e3cc6858a333bf68ebea1191f0ad38136f2d1832facc9acbf6c8a883999cd
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 
BLAKE2B 
5ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333
 SHA512 
ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19bf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B 
d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570
 SHA512 
6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-1.0.0rc.tar.gz 16207 BLAKE2B 
450d0ea693bd98d4a1b615f2cdcaad41ccd28266f6d80beec7fe77fe750ab8c5d1bb55aabe15161b9b6d819d2b4d99a7774f2706f2f6fd084b52a7c7dddbc00c
 SHA512 
05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d
@@ -11,11 +12,15 @@ DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 
7d92184f7fb878cb5261be1c68de4432d47
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B 
a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80
 SHA512 
bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.3.tar.gz 8509 BLAKE2B 
4841e1bdd13b9b85f34732d1eb7447638f62bb09e1bd480da0fa8b0085d3b2d90a740732ef534c355feb71d7db613c73f68a4e6e3624b47a0937be046dfa1f8d
 SHA512 
06963b598c54e22d75ce837fb222f5aa6c9494c29e558ff46f1205d7159fc305414bfac4ed3288c836dcbf7628d92f26458e1992d34fc2f4b73275a32847bdc0
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B 
fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a
 SHA512 
13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
+DIST ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz 
28810 BLAKE2B 
cb71e6b8a9da6c72bc542e837391e932c5803d52cbf01eab0b70f501b620d7de03009a25d10e9ba9de46a6c9ffca109b50dea47cded687412eb55210ba6e68c8
 SHA512 
80193f95f9754b1d6fb784cde6b4c4d6f72b5cff406c26329a93ad87a5833cd87ef7a8113d719bbe6913fd8e1fb29f438fa81e6dada8c0fc39bf0f2e47fe08ae
 DIST ngx_http_lua-0.10.15.tar.gz 655110 BLAKE2B 
73bf8e2f157c93f3d4e54b5aa63deb266731a10e3e48b2257756efee8d752e86440ca9c27bd27bc1d90075a5ffb58772eecb7c445db44cd055d2b9e0b4bac082
 SHA512 
1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7
+DIST ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz 718179 
BLAKE2B 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: e3bd72e8a4c33582860aa2ebcb578af80c5fcbb2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 14 00:07:12 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 14 00:07:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bd72e8

www-servers/nginx: drop http_auth_pam patch

...now included in upstream release.

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...just-loglevel-for-authentication-failures.patch | 22 
 .../nginx/files/http_brotli-detect-brotli-r2.patch | 30 --
 www-servers/nginx/nginx-1.18.0-r2.ebuild   |  6 -
 www-servers/nginx/nginx-1.19.2-r1.ebuild   |  6 -
 4 files changed, 64 deletions(-)

diff --git 
a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
 
b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
deleted file mode 100644
index 632dcdee50e..000
--- 
a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/sto/ngx_http_auth_pam_module/pull/18
-
 a/ngx_http_auth_pam_module.c
-+++ b/ngx_http_auth_pam_module.c
-@@ -348,7 +348,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
- /* try to authenticate user, log error on failure */
- if ((rc = pam_authenticate(pamh,
-PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
--ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-   "PAM: user '%s' - not authenticated: %s",
-   ainfo.username.data, pam_strerror(pamh, rc));
- pam_end(pamh, PAM_SUCCESS);
-@@ -357,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
- 
- /* check that the account is healthy */
- if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) 
{
--ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-   "PAM: user '%s'  - invalid account: %s",
-   ainfo.username.data, pam_strerror(pamh, rc));
- pam_end(pamh, PAM_SUCCESS);

diff --git a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch 
b/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch
deleted file mode 100644
index 8774fa60d1c..000
--- a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
 a/config
-+++ b/config
-@@ -59,13 +59,7 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have  # deprecated
- ngx_module_type=HTTP_FILTER
- ngx_module_name=ngx_http_brotli_filter_module
- 
--brotli="/usr/local"
--
--if [  -f "/usr/include/brotli/encode.h" ]; then
--
--brotli="/usr"
--
--fi
-+brotli=$(pkg-config --variable=prefix libbrotlienc)
- 
- if [ ! -f "$brotli/include/brotli/encode.h" ]; then
- 
-@@ -75,11 +69,7 @@ if [ ! -f "$brotli/include/brotli/encode.h" ]; then
- cat << END
- 
- $0: error: \
--Brotli library is missing from the $brotli directory.
--
--Please make sure that the git submodule has been checked out:
--
--cd $ngx_addon_dir && git submodule update --init && cd $PWD
-+Brotli library not found. Don't you have app-arch/brotli installed?
- 
- END
- exit 1

diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild 
b/www-servers/nginx/nginx-1.18.0-r2.ebuild
index e69e9dc9c5d..c4aa1254fc9 100644
--- a/www-servers/nginx/nginx-1.18.0-r2.ebuild
+++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild
@@ -385,12 +385,6 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
-   if use nginx_modules_http_auth_pam; then
-   cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-   eapply 
"${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-   cd "${S}" || die
-   fi
-
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch

diff --git a/www-servers/nginx/nginx-1.19.2-r1.ebuild 
b/www-servers/nginx/nginx-1.19.2-r1.ebuild
index 541a05f9b06..a23f3375b04 100644
--- a/www-servers/nginx/nginx-1.19.2-r1.ebuild
+++ b/www-servers/nginx/nginx-1.19.2-r1.ebuild
@@ -385,12 +385,6 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
-   if use nginx_modules_http_auth_pam; then
-   cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-   eapply 
"${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-   cd "${S}" || die
-   fi
-
if use nginx_modules_http_brotli; then

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: 4a33b110e36087f1a5e43e47dd846f7bf26b4414
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Dec 13 15:37:16 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Dec 13 15:39:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a33b110

www-servers/nginx: http_auth_pam: adjust loglevel for auth failures

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...just-loglevel-for-authentication-failures.patch | 22 ++
 ...{nginx-1.14.2.ebuild => nginx-1.14.2-r1.ebuild} |  6 ++
 ...{nginx-1.15.7.ebuild => nginx-1.15.7-r1.ebuild} |  6 ++
 3 files changed, 34 insertions(+)

diff --git 
a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
 
b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
new file mode 100644
index 000..632dcdee50e
--- /dev/null
+++ 
b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
@@ -0,0 +1,22 @@
+https://github.com/sto/ngx_http_auth_pam_module/pull/18
+
+--- a/ngx_http_auth_pam_module.c
 b/ngx_http_auth_pam_module.c
+@@ -348,7 +348,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
+ /* try to authenticate user, log error on failure */
+ if ((rc = pam_authenticate(pamh,
+PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
+-ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+   "PAM: user '%s' - not authenticated: %s",
+   ainfo.username.data, pam_strerror(pamh, rc));
+ pam_end(pamh, PAM_SUCCESS);
+@@ -357,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
+ 
+ /* check that the account is healthy */
+ if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) 
{
+-ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+   "PAM: user '%s'  - invalid account: %s",
+   ainfo.username.data, pam_strerror(pamh, rc));
+ pam_end(pamh, PAM_SUCCESS);

diff --git a/www-servers/nginx/nginx-1.14.2.ebuild 
b/www-servers/nginx/nginx-1.14.2-r1.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.14.2.ebuild
rename to www-servers/nginx/nginx-1.14.2-r1.ebuild
index 66b09925f1e..08100e45578 100644
--- a/www-servers/nginx/nginx-1.14.2.ebuild
+++ b/www-servers/nginx/nginx-1.14.2-r1.ebuild
@@ -381,6 +381,12 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
+   if use nginx_modules_http_auth_pam; then
+   cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
+   eapply 
"${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+   cd "${S}" || die
+   fi
+
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch

diff --git a/www-servers/nginx/nginx-1.15.7.ebuild 
b/www-servers/nginx/nginx-1.15.7-r1.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.15.7.ebuild
rename to www-servers/nginx/nginx-1.15.7-r1.ebuild
index e873f4b5416..6fbcd2eaad4 100644
--- a/www-servers/nginx/nginx-1.15.7.ebuild
+++ b/www-servers/nginx/nginx-1.15.7-r1.ebuild
@@ -381,6 +381,12 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
+   if use nginx_modules_http_auth_pam; then
+   cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
+   eapply 
"${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+   cd "${S}" || die
+   fi
+
if use nginx_modules_http_brotli; then
cd "${HTTP_BROTLI_MODULE_WD}" || die
eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: 27da4cba0ea86c7d562152c0df33c7315e8c8d06
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jun 22 10:36:32 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun 22 10:36:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27da4cba

www-servers/nginx: security cleanup

Bug: https://bugs.gentoo.org/658736
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/nginx/Manifest |5 -
 ...1.15-allow-compilation-without-HTTP-cache.patch |   42 -
 www-servers/nginx/nginx-1.13.12-r1.ebuild  | 1064 
 3 files changed,  deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6b64157a4ab..613d35ccc7a 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,13 +1,11 @@
 DIST modsecurity-2.9.2.tar.gz 4298993 BLAKE2B 
32a92148f0e1a1166cf888b8172fc55340c5712c9b770583703c74db450e77226629640c9db03f32e9f28397e6488669d06a89e4d31cb5ab5fff26b30ad843e0
 SHA512 
69c87ef6f7b6411f4803eb25af32969a1da59722121257c2edf345a3f5a4ab9ae8a49c886cbbfc722c5bda91c6d6ea55232f968c0a0407d7d7b3af53dc862c21
 DIST nginx-1.12.2.tar.gz 981687 BLAKE2B 
cca2d2b2267fee6feac7e91a5aaec229251e829203b02c207a6a89644fd6b1f2003d75225fadde9fdfc8dda444dc53c7ff0033a1e15a0f25019c878fc716d83f
 SHA512 
3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
-DIST nginx-1.13.12.tar.gz 1016311 BLAKE2B 
8b56e1e13c2598181153b9fe5f5a9ac6349ba1d6c98cfca708cb7ae1d3b6eec92df0132091107bc20c0ae1bec15020957c820f9414890151b4b1830f00af2d40
 SHA512 
c61668d4999d43ccd5ed8e99bd2f6992190503bb3c4103a22871e346feb8cbd049b04416ca7eb982c122a9a29bb21c6bb9f934411dd80bc02d946105f7917873
 DIST nginx-1.14.0.tar.gz 1016272 BLAKE2B 
37d292955dc5f03f6b3b05fd434807ba1033fab73494866e8bacb99df1d595a7665b3722e9bb7227a119cabfea79be08a14e589565cedb78693fc3990cee4466
 SHA512 
40f086c9f741727e6f55802b6c3a66f081f7c49c38646dc1491aa3e3c35bae12b65ea6594386609fc849bcd99a60d7cd8ecb3f8d519e0e9ab8db01d653e930e9
 DIST nginx-1.15.0.tar.gz 1020675 BLAKE2B 
b8151877d06f96276fc8186dc8c32b8f1479e27c7f6bdba9158b1d945661891e14c39d2ab3ff8991b3906c5fffe721ab4014d709895a6e3f5bc22b687ea3c536
 SHA512 
7dbdf437d8d546059a8a03aa9c8d2be98dba7306e2daa49611c16f1e56413a25d4c622da13a815e8075a10f4a0cd744167deaeb971c0a69189940a7a05fa32df
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 
BLAKE2B 
5ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333
 SHA512 
ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19bf4cf53973269
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 
BLAKE2B 
f2209c8b5eb5616a362f2b532245167a5940faad6d66d98a94b3bf2d1e33a73492d42c60a9ddad347a592362a002ff38273a5d1f61f663984a09e14a3fe35e0f
 SHA512 
323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B 
d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570
 SHA512 
6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-0.1.2.tar.gz 12668 BLAKE2B 
904d3f28dcf9f2d5a8eefa2ab8ff991e34624897a9932e351ec4cea05f2b0dbee34ea495de2d546510a556fb10041b388be963f28fecfcd7dc8638f950b36fd0
 SHA512 
661b4ce5cc678600e5df6be7588b0f0d5d914df9a6788c994cebfa25e211720b9e7d2c08fc34eb6a84743ae2929920ebf2888075e122ac23816ab7c0f3ef4b76
-DIST ngx_brotli-37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz 12692 BLAKE2B 
8b969fcd7daf37d790e81ff6dd4d43a210c9097052cc7a2db9f2aa8ad3115ffe175b0839210c234610e5731be35327eb08eb0eb3f28783d272b172df07259651
 SHA512 
fb12e4b50b9a472ee2f4fe08ffd86c38072a4c254a4f99627d6f2411f915c139f6e7cfe41f29222bc70b57942cde85d8ef2cd5458638201c751cd4c818d65f10
 DIST ngx_devel_kit-0.3.0-r1.tar.gz 66455 BLAKE2B 
e4e987a85b2283ba540b4b894382e65dac7fbca23e233b1031b38828908088370cdb1a9bded4d4ee1ceb1c2e1d506dc2b6f4ba5f6ee94248e863def5a1c8dd1a
 SHA512 
558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
 DIST ngx_http_auth_pam-1.5.1.tar.gz 6863 BLAKE2B 
00807cc3db8f6c007c968b8a30d7f6094b7d9db4eaa60d211fcb3ac60aeb28c5f8193578a7e1ca67acbbf57a319c8442fe44efc1e193927c3bce5961539f9c16
 SHA512 
973b94874d8a58c0df0ac2d31571eafc1e80b11179cba33ec88421a826207fbf7e99b0387e135a1ca48d82daacb78f19a4c21d3a27b49b16dc86b4748bb72261
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B 
f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: 9484e13a40320a485a8c5b07fb082e504f61693e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun  5 16:22:24 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun  5 16:25:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9484e13a

www-servers/nginx: bump to v1.15.0 mainline

- HTTP LUA module bumped to v0.10.13

- HTTP VHost Traffic Status module bumped to v0.1.16

- HTTP memc module bumped to v0.19

- nginScript module bumped to v0.2.1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/nginx/Manifest |5 +
 ...1.15-allow-compilation-without-HTTP-cache.patch |   42 +
 www-servers/nginx/nginx-1.15.0.ebuild  | 1070 
 3 files changed, 1117 insertions(+)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index e833d035860..b33c5cdfda7 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -2,6 +2,7 @@ DIST modsecurity-2.9.2.tar.gz 4298993 BLAKE2B 
32a92148f0e1a1166cf888b8172fc55340
 DIST nginx-1.12.2.tar.gz 981687 BLAKE2B 
cca2d2b2267fee6feac7e91a5aaec229251e829203b02c207a6a89644fd6b1f2003d75225fadde9fdfc8dda444dc53c7ff0033a1e15a0f25019c878fc716d83f
 SHA512 
3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
 DIST nginx-1.13.12.tar.gz 1016311 BLAKE2B 
8b56e1e13c2598181153b9fe5f5a9ac6349ba1d6c98cfca708cb7ae1d3b6eec92df0132091107bc20c0ae1bec15020957c820f9414890151b4b1830f00af2d40
 SHA512 
c61668d4999d43ccd5ed8e99bd2f6992190503bb3c4103a22871e346feb8cbd049b04416ca7eb982c122a9a29bb21c6bb9f934411dd80bc02d946105f7917873
 DIST nginx-1.14.0.tar.gz 1016272 BLAKE2B 
37d292955dc5f03f6b3b05fd434807ba1033fab73494866e8bacb99df1d595a7665b3722e9bb7227a119cabfea79be08a14e589565cedb78693fc3990cee4466
 SHA512 
40f086c9f741727e6f55802b6c3a66f081f7c49c38646dc1491aa3e3c35bae12b65ea6594386609fc849bcd99a60d7cd8ecb3f8d519e0e9ab8db01d653e930e9
+DIST nginx-1.15.0.tar.gz 1020675 BLAKE2B 
b8151877d06f96276fc8186dc8c32b8f1479e27c7f6bdba9158b1d945661891e14c39d2ab3ff8991b3906c5fffe721ab4014d709895a6e3f5bc22b687ea3c536
 SHA512 
7dbdf437d8d546059a8a03aa9c8d2be98dba7306e2daa49611c16f1e56413a25d4c622da13a815e8075a10f4a0cd744167deaeb971c0a69189940a7a05fa32df
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 
BLAKE2B 
5ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333
 SHA512 
ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19bf4cf53973269
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 
BLAKE2B 
f2209c8b5eb5616a362f2b532245167a5940faad6d66d98a94b3bf2d1e33a73492d42c60a9ddad347a592362a002ff38273a5d1f61f663984a09e14a3fe35e0f
 SHA512 
323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B 
d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570
 SHA512 
6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
@@ -16,6 +17,7 @@ DIST ngx_http_headers_more-0.32.tar.gz 28033 BLAKE2B 
51cff34f9a690a3c9a2a05b0408
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B 
fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a
 SHA512 
13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
 DIST ngx_http_lua-0.10.10.tar.gz 611973 BLAKE2B 
c84d039087973cc6f718fd5cfcb043fd96893d790d2d65b448faf63ad7e3b8713d529c7804a436cc972bcabb9d4d3a8a605fe70a4ccf0a696dfc493656ac513c
 SHA512 
3440e3fe714407f0ff61e0da207669655b443f7b70ef8a91693ea05ed96d8fde349d9c8ea30d5ff53ea3f8e4a5c7d0a2834e136c340b1b1365d62006339a1e4d
 DIST ngx_http_lua-0.10.11.tar.gz 616653 BLAKE2B 
6985823752755b78b626f597600adf45592ce4c8dc3a513dd43b9f5152c9746a795faa3714124d74814ad88739dd8889de50e764ad2ea808c48570d1e297aeec
 SHA512 
35e1510c9da71c8bdf028f4ac253404550a83bd904f6c5639697d78c76708625bb6deaa858a7d086b5582f71bb46578e8f804887a46ccfbaf5f4de8510cb1511
+DIST ngx_http_lua-0.10.13.tar.gz 624102 BLAKE2B 
009506e4cd505a2e383e2c6344b62b541b3bbb28410d4ae2e88139227e22e19dd14372a902f172fadaf82a76c5875936caff4a8c98ff740456488e5ac6ff8c53
 SHA512 
8c316b9d12dc35779fcddc6bb90942c096f19fd8c2e090b8397e1e1ca6f0ebd7a4edddc03fddb31310147ba4e9db9fc4b3749cfd2323046d88045b3bf07d
 DIST ngx_http_naxsi-0.55.3.tar.gz 187416 BLAKE2B 
de4b00bcfa3e81b7f339bde9f2517e228d2f914c1ac76babd7db1419168814d30f44623a67c0f79475c232ca456792cbdc8f2b6ef3ebd1524eff3f2acfa87685
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: da7d02ca95226161605c105a07d3d341fcb6477e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 18 16:04:41 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 18 16:05:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7d02ca

www-servers/nginx: Fix building of nginScript with -O3

Closes: https://bugs.gentoo.org/647958
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../nginx/files/njs-0.1.15-fix-o3-building.patch   | 24 ++
 www-servers/nginx/nginx-1.13.8-r1.ebuild   | 10 +++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/www-servers/nginx/files/njs-0.1.15-fix-o3-building.patch 
b/www-servers/nginx/files/njs-0.1.15-fix-o3-building.patch
new file mode 100644
index 000..55b71368bc3
--- /dev/null
+++ b/www-servers/nginx/files/njs-0.1.15-fix-o3-building.patch
@@ -0,0 +1,24 @@
+Origin: https://hg.nginx.org/njs/rev/22cc52416e84
+
+Bug: https://bugs.gentoo.org/647958
+
+--- a/njs/njs_fs.c
 b/njs/njs_fs.c
+@@ -566,6 +566,8 @@
+ }
+ 
+ mode = NULL;
++/* GCC complains about uninitialized flag.length. */
++flag.length = 0;
+ flag.start = NULL;
+ encoding.length = 0;
+ encoding.start = NULL;
+@@ -753,6 +755,8 @@
+ }
+ 
+ mode = NULL;
++/* GCC complains about uninitialized flag.length. */
++flag.length = 0;
+ flag.start = NULL;
+ encoding.length = 0;
+ encoding.start = NULL;

diff --git a/www-servers/nginx/nginx-1.13.8-r1.ebuild 
b/www-servers/nginx/nginx-1.13.8-r1.ebuild
index 252999d3fe6..82920e6b89d 100644
--- a/www-servers/nginx/nginx-1.13.8-r1.ebuild
+++ b/www-servers/nginx/nginx-1.13.8-r1.ebuild
@@ -153,7 +153,7 @@ 
HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 NJS_MODULE_PV="0.1.15"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz;
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}/nginx"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
 
 # We handle deps below ourselves
 SSL_DEPS_SKIP=1
@@ -373,6 +373,12 @@ src_prepare() {
cd "${S}" || die
fi
 
+   if use nginx_modules_http_javascript || use 
nginx_modules_stream_javascript; then
+   cd "${NJS_MODULE_WD}" || die
+   eapply "${FILESDIR}"/njs-0.1.15-fix-o3-building.patch
+   cd "${S}" || die
+   fi
+
if use nginx_modules_http_upstream_check; then
#eapply -p0 
"${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch
eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
@@ -576,7 +582,7 @@ src_configure() {
fi
 
if use nginx_modules_http_javascript || use 
nginx_modules_stream_javascript; then
-   myconf+=( --add-module=${NJS_MODULE_WD} )
+   myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
fi
 
if use nginx_modules_http_brotli; then

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: 85f4b8342e104aab605abf551c2b71ac87e0170e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Apr 14 10:37:27 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Apr 14 10:51:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f4b834

www-servers/nginx: Rev bump mainline slot to update lua module nginx-1.11.11+ 
patch

Ebuild changes:
===
 - HTTP LUA module bumped to v0.10.8
   Warning: While the module builds against nginx-1.11.11+ the author warns
that >=nginx-1.11.11 is still not an officially supported target
for that module. You are on your own!

- RTMP module bumped to v1.1.11

- HTTP memc module bumped to v0.18

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/nginx/Manifest |3 +-
 .../nginx/files/http_lua_nginx-1.11.11+-r1.patch   |  214 +
 .../nginx/files/http_lua_nginx-1.11.11+.patch  |   46 -
 ...x-1.11.12-r1.ebuild => nginx-1.11.13-r1.ebuild} |   22 +-
 www-servers/nginx/nginx-1.11.13.ebuild | 1011 
 5 files changed, 229 insertions(+), 1067 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index e121a44fcc7..06b177149bf 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,7 +1,6 @@
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 
958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 
374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 WHIRLPOOL 
5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.10.3.tar.gz 911509 SHA256 
75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90 SHA512 
25cddbe5c419700aeca41bff3be5b7c3accfb38ad846ec8d91d81ab7c15f10db719f02d9263edf1fa12f59805ff7001b62864dc2885370b24afeea1d7d2afbbf
 WHIRLPOOL 
1ebf540d49d28a853a9221a558b53d28e2e7dfddf345e433baa4c2b819f6e1fe34528b4680387147c73271d3837529a4452e53b863dff5d29772c2b0a75e0ba6
 DIST nginx-1.11.10.tar.gz 967773 SHA256 
778b3cabb07633f754cd9dee32fc8e22582bce22bfa407be76a806abd935533d SHA512 
b6437d8305547a834a0f3ad076ac591b90189eb922f48759094efaa9618e39fc249600ab13650113fe841fc9af0b736acc61a9b9baba7bacd35224c34df1bbc9
 WHIRLPOOL 
f9535d4fabad7603cc384dda13aca51be77c7901d099190f9d5a187e517128a56a28cb851408b93091f8d99ce118678857ec08fba16bec4c2e2ed2d75ab543bd
-DIST nginx-1.11.12.tar.gz 979963 SHA256 
2aff7f9396d1f77256efc363e1cc05ba52d40a29e6de4d9bc08aa444eea14122 SHA512 
fc40551b83c98cf81a3a7728c8b143a4d8b98251e8caccf5391397639aacb631ff57427c8207a3f9c86f0a5cb212edaf3ed0d9d92ab085d3387097b99326ff69
 WHIRLPOOL 
8da4c8a7578abad39f073b4f034bf328e896b51f62d25ad8280c67334e190c1277d988803e9ce169b7e3e1170bbd49dee8f1e2b1cb0f39460e77da568ab75bf0
 DIST nginx-1.11.13.tar.gz 980784 SHA256 
360b601ef8ed2998c80fa56a27bf3cd745c3ce18c5fb10892e6595467b1415d3 SHA512 
6546a1d96e5234c9512217559c22bc4be0e5f793d6082a9a3acaa1724c91c656b36a976cb452195b256915dc0d21fd433f539cd6c06d73c8dbb0233220d54fa8
 WHIRLPOOL 
53b3e0b8767ea93d4a3daaf5cfcd489dd83d9f60f53f985c677dfb328b7e6aee13114290bed22b268bca12d2e63fbb142b2357ef7dd8166e8da9eac4c931289a
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 
SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 
323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 WHIRLPOOL 
ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 SHA256 
6f9102321d8c68df6d67e9bde145a8de3f45f99f6cb47c08735a86f003234d31 SHA512 
6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 WHIRLPOOL 
38abe56e177e22dad68ac7d6570425ecd763d2e891627a75156a6f39bd7edc54f664c3d2f638e1ea57c743dadc6a8c9889be087abbdb4c98b5641c299f7fbc07
@@ -13,6 +12,7 @@ DIST ngx_http_echo-0.60.tar.gz 52771 SHA256 
1077da2229ac7d0a0215e9e6817e297c1069
 DIST ngx_http_fancyindex-0.4.1.tar.gz 21130 SHA256 
2b00d8e0ad2a67152a9cee7b7ee67990c742d501412df912baaf1eee9bb6dc71 SHA512 
ce0043ad4a2b638c5d99244d6caaa65ad142cea78884084a9aeca5a9593c68dbe508c9e4dd85dc5722eb63ef386612bffc48d4b6fc1487df244fbcb7a73bffe1
 WHIRLPOOL 
4a885afbadf64bbd25df6580a099472ae48836d9dddfe1dee6ac6a6f97bfb0cf7120ff10dd69fceca7085fab590bec3a4b4b5be5644f2352375316885ddc3cac
 DIST ngx_http_headers_more-0.32.tar.gz 28033 SHA256 
c6d9dab8ea1fc997031007e2e8f47cced01417e203cd88d53a9fe9f6ae138720 SHA512 
e42582b45c3111de3940bbeb67ce161aca2d55adcfb00c61c12256fa0e36221d38723013f36edbcf6d1b520f8dfb49d4657df8a956e66d36e68425afad382bd1
 WHIRLPOOL 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/, profiles/base/

[Thomas Deutschmann]

commit: eb9262562ad6fc47db6f31d759a3d5b7608a1e2e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Apr  4 18:17:50 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Apr  4 18:24:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb926256

www-servers/nginx: Rev bump mainline to re-enable mod_security support

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 profiles/base/package.use.mask |  6 
 .../nginx/files/http_security-pr_1373.patch| 33 ++
 ...ginx-1.11.12.ebuild => nginx-1.11.12-r1.ebuild} |  1 +
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 96da6703d41..94179afe301 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,12 +7,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Thomas Deutschmann  (22 Mar 2017)
-# mod_security is currently incompatible with recent changes
-# in >=nginx-1.11.11.
-# https://github.com/SpiderLabs/ModSecurity/issues/1359
->=www-servers/nginx-1.11.11 nginx_modules_http_security
-
 # Michał Górny  (18 Mar 2017)
 # Requires removed old version of media-gfx/graphviz.
 media-gfx/nip2 graphviz

diff --git a/www-servers/nginx/files/http_security-pr_1373.patch 
b/www-servers/nginx/files/http_security-pr_1373.patch
new file mode 100644
index 000..e4069e16330
--- /dev/null
+++ b/www-servers/nginx/files/http_security-pr_1373.patch
@@ -0,0 +1,33 @@
+From d19df159043106a4d6dfd113696900b5b0dae24b Mon Sep 17 00:00:00 2001
+From: Andrei Belov 
+Date: Mon, 3 Apr 2017 12:52:01 +0300
+Subject: [PATCH] Fix building with nginx >= 1.11.11
+
+Closes SpiderLabs/ModSecurity#1359
+
+See also:
+http://hg.nginx.org/nginx/rev/e662cbf1b932
+---
+ nginx/modsecurity/ngx_http_modsecurity.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/nginx/modsecurity/ngx_http_modsecurity.c 
b/nginx/modsecurity/ngx_http_modsecurity.c
+index 7c13953..367b2b8 100644
+--- a/nginx/modsecurity/ngx_http_modsecurity.c
 b/nginx/modsecurity/ngx_http_modsecurity.c
+@@ -528,9 +528,15 @@ ngx_http_modsecurity_save_request_body(ngx_http_request_t 
*r)
+ 
+ hc = r->http_connection;
+ 
++#if defined(nginx_version) && nginx_version >= 1011011
++if (hc->free && size == cscf->large_client_header_buffers.size) {
++
++buf = hc->free->buf;
++#else
+ if (hc->nfree && size == cscf->large_client_header_buffers.size) {
+ 
+ buf = hc->free[--hc->nfree];
++#endif
+ 
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+"ModSecurity: use http free large header buffer: 
%p %uz",

diff --git a/www-servers/nginx/nginx-1.11.12.ebuild 
b/www-servers/nginx/nginx-1.11.12-r1.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.11.12.ebuild
rename to www-servers/nginx/nginx-1.11.12-r1.ebuild
index 2790e11c3f3..7870abf9766 100644
--- a/www-servers/nginx/nginx-1.11.12.ebuild
+++ b/www-servers/nginx/nginx-1.11.12-r1.ebuild
@@ -359,6 +359,7 @@ src_prepare() {
cd "${HTTP_SECURITY_MODULE_WD}" || die
 
eapply "${FILESDIR}"/http_security-pr_1158.patch
+   eapply "${FILESDIR}"/http_security-pr_1373.patch
 
eautoreconf
 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: 91414fcbaefc2c8c9cb7f4db7fdeda9127452257
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 15 21:33:48 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 15 21:48:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91414fcb

www-servers/nginx: Bump to v1.11.6 mainline

Ebuild changes:
===
 - ngx_headers_more module updated to v0.32

 - LUA module updated to v0.10.7

 - Patch for ngx_memc added to solve a build issue with
   latest nginx [Link 1]

Link 1: https://github.com/openresty/memc-nginx-module/issues/26

Package-Manager: portage-2.3.2

 www-servers/nginx/Manifest |   3 +
 .../nginx/files/http_memc-0.17-issue_26.patch  |  40 +
 www-servers/nginx/nginx-1.11.6.ebuild  | 815 +
 3 files changed, 858 insertions(+)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index b76141c..9c0b9aa 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -3,6 +3,7 @@ DIST nginx-1.10.1.tar.gz 909077 SHA256 
1fd35846566485e03c0e318989561c135c598323f
 DIST nginx-1.10.2.tar.gz 910812 SHA256 
1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2 SHA512 
f2d5a4fbabaf9333bae46461bcbe3dbcc5ff7e8f8c7a5dead3063e3d59c9ec15dc85262a23ca7d693db45a50ec98a70fb216b3da9872ee23d57b6bfaf064876e
 WHIRLPOOL 
7e819f43a68de49d3cceb3e5ec81eef6872859df0abca2be00fb73c8779c2716b6997ea5f8cadb93af195d9f4d07a4404f51e0752dd881628de93a0c0289aea7
 DIST nginx-1.11.4.tar.gz 949793 SHA256 
06221c1f43f643bc6bfe5b2c26d19e09f2588d5cde6c65bdb77dfcce7c026b3b SHA512 
c6a03c440a274576434aa74932b3fa7cd49174d9e2d8c6e480838637f33f158e31b6f25cac97e158f386bb92f62ff9636c2d3ac1a552e27a860eb9448e2f3f94
 WHIRLPOOL 
53c371cb34bc55f28d0a0915e08a4fdeffcfcbc8571628db086e0a75627c926693f2faba8608f0c444bc79df244b7f321e6017eda0eb7710d2ccb6f25aac8b75
 DIST nginx-1.11.5.tar.gz 956517 SHA256 
223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6 SHA512 
f41b21b5d8c6b7fe7f8713e96fb6b1c40da49bf64ebb790fb5aa38f036a37b36fcf048ff72c2216552b2f75366b30c5fcdef26312bd4e5515b2476a1cd944b8c
 WHIRLPOOL 
fba49ae277ec2114b06eb0fdce87161ac7bd3e0ca90387dc58caf327c5f12056be07eeba677ff37c59e7d759054ec276ce4db647250774c57588619a1803592c
+DIST nginx-1.11.6.tar.gz 960331 SHA256 
3153abbb518e2d9c032e1b127da3dc0028ad36cd4679e5f3be0b8afa33bc85bd SHA512 
1969f527d4554a976d14e82c2297c519a0d0d82a9fbd3cc703ab42a23067c7fcf101ddf16f1abff374c71f37969fd7c58d2a344c57566538b821acc32cd3d979
 WHIRLPOOL 
67ed24c25b20f6d94f3a0602946f750b4efafd79d3a093a35fdf370a20377abcc2a54c00fcd5e7bc54305515da9234fb2f192c744a7fb59c4bbdee2ba0c0f626
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 
SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 
323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 WHIRLPOOL 
ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2
 DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 
SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 
f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da971
 WHIRLPOOL 
26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 SHA256 
6f9102321d8c68df6d67e9bde145a8de3f45f99f6cb47c08735a86f003234d31 SHA512 
6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 WHIRLPOOL 
38abe56e177e22dad68ac7d6570425ecd763d2e891627a75156a6f39bd7edc54f664c3d2f638e1ea57c743dadc6a8c9889be087abbdb4c98b5641c299f7fbc07
@@ -17,8 +18,10 @@ DIST ngx_http_fancyindex-0.4.0.tar.gz 18419 SHA256 
152cc2cf082c23cbc7b0fc76f14af
 DIST ngx_http_fancyindex-0.4.1.tar.gz 21130 SHA256 
2b00d8e0ad2a67152a9cee7b7ee67990c742d501412df912baaf1eee9bb6dc71 SHA512 
ce0043ad4a2b638c5d99244d6caaa65ad142cea78884084a9aeca5a9593c68dbe508c9e4dd85dc5722eb63ef386612bffc48d4b6fc1487df244fbcb7a73bffe1
 WHIRLPOOL 
4a885afbadf64bbd25df6580a099472ae48836d9dddfe1dee6ac6a6f97bfb0cf7120ff10dd69fceca7085fab590bec3a4b4b5be5644f2352375316885ddc3cac
 DIST ngx_http_headers_more-0.30.tar.gz 27793 SHA256 
2aad309a9313c21c7c06ee4e71a39c99d4d829e31c8b3e7d76f8c964ea8047f5 SHA512 
378f2c4b4fbf580e59c8ad3ef5fcb617e4669b7b506a0ae87e4e0bc920d34e16fe55565e48dd57e7b6c37ae8b407646ca64f5d84a2fbbe2d41d719c7643c1a82
 WHIRLPOOL 
f50bb5c2e23fb63d98904163a873edf947f65e57dc0f73489024243c1d5b04e0677015a075d315585e535e226b8dad659bada563778b8ddf4d060e918fc37ace
 DIST ngx_http_headers_more-0.31.tar.gz 27941 SHA256 
b2e8162cce2d24861b1ed5bbb30fc51d5215e3f4bb9d01f53fc344904d5911e7 SHA512 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: d85eb428d817a74efc8fd47d54ceb4e02564b6e2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 19 14:37:20 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 19 14:38:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d85eb428

www-servers/nginx: Fix building of uploadprogress module; Add autotools 
depedencies

Ebuild changes:
===
- Since nginx-upload-progress-module was bumped to v0.9.2 (commit
  f03aacc3dc) the module was only build as dynamic module so it wasn't
  useable in Gentoo. This is now fixed. (Bug #593450)

- Cherry-picked a patch for cURL detection in Mod_Security

- Added autotools depedencies (only necessary when you build
  nginx_modules_http_security)

Gentoo-Bug: https://bugs.gentoo.org/593450

Package-Manager: portage-2.3.2

 .../nginx/files/http_security-pr_1158.patch| 103 +
 .../nginx/files/http_uploadprogress-issue_50.patch |  32 +++
 ...{nginx-1.10.2.ebuild => nginx-1.10.2-r1.ebuild} |  36 +--
 ...{nginx-1.11.5.ebuild => nginx-1.11.5-r1.ebuild} |  36 +--
 4 files changed, 191 insertions(+), 16 deletions(-)

diff --git a/www-servers/nginx/files/http_security-pr_1158.patch 
b/www-servers/nginx/files/http_security-pr_1158.patch
new file mode 100644
index ..92f1094
--- /dev/null
+++ b/www-servers/nginx/files/http_security-pr_1158.patch
@@ -0,0 +1,103 @@
+From 2fa8ffea68498e02005e85c27e61bde30718ae3b Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Sat, 11 Jun 2016 16:18:17 +0200
+Subject: [PATCH 1/2] configure: Fix detection whether libcurl is linked
+ against gnutls
+
+The find_curl macro is also checking whether libcurl is linked against
+gnutls. However the check depends on "CURL_LIBS" which wasn't defined
+by the macro.
+
+This commit will define "CURL_LIBS" so that the check works as expected.
+---
+ build/find_curl.m4 | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/build/find_curl.m4 b/build/find_curl.m4
+index 6b23ad6..3310e40 100644
+--- a/build/find_curl.m4
 b/build/find_curl.m4
+@@ -2,6 +2,7 @@ dnl Check for CURL Libraries
+ dnl CHECK_CURL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+ dnl Sets:
+ dnl  CURL_CFLAGS
++dnl  CURL_LDADD
+ dnl  CURL_LIBS
+ 
+ CURL_CONFIG=""
+@@ -57,7 +58,8 @@ if test -n "${curl_path}"; then
+ if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl VERSION: 
$CURL_VERSION); fi
+ CURL_CFLAGS="`${CURL_CONFIG} --cflags`"
+ if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: 
$CURL_CFLAGS); fi
+-CURL_LDADD="`${CURL_CONFIG} --libs`"
++CURL_LIBS="`${CURL_CONFIG} --libs`"
++CURL_LDADD="${CURL_LIBS}"
+ if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl LDADD: 
$CURL_LIBS); fi
+ 
+ dnl # Check version is ok
+
+From 67f98e7da04251a40a0172e3dfac2c5a6ac6f7dd Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Sat, 11 Jun 2016 16:48:58 +0200
+Subject: [PATCH 2/2] configure: Move verbose_output declaration up to the
+ beginning
+
+Macros like "find_curl" are using "verbose_output" variable but because some
+of them are called before we define the variable we are seeing errors like
+
+  ./configure: line 13855: test: : integer expression expected
+
+This commit will fix the problem by moving the "verbose_output" declaration
+up to the beginning so that the variable is available for every macro.
+---
+ configure.ac | 30 --
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7517885..0f32b01 100644
+--- a/configure.ac
 b/configure.ac
+@@ -70,6 +70,22 @@ AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
+ 
+ ### Configure Options
+ 
++# Verbose output
++AC_ARG_ENABLE(verbose-output,
++  AS_HELP_STRING([--enable-verbose-output],
++ [Enable more verbose configure output.]),
++[
++  if test "$enableval" != "no"; then
++verbose_output=1
++  else
++verbose_output=0
++  fi
++],
++[
++  verbose_output=0
++])
++
++
+ #OS type
+ 
+ AC_CANONICAL_HOST
+@@ -410,20 +426,6 @@ AC_ARG_ENABLE(errors,
+   report_errors=1
+ ])
+ 
+-# Verbose output
+-AC_ARG_ENABLE(verbose-output,
+-  AS_HELP_STRING([--enable-verbose-output],
+- [Enable more verbose configure output.]),
+-[
+-  if test "$enableval" != "no"; then
+-verbose_output=1
+-  else
+-verbose_output=0
+-  fi
+-],
+-[
+-  verbose_output=0
+-])
+ 
+ # Strict Compile
+ AC_ARG_ENABLE(strict-compile,

diff --git a/www-servers/nginx/files/http_uploadprogress-issue_50.patch 
b/www-servers/nginx/files/http_uploadprogress-issue_50.patch
new file mode 100644
index ..3347c5b
--- /dev/null
+++ b/www-servers/nginx/files/http_uploadprogress-issue_50.patch
@@ -0,0 +1,32 @@
+From edd7e026fa992f58b04ea9d00b56239f37b3e320 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Wed, 19 Oct 2016 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: d2b1f12c9d19386a8c4e14a5940661b06bb126da
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 12 19:47:33 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 12 19:48:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b1f12c

www-servers/nginx: Drop old

Package-Manager: portage-2.3.2

 www-servers/nginx/Manifest |   2 -
 11.3-fix-build-without-stream_ssl_module.patch |  30 -
 www-servers/nginx/nginx-1.10.1-r2.ebuild   | 768 
 www-servers/nginx/nginx-1.11.3-r1.ebuild   | 782 -
 www-servers/nginx/nginx-1.11.3-r2.ebuild   | 782 -
 5 files changed, 2364 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6053301..af7423c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,5 @@
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 
958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 
374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 WHIRLPOOL 
5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.10.1.tar.gz 909077 SHA256 
1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SHA512 
fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1
 WHIRLPOOL 
6942f70c3279a28bd8d664d085dee68bf0d0526c8dcb636f3258c9de598268efc984af72e527efd86889bd13911b38b0bdb2de1e92eef69cabd02f7080f64eb6
-DIST nginx-1.11.3.tar.gz 938045 SHA256 
4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610 SHA512 
b983aca61335facf5778675b80fc28341ec9cfee2190319ed130b9c5d5ceff8133677f4609ecafd5a782daa5962e41bb6cb6a857380bbbe9cee67cd0ab2026d4
 WHIRLPOOL 
f197bc4f5e1ed234b26d625db5bf665a24c09da316e3cae3c0f394f0b4db116acad5db15add7fd92b5fe1428f95449538584f57272f8bad89b912fb38fbb2c7d
 DIST nginx-1.11.4.tar.gz 949793 SHA256 
06221c1f43f643bc6bfe5b2c26d19e09f2588d5cde6c65bdb77dfcce7c026b3b SHA512 
c6a03c440a274576434aa74932b3fa7cd49174d9e2d8c6e480838637f33f158e31b6f25cac97e158f386bb92f62ff9636c2d3ac1a552e27a860eb9448e2f3f94
 WHIRLPOOL 
53c371cb34bc55f28d0a0915e08a4fdeffcfcbc8571628db086e0a75627c926693f2faba8608f0c444bc79df244b7f321e6017eda0eb7710d2ccb6f25aac8b75
 DIST nginx-1.11.5.tar.gz 956517 SHA256 
223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6 SHA512 
f41b21b5d8c6b7fe7f8713e96fb6b1c40da49bf64ebb790fb5aa38f036a37b36fcf048ff72c2216552b2f75366b30c5fcdef26312bd4e5515b2476a1cd944b8c
 WHIRLPOOL 
fba49ae277ec2114b06eb0fdce87161ac7bd3e0ca90387dc58caf327c5f12056be07eeba677ff37c59e7d759054ec276ce4db647250774c57588619a1803592c
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 
SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 
323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 WHIRLPOOL 
ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2
@@ -32,5 +31,4 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 
1c62ebb31e3caafad91720962770b0e7a4287f
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 
7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 
b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 WHIRLPOOL 
64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
 DIST ngx_rtmp-1.1.10.tar.gz 519877 SHA256 
f9491dd24390b0d5d70dfe3553edf3d14efeb7c7a81b4d4a20c5cfeaefc1141c SHA512 
bcc0aee3308af7c61bf01a5530fcf1dae938e6778306f6e3eb5995e6d0529f43d33b7ee2acb813d5a39acc92e4853d207a01e8e41b766a6e0dd07aade60cd98f
 WHIRLPOOL 
655f4dcb02f928698ae14d29e5b7f60ad3fd71c757d67f1930c695a3501054d124a92f7ada7d4e605204f1e73e0779cad0b60102bc98d64764535581db0b1867
 DIST ngx_rtmp-1.1.7.tar.gz 519735 SHA256 
7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 SHA512 
9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e
 WHIRLPOOL 
e9c1fc9c3c965ae7047657f76e0997d5da107aff7dd9e5cf3ddb5a2d8f388efd8439b82923e199dc36def449567b8529e06c80f69c36f42128236ac0be5719d5
-DIST ngx_rtmp-1.1.8.tar.gz 519647 SHA256 
de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965 SHA512 
554249b1b8bb70952a0585dcc5c55c70daa63f2eba5ef35f8b1a4932fdfd6c95b0a48739857ba8dcab08ff1e91d048f3dc43bf65250890fd7a679cdabfed880a
 WHIRLPOOL 
a8cd4361419fbae97f199d788078c62ffc442158d0338aa677e5d6d21fb27a336da85e901ee6463ff6b33201092575237d5b6f20a1d80d924ac6591cbb75c9d7
 DIST ngx_rtmp-1.1.9.tar.gz 519807 SHA256 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Thomas Deutschmann]

commit: 77945d7d197a90163f20bb183e71538c40fd7f8b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 10 22:13:12 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 10 22:13:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77945d7d

www-servers/nginx: Cleanup

Removing previous ebuilds with incomplete HTTPoxy mitigation.

Package-Manager: portage-2.3.0

 www-servers/nginx/Manifest |   1 -
 .../nginx/files/nginx-httpoxy-mitigation.patch |  33 -
 www-servers/nginx/nginx-1.10.1-r1.ebuild   | 768 
 www-servers/nginx/nginx-1.11.2.ebuild  | 774 
 www-servers/nginx/nginx-1.11.3.ebuild  | 782 -
 5 files changed, 2358 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index a721492..da1e09c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,5 @@
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 
958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 
374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 WHIRLPOOL 
5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.10.1.tar.gz 909077 SHA256 
1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SHA512 
fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1
 WHIRLPOOL 
6942f70c3279a28bd8d664d085dee68bf0d0526c8dcb636f3258c9de598268efc984af72e527efd86889bd13911b38b0bdb2de1e92eef69cabd02f7080f64eb6
-DIST nginx-1.11.2.tar.gz 924979 SHA256 
a0327be3e647bdc4a1b3ef98946a8e8fbf258ce8da6bed9a94222b249ae2700a SHA512 
56fb66dd7267780acaa186679f3abefcddb3dd7701d0d87518e98c83b62cd171f40e4ce47cec0a42d31181d57856c9ba820ded001975bd50c9c09dcf409b11bf
 WHIRLPOOL 
31de538411e164727cfde081300b0e98eb8dbd3fecdbad73a22672b33b6b23d08b33aa8e238d3b72649c474ef6abf7026a43d06e329b35a1a5a3e9e4ace72c91
 DIST nginx-1.11.3.tar.gz 938045 SHA256 
4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610 SHA512 
b983aca61335facf5778675b80fc28341ec9cfee2190319ed130b9c5d5ceff8133677f4609ecafd5a782daa5962e41bb6cb6a857380bbbe9cee67cd0ab2026d4
 WHIRLPOOL 
f197bc4f5e1ed234b26d625db5bf665a24c09da316e3cae3c0f394f0b4db116acad5db15add7fd92b5fe1428f95449538584f57272f8bad89b912fb38fbb2c7d
 DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 
SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 
f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da971
 WHIRLPOOL 
26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70
 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 
e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 
2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded
 WHIRLPOOL 
1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb

diff --git a/www-servers/nginx/files/nginx-httpoxy-mitigation.patch 
b/www-servers/nginx/files/nginx-httpoxy-mitigation.patch
deleted file mode 100644
index 7e9618b..000
--- a/www-servers/nginx/files/nginx-httpoxy-mitigation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-httpoxy mitigation
-
-See https://httpoxy.org/ and https://www.nginx.com/blog/?p=41962 for details.

- conf/fastcgi.conf   | 3 +++
- conf/fastcgi_params | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/conf/fastcgi.conf b/conf/fastcgi.conf
-index 091738c..9f7e192 100644
 a/conf/fastcgi.conf
-+++ b/conf/fastcgi.conf
-@@ -24,3 +24,6 @@ fastcgi_param  SERVER_NAME$server_name;
- 
- # PHP only, required if PHP was built with --enable-force-cgi-redirect
- fastcgi_param  REDIRECT_STATUS200;
-+
-+# httpoxy mitigation (https://httpoxy.org/ 
https://www.nginx.com/blog/?p=41962)
-+fastcgi_param  HTTP_PROXY "";
-diff --git a/conf/fastcgi_params b/conf/fastcgi_params
-index 28decb9..3be3a95 100644
 a/conf/fastcgi_params
-+++ b/conf/fastcgi_params
-@@ -23,3 +23,6 @@ fastcgi_param  SERVER_NAME$server_name;
- 
- # PHP only, required if PHP was built with --enable-force-cgi-redirect
- fastcgi_param  REDIRECT_STATUS200;
-+
-+# httpoxy mitigation (https://httpoxy.org/ 
https://www.nginx.com/blog/?p=41962)
-+fastcgi_param  HTTP_PROXY "";
--- 
-2.9.2
-

diff --git a/www-servers/nginx/nginx-1.10.1-r1.ebuild 
b/www-servers/nginx/nginx-1.10.1-r1.ebuild
deleted file mode 100644
index 825a13b..000
--- a/www-servers/nginx/nginx-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,768 +0,0 @@
-# Copyright 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Lars Wendler]

commit: 093003aa3711306e14d4e023ab7d822ed00f6cf4
Author: Thomas Deutschmann  whissi  de>
AuthorDate: Tue Jul 19 23:10:01 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 26 09:51:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093003aa

www-servers/nginx: Cleanup

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 www-servers/nginx/Manifest  |   1 -
 www-servers/nginx/files/nginx.conf  |  72 ---
 www-servers/nginx/files/nginx.initd-r2  |  89 ---
 www-servers/nginx/files/rtmp-nginx-1.11.0.patch |  39 --
 www-servers/nginx/nginx-1.11.1.ebuild   | 761 
 5 files changed, 962 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index a6ba11c..fde5d70 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,5 @@
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 
958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 
374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 WHIRLPOOL 
5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.10.1.tar.gz 909077 SHA256 
1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SHA512 
fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1
 WHIRLPOOL 
6942f70c3279a28bd8d664d085dee68bf0d0526c8dcb636f3258c9de598268efc984af72e527efd86889bd13911b38b0bdb2de1e92eef69cabd02f7080f64eb6
-DIST nginx-1.11.1.tar.gz 913417 SHA256 
5d8dd0197e3ffeb427729c045382182fb28db8e045c635221b2e0e6722821ad0 SHA512 
01330a5200b9b5ac5788cd95b2857d2ff87bf0a073a93e3e441b89d19f12137b496e6de67145c04cc74ba88d599a7be96d622f29785e30df23fc8a657adf8b2a
 WHIRLPOOL 
e902d408f45eb9168db5a5220275896a072419660505eb45816280f1a2d2150593262d601583d2c34b521fae560fdd237e6609e85bf03a30b7721c10299a207e
 DIST nginx-1.11.2.tar.gz 924979 SHA256 
a0327be3e647bdc4a1b3ef98946a8e8fbf258ce8da6bed9a94222b249ae2700a SHA512 
56fb66dd7267780acaa186679f3abefcddb3dd7701d0d87518e98c83b62cd171f40e4ce47cec0a42d31181d57856c9ba820ded001975bd50c9c09dcf409b11bf
 WHIRLPOOL 
31de538411e164727cfde081300b0e98eb8dbd3fecdbad73a22672b33b6b23d08b33aa8e238d3b72649c474ef6abf7026a43d06e329b35a1a5a3e9e4ace72c91
 DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 
SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 
f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da971
 WHIRLPOOL 
26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70
 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 
e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 
2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded
 WHIRLPOOL 
1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb

diff --git a/www-servers/nginx/files/nginx.conf 
b/www-servers/nginx/files/nginx.conf
deleted file mode 100644
index 74c015f..000
--- a/www-servers/nginx/files/nginx.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-user nginx nginx;
-worker_processes 1;
-
-error_log /var/log/nginx/error_log info;
-
-events {
-   worker_connections 1024;
-   use epoll;
-}
-
-http {
-   include /etc/nginx/mime.types;
-   default_type application/octet-stream;
-
-   log_format main
-   '$remote_addr - $remote_user [$time_local] '
-   '"$request" $status $bytes_sent '
-   '"$http_referer" "$http_user_agent" '
-   '"$gzip_ratio"';
-
-   client_header_timeout 10m;
-   client_body_timeout 10m;
-   send_timeout 10m;
-
-   connection_pool_size 256;
-   client_header_buffer_size 1k;
-   large_client_header_buffers 4 2k;
-   request_pool_size 4k;
-
-   gzip on;
-   gzip_min_length 1100;
-   gzip_buffers 4 8k;
-   gzip_types text/plain;
-
-   output_buffers 1 32k;
-   postpone_output 1460;
-
-   sendfile on;
-   tcp_nopush on;
-   tcp_nodelay on;
-
-   keepalive_timeout 75 20;
-
-   ignore_invalid_headers on;
-
-   index index.html;
-
-   server {
-   listen 127.0.0.1;
-   server_name localhost;
-
-   access_log /var/log/nginx/localhost.access_log main;
-   error_log /var/log/nginx/localhost.error_log info;
-
-   root /var/www/localhost/htdocs;
-   }
-
-   # SSL example
-   #server {
-   #   listen 127.0.0.1:443;
-   #   server_name localhost;
-
-   #   ssl on;
- 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Lars Wendler]

commit: 0e2ac3575abbbc0493bb2d8dff24cb00a3b9f970
Author: Thomas Deutschmann  whissi  de>
AuthorDate: Tue Jul 19 23:03:02 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 26 09:51:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2ac357

www-servers/nginx: Bump to v1.11.2 (bug #588816)

Bug: https://bugs.gentoo.org/588816
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 www-servers/nginx/Manifest |   2 +
 .../nginx/files/http-sticky-nginx-1.11.2.patch |  64 ++
 www-servers/nginx/nginx-1.11.2.ebuild  | 761 +
 3 files changed, 827 insertions(+)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2932c5a..a6ba11c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,7 @@
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 
958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 
374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 WHIRLPOOL 
5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.10.1.tar.gz 909077 SHA256 
1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SHA512 
fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1
 WHIRLPOOL 
6942f70c3279a28bd8d664d085dee68bf0d0526c8dcb636f3258c9de598268efc984af72e527efd86889bd13911b38b0bdb2de1e92eef69cabd02f7080f64eb6
 DIST nginx-1.11.1.tar.gz 913417 SHA256 
5d8dd0197e3ffeb427729c045382182fb28db8e045c635221b2e0e6722821ad0 SHA512 
01330a5200b9b5ac5788cd95b2857d2ff87bf0a073a93e3e441b89d19f12137b496e6de67145c04cc74ba88d599a7be96d622f29785e30df23fc8a657adf8b2a
 WHIRLPOOL 
e902d408f45eb9168db5a5220275896a072419660505eb45816280f1a2d2150593262d601583d2c34b521fae560fdd237e6609e85bf03a30b7721c10299a207e
+DIST nginx-1.11.2.tar.gz 924979 SHA256 
a0327be3e647bdc4a1b3ef98946a8e8fbf258ce8da6bed9a94222b249ae2700a SHA512 
56fb66dd7267780acaa186679f3abefcddb3dd7701d0d87518e98c83b62cd171f40e4ce47cec0a42d31181d57856c9ba820ded001975bd50c9c09dcf409b11bf
 WHIRLPOOL 
31de538411e164727cfde081300b0e98eb8dbd3fecdbad73a22672b33b6b23d08b33aa8e238d3b72649c474ef6abf7026a43d06e329b35a1a5a3e9e4ace72c91
 DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 
SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 
f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da971
 WHIRLPOOL 
26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70
 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 
e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 
2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded
 WHIRLPOOL 
1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb
 DIST ngx_devel_kit-0.3.0-r1.tar.gz 66455 SHA256 
88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 SHA512 
558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
 WHIRLPOOL 
5f6ed4e6850d2ce7e8c65e0570a7e2c74a1fe360e167644ed405fff682ab178b09c722c99c1df9af552fb816219b9fc04dcdf638b3e4af68c688434cdb33aa59
@@ -20,3 +21,4 @@ DIST ngx_memc_module-0.17.tar.gz 36369 SHA256 
25cbe3ff4931283a681260607bc91ae4a9
 DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 
1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 
d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 WHIRLPOOL 
2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 
7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 
b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 WHIRLPOOL 
64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
 DIST ngx_rtmp-1.1.7.tar.gz 519735 SHA256 
7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 SHA512 
9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e
 WHIRLPOOL 
e9c1fc9c3c965ae7047657f76e0997d5da107aff7dd9e5cf3ddb5a2d8f388efd8439b82923e199dc36def449567b8529e06c80f69c36f42128236ac0be5719d5
+DIST ngx_rtmp-1.1.8.tar.gz 519647 SHA256 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Zac Medico]

commit: 88fd6990872130f6e6f60fdbac4fe6d53c0afbd9
Author: Zac Medico  gentoo  org>
AuthorDate: Sat May 14 09:03:41 2016 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat May 14 09:05:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fd6990

www-servers/nginx: fix upstream check module segfault for bug 582992

* update module snapshot to fix upstream issue 49, a segfault which
  occurs in the ngx_http_upstream_check_find_shm_peer function

* remove check-0.3.0-segfault-on-reload.patch which is included in
  the new snapshot

Package-Manager: portage-2.2.28

 www-servers/nginx/Manifest |  1 +
 .../files/check-0.3.0-segfault-on-reload.patch | 26 --
 www-servers/nginx/nginx-1.10.0.ebuild  |  9 +++-
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 26d2866..8f597c4 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -27,6 +27,7 @@ DIST ngx_http_push_stream-0.5.1.tar.gz 175263 SHA256 
a95f31e80120fd7324795b92a0d
 DIST ngx_http_push_stream-0.5.2.tar.gz 182008 SHA256 
1d07f38acdb8194bd49344b0ba21de101070de9b8731d27a8d22e928850bc199 SHA512 
ee8bf9ece652da6aa5a39879298bba70d1842696545259f3f5e302cc61397b35f016364805805f9ab1914fc39ed2f07c015e042155789073e3d1fdc02a0783de
 WHIRLPOOL 
d309cecbb1bb5b6c4f64712d44889e3ecca59140d845a31a3f605dc3cc2aa01622b0deadb8f6852baea3c211bebbe6ed7d7868399447ac1249c1b1b740fa3c27
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 SHA256 
1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 
fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d
 WHIRLPOOL 
a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18
 DIST ngx_http_upload_progress-0.9.1-r1.tar.gz 17166 SHA256 
99ec072cca35cd7791e77c40a8ded41a7a8ce057be26e55fba2fdf105f43 SHA512 
6c1e3776402b6e2cda50d9c48c4b578a85feffe15891c075443f6d9c7b9e2414e0614b50a8f417ddda9faf5f719957c77ade519c88b48caec970fc51fe12f0d1
 WHIRLPOOL 
12970d0f75ee3f0d8a97c4948b97fca2bd707a93e4e578c0e2ac0d18991986e620dd6b15c2ab5680ff726c0490671e3bc5e1ee6109baf81877d8baa6a5357825
+DIST ngx_http_upstream_check-0.3.0-10-g10782ea.tar.gz 128297 SHA256 
a5003e86908086f8607e76cfc01a56d56654982ab02cec918278c261ff1e8363 SHA512 
2407d4375d8b94a808eb9e423615af700537b28fc88d37e790fb2a5ecdb02da94e7d1e271a6a81e8a55f8ce11e7db80fdd6de7feca08469dfaa26d717a1075a3
 WHIRLPOOL 
6b428940a07a7c18ba19cba07f43f1661484905a025f80fcb44908aeaeab9c8e854d3e104fe0339087a2e9029ad4722366c7d0a0fca7c73d92ece6ff2e494206
 DIST ngx_http_upstream_check-0.3.0.tar.gz 136542 SHA256 
c543bf427b38643c10dcd1a0c701392bc666708313e7b63f9272396a6cc9a461 SHA512 
ca19e8bcae218c639ff59e8f743bd2fb78de2c1f33dfb0de7b7b5ce82ae7ef04488255715e3e0311ebbc8c9741726573ac532cb269052925b0935f349414e959
 WHIRLPOOL 
acee2ea955f87844a724815fc78d0296f23e9d6726551febd6bbff563625e8eadd04213394b6029c45b6036138c4f8957b2621f1b033a6177410fa7778176749
 DIST ngx_memc_module-0.16.tar.gz 38560 SHA256 
24f3c3270831aed2d157c01ef74cb26eab26b832971fe7b9f42a03dbfac10ce4 SHA512 
e48a864ac9ae627e840b189f33157aa3a1c0966d2bcffd1f93030b0e6f5962355c004737cae0a5a00f2a1cbcb201369c37053f0823bb601618d18ef87561e353
 WHIRLPOOL 
c53decff852790758b3b92ca1d207a5b99b592e708271411699d70dd9683d7f551b469e057f480f66adfdffa1cb1b91b9c7e031835311ac0b6bfab0f444852f9
 DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 
1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 
d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 WHIRLPOOL 
2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868

diff --git a/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch 
b/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch
deleted file mode 100644
index f556aab..000
--- a/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2a52fbf565d0d5bdc9f25382b5af6e952216831f Mon Sep 17 00:00:00 2001
-From: Dmitry Saprykin 
-Date: Fri, 5 Dec 2014 11:46:18 +0300
-Subject: [PATCH] * serfault on reload fix
-

- ngx_http_upstream_check_module.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ngx_http_upstream_check_module.c 
b/ngx_http_upstream_check_module.c
-index e2a4030..41aa63a 100644
 a/ngx_http_upstream_check_module.c
-+++ b/ngx_http_upstream_check_module.c
-@@ -3991,9 +3991,9 @@ 
ngx_http_upstream_check_find_shm_peer(ngx_http_upstream_check_peers_shm_t *p,
- continue;
- }
- 
--if ((ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 
0)
--&& (ngx_strncmp(upstream_name->data, 

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Zac Medico]

commit: b5ba1ddb6b1eb7fb418d9e8f268fae2dd06d44d2
Author: Zac Medico  gentoo  org>
AuthorDate: Sat May  7 03:11:26 2016 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat May  7 03:15:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ba1ddb

www-servers/nginx: add segfault fix to 1.10.0 for http_upstream_check (bug 
582316)

Package-Manager: portage-2.2.28

 .../files/check-0.3.0-segfault-on-reload.patch | 26 ++
 www-servers/nginx/nginx-1.10.0.ebuild  |  3 +++
 2 files changed, 29 insertions(+)

diff --git a/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch 
b/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch
new file mode 100644
index 000..f556aab
--- /dev/null
+++ b/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch
@@ -0,0 +1,26 @@
+From 2a52fbf565d0d5bdc9f25382b5af6e952216831f Mon Sep 17 00:00:00 2001
+From: Dmitry Saprykin 
+Date: Fri, 5 Dec 2014 11:46:18 +0300
+Subject: [PATCH] * serfault on reload fix
+
+---
+ ngx_http_upstream_check_module.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ngx_http_upstream_check_module.c 
b/ngx_http_upstream_check_module.c
+index e2a4030..41aa63a 100644
+--- a/ngx_http_upstream_check_module.c
 b/ngx_http_upstream_check_module.c
+@@ -3991,9 +3991,9 @@ 
ngx_http_upstream_check_find_shm_peer(ngx_http_upstream_check_peers_shm_t *p,
+ continue;
+ }
+ 
+-if ((ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 
0)
+-&& (ngx_strncmp(upstream_name->data, 
peer_shm->upstream_name->data,
+-upstream_name->len) == 0)) {
++if (ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0
++&& upstream_name->len == peer_shm->upstream_name->len
++&& ngx_strncmp(upstream_name->data, 
peer_shm->upstream_name->data, upstream_name->len) == 0) {
+ return peer_shm;
+ }
+ }

diff --git a/www-servers/nginx/nginx-1.10.0.ebuild 
b/www-servers/nginx/nginx-1.10.0.ebuild
index 159f891..ef851c4 100644
--- a/www-servers/nginx/nginx-1.10.0.ebuild
+++ b/www-servers/nginx/nginx-1.10.0.ebuild
@@ -329,6 +329,9 @@ src_prepare() {
 
if use nginx_modules_http_upstream_check; then
eapply -p0 "${FILESDIR}/check-1.9.2".patch
+   pushd "${HTTP_UPSTREAM_CHECK_MODULE_WD}" >/dev/null
+   eapply -p1 "${FILESDIR}/check-0.3.0-segfault-on-reload".patch
+   popd >/dev/null
fi
 
if use nginx_modules_http_lua; then

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Zac Medico]

commit: 85509ccf9222c448b6c6986b6b3efe18e3cba6cc
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Apr 21 20:49:11 2016 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Apr 21 20:49:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85509ccf

www-servers/nginx: fix nginx_modules_upstream_check for 1.8.1 (bug 580764)

Package-Manager: portage-2.2.28

 www-servers/nginx/files/check_1.7.2+.patch | 201 -
 www-servers/nginx/nginx-1.8.1.ebuild   |   2 +-
 2 files changed, 1 insertion(+), 202 deletions(-)

diff --git a/www-servers/nginx/files/check_1.7.2+.patch 
b/www-servers/nginx/files/check_1.7.2+.patch
deleted file mode 100644
index 50405a5..000
--- a/www-servers/nginx/files/check_1.7.2+.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-commit 21116e1c0bba730ca59327ffba9320bc63f11462
-Author: Johan Bergström 
-Date:   Thu Jun 19 10:17:22 2014 +1000
-
-Add support for upstream_check to nginx 1.7.2
-
-diff --git src/http/modules/ngx_http_upstream_ip_hash_module.c 
src/http/modules/ngx_http_upstream_ip_hash_module.c
-index 148d73a..be9e03d 100644
 src/http/modules/ngx_http_upstream_ip_hash_module.c
-+++ src/http/modules/ngx_http_upstream_ip_hash_module.c
-@@ -9,6 +9,9 @@
- #include 
- #include 
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- typedef struct {
- /* the round robin data must be first */
-@@ -212,6 +215,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t 
*pc, void *data)
- goto next_try;
- }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+"get ip_hash peer, check_index: %ui",
-+ peer->check_index);
-+if (ngx_http_check_peer_down(peer->check_index)) {
-+goto next_try;
-+}
-+#endif
-+
- if (peer->max_fails
- && peer->fails >= peer->max_fails
- && now - peer->checked <= peer->fail_timeout)
-diff --git src/http/modules/ngx_http_upstream_least_conn_module.c 
src/http/modules/ngx_http_upstream_least_conn_module.c
-index dbef95d..14e9e40 100644
 src/http/modules/ngx_http_upstream_least_conn_module.c
-+++ src/http/modules/ngx_http_upstream_least_conn_module.c
-@@ -9,6 +9,9 @@
- #include 
- #include 
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- typedef struct {
- ngx_uint_t*conns;
-@@ -203,6 +206,16 @@ 
ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
- continue;
- }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+"get least_conn peer, check_index: %ui",
-+peer->check_index);
-+
-+if (ngx_http_check_peer_down(peer->check_index)) {
-+continue;
-+}
-+#endif
-+
- if (peer->max_fails
- && peer->fails >= peer->max_fails
- && now - peer->checked <= peer->fail_timeout)
-@@ -256,6 +269,16 @@ 
ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
- continue;
- }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+"get least_conn peer, check_index: %ui",
-+peer->check_index);
-+
-+if (ngx_http_check_peer_down(peer->check_index)) {
-+continue;
-+}
-+#endif
-+
- if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) 
{
- continue;
- }
-diff --git src/http/ngx_http_upstream_round_robin.c 
src/http/ngx_http_upstream_round_robin.c
-index 37c835c..43ccdcf 100644
 src/http/ngx_http_upstream_round_robin.c
-+++ src/http/ngx_http_upstream_round_robin.c
-@@ -9,6 +9,9 @@
- #include 
- #include 
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer(
- ngx_http_upstream_rr_peer_data_t *rrp);
-@@ -88,6 +91,14 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peer[n].fail_timeout = server[i].fail_timeout;
- peer[n].down = server[i].down;
- peer[n].server = server[i].name;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+if (!server[i].down) {
-+peers->peer[n].check_index =
-+ngx_http_check_add_peer(cf, us, [i].addrs[j]);
-+} else {
-+peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
-+}
-+#endif
- n++;
- }
- }
-@@ -144,6 +155,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peer[n].fail_timeout = server[i].fail_timeout;
- peer[n].down = server[i].down;
- peer[n].server =