Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Aug 2022 03:17:07 GMT
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7b8cbbf12a2c - main - www/nginx-devel: fix crash of the third-party http_auth_ldap module
Message-ID:  <202208230317.27N3H75d072610@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b8cbbf12a2c7eb993b6dcb08f6937880c3e5201

commit 7b8cbbf12a2c7eb993b6dcb08f6937880c3e5201
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-08-23 03:15:37 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-08-23 03:15:37 +0000

    www/nginx-devel: fix crash of the third-party http_auth_ldap module
    
    Bump PORTREVISION.
    
    PR:             265969
---
 www/nginx-devel/Makefile                                      |  2 +-
 www/nginx-devel/Makefile.extmod                               |  1 +
 www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 437770047887..719f04e73b15 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	nginx
 PORTVERSION=	1.23.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index a95a4585d3ea..49bef80bfa78 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -98,6 +98,7 @@ HTTP_AUTH_KRB5_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-spnego-http-auth-nginx-mod
 HTTP_AUTH_KRB5_USES=		gssapi:mit
 
 HTTP_AUTH_LDAP_GH_TUPLE=	kvspb:nginx-auth-ldap:83c059b:http_auth_ldap
+HTTP_AUTH_LDAP_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_auth_ldap_module.c
 HTTP_AUTH_LDAP_VARS=		DSO_EXTMODS+=http_auth_ldap
 HTTP_AUTH_LDAP_USE=		openldap=yes
 
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c b/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c
new file mode 100644
index 000000000000..d8bc2f7f65f3
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c
@@ -0,0 +1,10 @@
+--- ../nginx-auth-ldap-83c059b/ngx_http_auth_ldap_module.c.orig	2022-08-21 17:04:57.754760000 +0300
++++ ../nginx-auth-ldap-83c059b/ngx_http_auth_ldap_module.c	2022-08-21 17:08:46.939318000 +0300
+@@ -1779,6 +1779,7 @@
+     }
+ 
+     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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208230317.27N3H75d072610>