svn commit: r389476 - in head/www: nginx nginx-devel nginx-devel/files nginx/files
Sergey A. Osokin
osa at FreeBSD.org
Sat Jun 13 18:11:31 UTC 2015
Author: osa
Date: Sat Jun 13 18:11:28 2015
New Revision: 389476
URL: https://svnweb.freebsd.org/changeset/ports/389476
Log:
Add third-party SPNEGO authentication module.
PR: 192904
Added:
head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config (contents, props changed)
head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config (contents, props changed)
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/distinfo
head/www/nginx/Makefile
head/www/nginx/distinfo
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Sat Jun 13 17:39:09 2015 (r389475)
+++ head/www/nginx-devel/Makefile Sat Jun 13 18:11:28 2015 (r389476)
@@ -62,6 +62,7 @@ OPTIONS_DEFINE= \
HTTP_ACCEPT_LANGUAGE \
HTTP_ACCESSKEY \
HTTP_AUTH_DIGEST \
+ HTTP_AUTH_KRB5 \
HTTP_AUTH_LDAP \
HTTP_AUTH_PAM \
HTTP_DAV_EXT \
@@ -150,6 +151,7 @@ HEADERS_MORE_DESC= 3rd party headers_mo
HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module
+HTTP_AUTH_KRB5_DESC= 3rd party http_auth_gss module
HTTP_AUTH_LDAP_DESC= 3rd party http_auth_ldap module
HTTP_AUTH_PAM_DESC= 3rd party http_auth_pam module
HTTP_DAV_EXT_DESC= 3rd party webdav_ext module
@@ -296,6 +298,17 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_au
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_auth_digest_module.c
.endif
+.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
+GIT_HTTP_AUTH_KRB5_VERSION= 29cb489
+GH_ACCOUNT+= stnoonan:auth_krb5
+GH_PROJECT+= spnego-http-auth-nginx-module:auth_krb5
+GH_TAGNAME+= ${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5
+CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_krb5}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
+# TODO: Provide optional dependence on Kerberos implementations from ports
+USES+= gssapi:base,flags
+.endif
+
.if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
# WWW: https://github.com/kvspb/nginx-auth-ldap
GIT_HTTP_AUTH_LDAP_VERSION= 928856aa95
@@ -869,6 +882,11 @@ post-patch:
@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
s!%%PREFIX%%!${PREFIX}!' \
${WRKSRC}/conf/nginx.conf
+.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
+ @${REINPLACE_CMD} \
+ 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \
+ ${WRKSRC_auth_krb5}/config
+.endif
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
@${REINPLACE_CMD} \
's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo Sat Jun 13 17:39:09 2015 (r389475)
+++ head/www/nginx-devel/distinfo Sat Jun 13 18:11:28 2015 (r389476)
@@ -40,6 +40,8 @@ SHA256 (giom-nginx_accept_language_modul
SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = d3071ca4b70cfd7f437add772a2aa6ab585dafb5d5a2e3f5cc70af74da72acf2
SIZE (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = 14458
+SHA256 (stnoonan-spnego-http-auth-nginx-module-29cb489_GH0.tar.gz) = 0b85a00e6e918fe8eb633c178c709dc4e91289515be7b06f83f33ff1fcd7b40e
+SIZE (stnoonan-spnego-http-auth-nginx-module-29cb489_GH0.tar.gz) = 17546
SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07
SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073
SHA256 (openresty-headers-more-nginx-module-v0.26_GH0.tar.gz) = d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f
Added: head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Sat Jun 13 18:11:28 2015 (r389476)
@@ -0,0 +1,8 @@
+--- ../spnego-http-auth-nginx-module-29cb489/config.orig 2015-06-13 20:49:15.590751000 +0300
++++ ../spnego-http-auth-nginx-module-29cb489/config 2015-06-13 20:49:31.024936000 +0300
+@@ -1,4 +1,4 @@
+ ngx_addon_name=ngx_http_auth_spnego_module
+ HTTP_MODULES="$HTTP_MODULES ngx_http_auth_spnego_module"
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
+-CORE_LIBS="$CORE_LIBS -lgssapi_krb5 -lkrb5 -lcom_err"
++CORE_LIBS="$CORE_LIBS %%GSSAPILIBS%% -lcom_err"
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Sat Jun 13 17:39:09 2015 (r389475)
+++ head/www/nginx/Makefile Sat Jun 13 18:11:28 2015 (r389476)
@@ -61,6 +61,7 @@ OPTIONS_DEFINE= \
HTTP_ACCEPT_LANGUAGE \
HTTP_ACCESSKEY \
HTTP_AUTH_DIGEST \
+ HTTP_AUTH_KRB5 \
HTTP_AUTH_LDAP \
HTTP_AUTH_PAM \
HTTP_DAV_EXT \
@@ -147,6 +148,7 @@ HEADERS_MORE_DESC= 3rd party headers_mo
HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module
+HTTP_AUTH_KRB5_DESC= 3rd party http_auth_gss module
HTTP_AUTH_LDAP_DESC= 3rd party http_auth_ldap module
HTTP_AUTH_PAM_DESC= 3rd party http_auth_pam module
HTTP_DAV_EXT_DESC= 3rd party webdav_ext module
@@ -293,6 +295,17 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_au
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_auth_digest_module.c
.endif
+.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
+GIT_HTTP_AUTH_KRB5_VERSION= 29cb489
+GH_ACCOUNT+= stnoonan:auth_krb5
+GH_PROJECT+= spnego-http-auth-nginx-module:auth_krb5
+GH_TAGNAME+= ${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5
+CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_krb5}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
+# TODO: Provide optional dependence on Kerberos implementations from ports
+USES+= gssapi:base,flags
+.endif
+
.if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
# WWW: https://github.com/kvspb/nginx-auth-ldap
GIT_HTTP_AUTH_LDAP_VERSION= 928856aa95
@@ -855,6 +868,11 @@ post-patch:
@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
s!%%PREFIX%%!${PREFIX}!' \
${WRKSRC}/conf/nginx.conf
+.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
+ @${REINPLACE_CMD} \
+ 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \
+ ${WRKSRC_auth_krb5}/config
+.endif
.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
@${REINPLACE_CMD} \
's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Sat Jun 13 17:39:09 2015 (r389475)
+++ head/www/nginx/distinfo Sat Jun 13 18:11:28 2015 (r389476)
@@ -40,6 +40,8 @@ SHA256 (giom-nginx_accept_language_modul
SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = d3071ca4b70cfd7f437add772a2aa6ab585dafb5d5a2e3f5cc70af74da72acf2
SIZE (samizdatco-nginx-http-auth-digest-bd1c86a_GH0.tar.gz) = 14458
+SHA256 (stnoonan-spnego-http-auth-nginx-module-29cb489_GH0.tar.gz) = 0b85a00e6e918fe8eb633c178c709dc4e91289515be7b06f83f33ff1fcd7b40e
+SIZE (stnoonan-spnego-http-auth-nginx-module-29cb489_GH0.tar.gz) = 17546
SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07
SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073
SHA256 (openresty-headers-more-nginx-module-v0.26_GH0.tar.gz) = d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f
Added: head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config Sat Jun 13 18:11:28 2015 (r389476)
@@ -0,0 +1,8 @@
+--- ../spnego-http-auth-nginx-module-29cb489/config.orig 2015-06-13 20:49:15.590751000 +0300
++++ ../spnego-http-auth-nginx-module-29cb489/config 2015-06-13 20:49:31.024936000 +0300
+@@ -1,4 +1,4 @@
+ ngx_addon_name=ngx_http_auth_spnego_module
+ HTTP_MODULES="$HTTP_MODULES ngx_http_auth_spnego_module"
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
+-CORE_LIBS="$CORE_LIBS -lgssapi_krb5 -lkrb5 -lcom_err"
++CORE_LIBS="$CORE_LIBS %%GSSAPILIBS%% -lcom_err"
More information about the svn-ports-all
mailing list