From nobody Tue Aug 23 03:17:07 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBZCR3Lg7z4ZB2x; Tue, 23 Aug 2022 03:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBZCR2qY4z3Ld3; Tue, 23 Aug 2022 03:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661224627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cr+KtgAWtzVZzFpNlLEcHEjUzminhqhlvJ+QmxU+XU=; b=XJ+oK3Oe3LtDjE0zpfsvQO+SDd0K8myKWhx3a4u9CbvYW18ubv0+uMMGhS4tzeQUd8SJe/ U2E2xTEn/P/QQU9t13HkWyI6HqbqnxDvIRpaGHK5pa+lbhXMIM3lQwtiL6dGE4VEW1lacz G+8WW1+wz01XNV5JUnsDH6iw5xJ+gtd4uyK0hwq/GCEAC8DCT8d233DyofHGQ0txhfwQCg 2k1aD99qGVIbII2uF5JMI8nizo7sapON4jNAHd5jqlmIhsjduDllE12kAr7BiL/w41Kmy1 p2X9nTlZ6PGUPRjFqd9u7dkPIpeETK6AJyBs47BMFobfEsX811JYmQzEaW3yZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MBZCR1tSdzFVc; Tue, 23 Aug 2022 03:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27N3H7GF072611; Tue, 23 Aug 2022 03:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27N3H75d072610; Tue, 23 Aug 2022 03:17:07 GMT (envelope-from git) Date: Tue, 23 Aug 2022 03:17:07 GMT Message-Id: <202208230317.27N3H75d072610@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 7b8cbbf12a2c - main - www/nginx-devel: fix crash of the third-party http_auth_ldap module List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b8cbbf12a2c7eb993b6dcb08f6937880c3e5201 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661224627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cr+KtgAWtzVZzFpNlLEcHEjUzminhqhlvJ+QmxU+XU=; b=DNucMDt3eQLJIJNUne51I0bQnx3/Oo6eYO9cZQ9aT02gxwCDb8WcHjt5MjPXG5qodPE8E9 3KrkSFA6oq/YEfvgcZEcVxvv8kl3lOyDLZU3uUHTaY9ERR6pz3E7RUTZ7jykdXl6C2CTDD KeZ63bKoLxtMrcdoCKyeU1fXPBl9Bmgl6aUILy+9e6qEagXorZMlNP+roOvB/G3p69X/ms TgA5Mpfe5B4lUXuluK6N2oZOyP7POlPJC37v0wYURAJYnnvGSmSYSbVJCTUFpo08J8s27f wb2VTFbMsLHUc3Q8kBYRZrVz0tv4LAjmbHH6QGWb27vwXd1bzsOUHtzUPnsbew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661224627; a=rsa-sha256; cv=none; b=ZhsfsCA+OkvrKn9lahr4pHPetH+mNLlPy+UIVsAHyZmBHqxPBc9MlMoPqo34aQpDUhIwqN InXOPIkjWYR8VDhD9nYAi3lKC5mkxZTbTgV6ZlMfNTEVe7iAoK/f4crKhEBuXYg94PLMDd 0PgOY/JcVi/G6WYgzDvFE41msJoSPWna7MWymzcc7AvaE01FSA53a84N+WVxGUF9HDEeGk sfV9+VDDBxvDGJ20axU+S+yqpSgxqgNJQhX3yTsuVrKbIaxpJYatfWjV3/U2GOlaCUsqkp oMpTqKmdB1AN0nOoVZx8t2iftzBReiASr9dfy9LDLmGURroNQ8l1+WRpzgSuZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b8cbbf12a2c7eb993b6dcb08f6937880c3e5201 commit 7b8cbbf12a2c7eb993b6dcb08f6937880c3e5201 Author: Sergey A. Osokin AuthorDate: 2022-08-23 03:15:37 +0000 Commit: Sergey A. Osokin 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;