gentoo auto-resync : 03:12:2022 - 02:58:11

4 files changed, 29 insertions, 1 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e83b1716cac8..e75977a9a642 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index cfa6f5706a49..acb7a758484c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -4,6 +4,7 @@ AUX http_javascript_cve_2022-38890.patch 1734 BLAKE2B ecc4cda7537f8d769389381bd1
 AUX http_sticky-nginx-1.23.0.patch 1101 BLAKE2B 0a5f0bc5fb7987e1da13f39b6c2c7fcbc21452ddea510fb7aeb4933bfe7c94cc10c8b714c8de135b14d212a0532e39beebbad0105e2d140e12ecc608b1996156 SHA512 3066e9aec3a3073acd8ef8e1d3bf9abc33b4f0d9232573bb83417b838a42f04195b82337b569f7f808c7c0b94a6fd53371882aa805576de5989d359b21872396
 AUX http_uploadprogress-nginx-1.23.0.patch 2680 BLAKE2B 872a386964dd1fa3a8c09d69231b546ba497d85f1b270fbb015ec4835c0c7ca9e7b3018d0a7674b4bd8aa76b558327439cdffc1912c74a8c3d91b2334bb0a61d SHA512 2899636d730583c0eaa21e89d50ccb7a888e7f27fa194102909e42fb28cb8e239416978f55bed0a9115b65d0ac718cb7da8c1fa589eb79e9f66eea41dfc3458b
 AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a
+AUX nginx-1.23.2-mod_auth_ldap-fix.patch 887 BLAKE2B 3834c6af746b5218589b97e040c0a087f535558412316fda5e84a90055d4baa9d9797274297c20ace2807531171ca39721392bb0b27a35c35832bc5bb2ec5cc7 SHA512 b6e5d47ee33ebac4828b2dbcd914e860994d3cff98c4612b37b52f4ca2f83a2040a9e1b66849a5ecb38e0392ed8f0ce77081050d8be946de0c5f0af5d4861c93
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
 AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3
 AUX nginx.conf-r2 1292 BLAKE2B ad941577401ee99e7904871a20cdf94e946f608747c14e7ceb589ea0a6254cf16fe27f712d2db252db027bc72742d1818c3874b762fcc38054a69e4363cd5e39 SHA512 de9ffb84d7de468fa7aebfb205529edb1c372f3ff6990b0cac9d1f3012be9ced65db4d260fd852c91cc033805c023a02790770cca43c6ad6335fb58a9c694c95
@@ -44,6 +45,6 @@ DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
 DIST njs-0.7.8.tar.gz 613161 BLAKE2B f6b10be576119f418cdbe052a0c82b847d1b43278f4f0764ac7a9c7309162bf48fd60b40542b97e43fa925c87817b19785ffc6c83fa0611ca73256932e8481cb SHA512 086ddb2e5189a8853598870b795bfa788e9e75da9d2502541a49314e8149d7c279acca0709c4c517db26611a416dc5fb989be807cf1697c7411aded1bd5b8237
-EBUILD nginx-1.23.2-r2.ebuild 40301 BLAKE2B 397fa2bcebf285e696536a2f0c0566349849d8639082d45e35e445663d5906b638f18eca802f8591bdbe59ec5df27e2163dc6993b0347f84a24abd149376483f SHA512 a465e7ddf893b136db3104129e0feaee9b3473d7516e375d7162c45d7d0dbf9dd1ce4a5331f58a38fbf17f9c8c96505f7dd2199154519c5b2e7f3e7d64a2f6da
+EBUILD nginx-1.23.2-r3.ebuild 40465 BLAKE2B 24e4ce7a06600346fd8df476a607a8d836e14a297f4834d0759aae883b12260ddbb11757937adae7407b71cdf24abdbbff006ad93f84401953ac00fbe2b48b6a SHA512 6b3c067f2f7606891f5d886669c0e09cab6d8649140f8b33f1b478430cd11773c3653a9bc35427cb8fbfe703d6b2495a77f409139d480ab5686c448e810049d7
 EBUILD nginx-1.23.2.ebuild 39690 BLAKE2B bc9ea5141f66d21cb003b09c37e9a23da3405323364cb3f9fab3c5f161e6b4d2a261a720a3b31e204906b98a6ba9c4da7d614a1e5732038fb6af482ae1664823 SHA512 d2df73e079653c42258661511df7c1ba4ea558cbd28f48b862d721d95726906c3e4e293f4c3f71cb97050b313eba11110091bc04191ba264c99a073ed18ad06a
 MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/files/nginx-1.23.2-mod_auth_ldap-fix.patch b/www-servers/nginx/files/nginx-1.23.2-mod_auth_ldap-fix.patch
new file mode 100644
index 000000000000..b3b4cf4b33c4
--- /dev/null
+++ b/www-servers/nginx/files/nginx-1.23.2-mod_auth_ldap-fix.patch
@@ -0,0 +1,21 @@
+From f0a5f61d9aad59c23e2c877094a8f17c43bee5b5 Mon Sep 17 00:00:00 2001
+From: freultwah <631910+freultwah@users.noreply.github.com>
+Date: Tue, 23 Aug 2022 18:09:45 +0300
+Subject: [PATCH] Make the module not crash with nginx >1.23.*
+
+---
+ ngx_http_auth_ldap_module.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ngx_http_auth_ldap_module.c b/ngx_http_auth_ldap_module.c
+index 2f4e592..83b481c 100644
+--- a/ngx_http_auth_ldap_module.c
++++ b/ngx_http_auth_ldap_module.c
+@@ -1779,6 +1779,7 @@ ngx_http_auth_ldap_set_realm(ngx_http_request_t *r, ngx_str_t *realm)
+     }
+ 
+     r->headers_out.www_authenticate->hash = 1;
++    r->headers_out.www_authenticate->next = NULL;
+     r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1;
+     r->headers_out.www_authenticate->key.data = (u_char *) "WWW-Authenticate";
+     r->headers_out.www_authenticate->value = *realm;
diff --git a/www-servers/nginx/nginx-1.23.2-r2.ebuild b/www-servers/nginx/nginx-1.23.2-r3.ebuild
index 96915733beb5..4b707c551371 100644
--- a/www-servers/nginx/nginx-1.23.2-r2.ebuild
+++ b/www-servers/nginx/nginx-1.23.2-r3.ebuild
@@ -377,6 +377,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_ldap; then
+		cd "${HTTP_LDAP_MODULE_WD}" || die
+		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
+		cd "${S}" || die
+	fi
+
 	if use nginx_modules_http_sticky; then
 		cd "${HTTP_STICKY_MODULE_WD}" || die
 		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch