From nobody Thu Jan 27 16:26:50 2022 X-Original-To: dev-commits-ports-main@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 79B20197AC22; Thu, 27 Jan 2022 16:26:50 +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 4Jl5Zf2cpnz3nL0; Thu, 27 Jan 2022 16:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643300810; 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=hzSEV073U7+41lQVRrLus8ny2IrM0J5KWVS7m0Hm9J4=; b=JghQuR92DuUT3VksCDxBm4y+Wc3WkRXItAJZGJyUV6K/ftU5rG6hCdZZ+GcapntLL0WWwE qKJ7Ez0s/gx3Hbpi56ZjySrRw+6KPnQaTIieTk/seLzJNIeFpzIcFprhnP+zbz7/QMxRVU u30bBkbqEPQSnq/la+s/50p3YnMSq0TKzT3de0ZbS23QMMKCHYGk1SI0UKU58rGMhogoBb ZAslBfX7K/hPKyPFpMVtxNF6R4TXNOH5aZigoMbJqwyEzftRPshws2q+w56mA3zEe6Tsml C4U+nIZhI49cltSJH0bvZ4+vbhdwQVwG0O9lu8cMvOk81aFxL4XMi5hampcmxw== 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 38C6A1A10A; Thu, 27 Jan 2022 16:26:50 +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 20RGQox0099713; Thu, 27 Jan 2022 16:26:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RGQoS1099712; Thu, 27 Jan 2022 16:26:50 GMT (envelope-from git) Date: Thu, 27 Jan 2022 16:26:50 GMT Message-Id: <202201271626.20RGQoS1099712@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: 50f5293810b1 - main - www/nginx-devel: update third-party spnego-http-auth module List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 50f5293810b125bc5bc5252e5f52be54c2a04960 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643300810; 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=hzSEV073U7+41lQVRrLus8ny2IrM0J5KWVS7m0Hm9J4=; b=oTxOi36M6cjIjm1Te2W0g5/Gw7a1YrVIccJ09HN1wIYEe7skQlV5UaOxroVxgXy+TgJiGN Xqq+HivlmrXJbJ27axPVqvK3zxF479iHw1CsUJGa62u/slntjo9SRYu7l6pa/DgDQDLPr1 56iBuKjWILGtXrDf1OoxZ4IExjzWykfNT9wVPQK8N1pC1r4nLkXyzzh6m9RSUfgXFIovzI 0atsCgZOZMF/KQhaesGYz0vRZAzh+0lwalbSMqh1C7GN23Ft7e+vKSh1PQkXrFih1xhf8W 53hdqf4ff+lG1eDTLn1/PVGq4dr8OVmOR4ELmn2bGn18us2C0er5VgGsYHzthw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643300810; a=rsa-sha256; cv=none; b=IlTPrOHhZdZpIytFtpjYirZG75RYpA2h9JnFllD1Fqo8e4aRFxb25ukDX+QxtWbcsKdgpm IGRGMyxp+bDuKtIvhCEN3Nj1lmfF6z6RSkHlTp6K3B0Gb6TYDjU9Cf2IcwVT2DQducMaqO 75GRxgRNhQW0XGed5h8dGvGZuUO/WS+qrj5kj+OMh3AtrzikvbFA99bkek51pYB9ExzGXV RZMjG+Ecu6GxfAoKZPUIUxu4HHeO3vgF+dj4pUc1HtYX8irFX7Cs9wBTqS49bJgSpwdIq3 7xf3T2XxQhrplnU3MPu2YmJo4aLvcPJ7kh0sxfidfjRpFeVYkqQ9gsE8m6+HLg== 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=50f5293810b125bc5bc5252e5f52be54c2a04960 commit 50f5293810b125bc5bc5252e5f52be54c2a04960 Author: Sergey A. Osokin AuthorDate: 2022-01-27 16:23:48 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-27 16:26:43 +0000 www/nginx-devel: update third-party spnego-http-auth module The Kerberos MIT implementation is the only one is supported by the third-party spnego module, so remove needless staff. Bump PORTREVISION. --- www/nginx-devel/Makefile | 15 +-------------- www/nginx-devel/Makefile.extmod | 3 ++- www/nginx-devel/distinfo | 6 +++--- .../extra-patch-spnego-http-auth-nginx-module-config | 4 ++-- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 181b6e364395..72e285da3a69 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.21.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -91,11 +92,6 @@ PCRE_ONE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_ONE_CONFIGURE_ON= --without-pcre2 PCRE_TWO_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 -OPTIONS_RADIO+= GSSAPI -OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT -GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags -GSSAPI_MIT_USES= gssapi:mit - OPTIONS_SUB= yes .include "Makefile.options.desc" @@ -112,9 +108,6 @@ ${opt}_IMPLIES= HTTP ${opt}_IMPLIES= STREAM .endfor -GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5 -GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5 - # If the target is makesum, make sure that every distfile is fetched. .if ${.TARGETS:Mmakesum} OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \ @@ -243,12 +236,6 @@ IGNORE= required HTTPV3_BORING or HTTPV3_QTLS \ to be defined. Please do 'make config' again .endif -.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT)) -IGNORE= required at least GSSAPI_HEIMDAL or \ - GSSAPI_MIT to be defined. Please do \ - 'make config' again -.endif - .if ${PORT_OPTIONS:MPCRE_ONE} NJS_CONFIGURE_ARGS= --no-pcre2 .endif diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index ed9922e5d24b..dea05c3aaea4 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -90,9 +90,10 @@ HTTP_ACCEPT_LANGUAGE_VARS= DSO_EXTMODS+=accept_language HTTP_AUTH_DIGEST_GH_TUPLE= atomx:nginx-http-auth-digest:274490c:auth_digest HTTP_AUTH_DIGEST_VARS= DSO_EXTMODS+=auth_digest -HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:a06f9ef:auth_krb5 +HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:c626163:auth_krb5 HTTP_AUTH_KRB5_VARS= DSO_EXTMODS+=auth_krb5 HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config +HTTP_AUTH_KRB5_USES= gssapi:mit HTTP_AUTH_LDAP_GH_TUPLE= kvspb:nginx-auth-ldap:83c059b:http_auth_ldap HTTP_AUTH_LDAP_VARS= DSO_EXTMODS+=http_auth_ldap diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 4a04e6e1a814..c8c447dfd7a7 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1643123884 +TIMESTAMP = 1643299167 SHA256 (nginx-1.21.6.tar.gz) = 66dc7081488811e9f925719e34d1b4504c2801c81dee2920e5452a86b11405ae SIZE (nginx-1.21.6.tar.gz) = 1073364 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -51,8 +51,8 @@ SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f SIZE (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = 3425 SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c SIZE (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 17815 -SHA256 (stnoonan-spnego-http-auth-nginx-module-a06f9ef_GH0.tar.gz) = f7b1559e730d75fd0eee82a0aef67e3ab026cc816e0413fb94d51c8ad87df883 -SIZE (stnoonan-spnego-http-auth-nginx-module-a06f9ef_GH0.tar.gz) = 18504 +SHA256 (stnoonan-spnego-http-auth-nginx-module-c626163_GH0.tar.gz) = dac75d65453744ffe0f7af248f10f98fc89efca07303aa45a610805e57c588fc +SIZE (stnoonan-spnego-http-auth-nginx-module-c626163_GH0.tar.gz) = 24404 SHA256 (kvspb-nginx-auth-ldap-83c059b_GH0.tar.gz) = e76e9e117ad51af578a68fa7a30c256178796bb271fa77f01c93281a92b09921 SIZE (kvspb-nginx-auth-ldap-83c059b_GH0.tar.gz) = 18547 SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7 diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config index 20861efb1f7c..7ea16b2ff99e 100644 --- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,5 +1,5 @@ ---- ../spnego-http-auth-nginx-module-a06f9ef/config.orig 2020-08-27 07:59:28.423636000 -0400 -+++ ../spnego-http-auth-nginx-module-a06f9ef/config 2020-08-27 08:01:42.152121000 -0400 +--- ../spnego-http-auth-nginx-module-c626163/config.orig 2020-08-27 07:59:28.423636000 -0400 ++++ ../spnego-http-auth-nginx-module-c626163/config 2020-08-27 08:01:42.152121000 -0400 @@ -1,8 +1,9 @@ ngx_addon_name=ngx_http_auth_spnego_module -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err"