git: 50f5293810b1 - main - www/nginx-devel: update third-party spnego-http-auth module
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Jan 2022 16:26:50 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=50f5293810b125bc5bc5252e5f52be54c2a04960
commit 50f5293810b125bc5bc5252e5f52be54c2a04960
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-01-27 16:23:48 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
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"