From 8973df0dabf77878b2b705108b8551e5a7f8485b Mon Sep 17 00:00:00 2001 From: Jochen Neumeister Date: Mon, 19 Oct 2020 11:34:15 +0000 Subject: 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 --- ...xtra-patch-spnego-http-auth-nginx-module-config | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config') 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 -- cgit v1.2.3