From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71DE0158020 for ; Sat, 3 Dec 2022 00:07:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A733E0EA7; Sat, 3 Dec 2022 00:07:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51E29E0EA4 for ; Sat, 3 Dec 2022 00:07:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13CA8341301 for ; Sat, 3 Dec 2022 00:07:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E8F9766 for ; Sat, 3 Dec 2022 00:07:23 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1670025468.e1542f080b666233bf679c899daec39fed3f0a4c.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/, www-servers/nginx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx/files/nginx-1.23.2-mod_auth_ldap-fix.patch www-servers/nginx/nginx-1.23.2-r2.ebuild www-servers/nginx/nginx-1.23.2-r3.ebuild X-VCS-Directories: www-servers/nginx/ www-servers/nginx/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: e1542f080b666233bf679c899daec39fed3f0a4c X-VCS-Branch: master Date: Sat, 3 Dec 2022 00:07:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fa3f10a-877a-476e-8fb0-6712fd2380f4 X-Archives-Hash: 94dbb957423367d4692b83fea405f2f9 commit: e1542f080b666233bf679c899daec39fed3f0a4c Author: Conrad Kostecki gentoo org> AuthorDate: Fri Dec 2 23:57:48 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Dec 2 23:57:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1542f08 www-servers/nginx: fix ldap crash Closes: https://bugs.gentoo.org/883401 Signed-off-by: Conrad Kostecki gentoo.org> .../files/nginx-1.23.2-mod_auth_ldap-fix.patch | 21 +++++++++++++++++++++ ...ginx-1.23.2-r2.ebuild => nginx-1.23.2-r3.ebuild} | 6 ++++++ 2 files changed, 27 insertions(+) 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 similarity index 99% rename from www-servers/nginx/nginx-1.23.2-r2.ebuild rename to 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