diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 579d8d84c16d..b27d007a9aa7 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.2 -PORTREVISION= 5 +PORTREVISION= 6 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 0e884c500a47..7303ada7697e 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -75,7 +75,7 @@ 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: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-devel/distinfo b/www/nginx-devel/distinfo index f2870d38fff0..b5da54902b44 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1598129132 +TIMESTAMP = 1598529414 SHA256 (nginx-1.19.2.tar.gz) = 7c1f7bb13e79433ee930c597d272a64bc6e30c356a48524f38fd34fa88d62473 SIZE (nginx-1.19.2.tar.gz) = 1048727 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-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-e208153_GH0.tar.gz) = ad4b8e424668dc19a491b558bf676f1491a55f3626398395795b62fcbf002bb9 SIZE (kvspb-nginx-auth-ldap-e208153_GH0.tar.gz) = 18524 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 a45b326704db..da4d66c0f229 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,20 +1,14 @@ ---- ../spnego-http-auth-nginx-module-21bb963/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-08-27 07:59:28.423636000 -0400 ++++ ../spnego-http-auth-nginx-module-72c8ee0/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" -- --if uname -o | grep -q FreeBSD; then -- ngx_feature_libs="$ngx_feature_libs -lgssapi" --fi +ngx_feature_libs="%%GSSAPILIBS%%" +ngx_module_incs="%%GSSAPIINCDIR%%" - 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" + if uname -o | grep -q FreeBSD; then +- ngx_feature_libs="$ngx_feature_libs -lgssapi" ++ ngx_feature_libs="$ngx_feature_libs" fi -+ -+LDFLAGS="-L%%GSSAPILIBDIR%% $LDFLAGS" + + if uname -a | grep -q NetBSD; then