Update third-party spnego-http-auth module

Add the corresponding library path to the patch for the
third-party http_auth_spnego module.

The third-party http_auth_spnego module may not work with
in-base Kerberos implementation because of gss_locaname()
function usage, so remove the GSSAPI_BASE option from the
GSSAPI radio button. (merge from www/nginx-devel in r546696)

Sponsored by:	Netzkommune GmbH

4 files changed, 15 insertions, 22 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 33d49cc8b539..42089e66c1e7 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION?=	28
+PORTREVISION?=	29
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -104,8 +104,7 @@ OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:}
 
 OPTIONS_RADIO+=		GSSAPI
-OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
-GSSAPI_BASE_USES=	gssapi
+OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
@@ -121,7 +120,6 @@ ${opt}_IMPLIES=	MAIL
 ${opt}_IMPLIES=	HTTP
 .endfor
 
-GSSAPI_BASE_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 69dcf387fb1e..a8819cb36a18 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -78,7 +78,7 @@ HTTP_AUTH_JWT_GH_TUPLE=		TeslaGov:ngx-http-auth-jwt-module:80d89d9:http_auth_jwt
 HTTP_AUTH_JWT_VARS=			DSO_EXTMODS+=http_auth_jwt
 HTTP_AUTH_JWT_LIB_DEPENDS=	libjwt.so:www/libjwt libjansson.so:devel/jansson
 
-HTTP_AUTH_KRB5_GH_TUPLE=	stnoonan:spnego-http-auth-nginx-module:21bb963:auth_krb5
+HTTP_AUTH_KRB5_GH_TUPLE=	stnoonan:spnego-http-auth-nginx-module:72c8ee0:auth_krb5
 HTTP_AUTH_KRB5_VARS=		DSO_EXTMODS+=auth_krb5
 HTTP_AUTH_KRB5_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
 
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 841b8a5223a4..334ea3865429 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1602864380
+TIMESTAMP = 1602964577
 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
 SIZE (nginx-1.18.0.tar.gz) = 1039530
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -51,8 +51,8 @@ SHA256 (atomx-nginx-http-auth-digest-cd86418_GH0.tar.gz) = 9858b202e5009da4047ac
 SIZE (atomx-nginx-http-auth-digest-cd86418_GH0.tar.gz) = 17869
 SHA256 (TeslaGov-ngx-http-auth-jwt-module-80d89d9_GH0.tar.gz) = 1b71290a0eab6a0bb6ab75e1228a302cf76c82f3284ad0eb7e8b2bfa110582e7
 SIZE (TeslaGov-ngx-http-auth-jwt-module-80d89d9_GH0.tar.gz) = 14674
-SHA256 (stnoonan-spnego-http-auth-nginx-module-21bb963_GH0.tar.gz) = 3f7f7e5e4882320ec32211c46dbd924d13307f4d08bc0bad186680c35195973d
-SIZE (stnoonan-spnego-http-auth-nginx-module-21bb963_GH0.tar.gz) = 18140
+SHA256 (stnoonan-spnego-http-auth-nginx-module-72c8ee0_GH0.tar.gz) = df6be6e67a4a4a37db584effdf2326a7eca29891724363bd34d03967cc8e5c68
+SIZE (stnoonan-spnego-http-auth-nginx-module-72c8ee0_GH0.tar.gz) = 18502
 SHA256 (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 78d74697f89821a7ed31c6c672f6c06923bb53a681ebb203eabebb657bdafd80
 SIZE (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 18455
 SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7
diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
index 7f2022d6da24..0d7aabe51d93 100644
--- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
+++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
@@ -1,20 +1,15 @@
---- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig	2017-04-15 13:07:01.159506000 -0400
-+++ ../spnego-http-auth-nginx-module-21bb963/config	2018-04-20 00:15:08.515289000 +0200
-@@ -1,9 +1,6 @@
+--- ../spnego-http-auth-nginx-module-72c8ee0/config.orig	2020-10-17 22:35:57.676855000 +0200
++++ ../spnego-http-auth-nginx-module-72c8ee0/config	2020-10-17 22:40:49.255324000 +0200
+@@ -1,8 +1,10 @@
  ngx_addon_name=ngx_http_auth_spnego_module
 -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err"
--
--if uname -o | grep -q FreeBSD; then
--    ngx_feature_libs="$ngx_feature_libs -lgssapi"
--fi
 +ngx_feature_libs="%%GSSAPILIBS%%"
 +ngx_module_incs="%%GSSAPINCDIR%%"
  
- if test -n "$ngx_module_link"; then
-     ngx_module_type=HTTP
-@@ -16,3 +13,5 @@ else
-     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
-     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
- fi
 +
-+LDFLAGS="-L%%GSSAPILIBDIR%% $LDFLAGS"
+ if uname -o | grep -q FreeBSD; then
+-    ngx_feature_libs="$ngx_feature_libs -lgssapi"
++    ngx_feature_libs="$ngx_feature_libs"
+ fi
+ 
+ if uname -a | grep -q NetBSD; then