Date: Sat, 15 Apr 2017 17:39:36 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438592 - in head/www/nginx-devel: . files Message-ID: <201704151739.v3FHdat1041522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sat Apr 15 17:39:35 2017 New Revision: 438592 URL: https://svnweb.freebsd.org/changeset/ports/438592 Log: Remove IPV6 knob, IPv6 now compiled-in automatically if support is found. Upgrade third-party upload module, enable it back. Upgrade third-party http_auth_krb5 module to 0c6ff3f. Upgrade third-party njs module to 0.1.10. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sat Apr 15 17:10:28 2017 (r438591) +++ head/www/nginx-devel/Makefile Sat Apr 15 17:39:35 2017 (r438592) @@ -26,7 +26,6 @@ OPTIONS_DEFINE= \ DEBUG \ DEBUGLOG \ FILE_AIO \ - IPV6 \ GOOGLE_PERFTOOLS \ HTTP \ HTTP_ADDITION \ @@ -308,11 +307,6 @@ CONFIGURE_ARGS+=--with-debug CONFIGURE_ARGS+=--with-file-aio .endif -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+=--with-ipv6 -CATEGORIES+= ipv6 -.endif - .if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS} LIB_DEPENDS+= libprofiler.so:devel/google-perftools CONFIGURE_ARGS+=--with-google_perftools_module @@ -355,14 +349,16 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_au .endif .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} -GIT_HTTP_AUTH_KRB5_VERSION= c85a38c +GIT_HTTP_AUTH_KRB5_VERSION= 0c6ff3f 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 +#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config +#OPTIONS_RADIO+= GSSAPI +#OPTIONS_RADIO_GSSAPI+= GSSAPI_HEIMDAL GSSAPI_MIT +#GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +#GSSAPI_MIT_USES= gssapi:mit .endif .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP} @@ -710,12 +706,11 @@ CONFIGURE_ARGS+=--with-http_sub_module .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD} -GIT_UPLOAD_VERSION= aba1e3f34c -GH_ACCOUNT+= vkholodkov:upload +GIT_UPLOAD_VERSION= 72ec037 +GH_ACCOUNT+= Austinb:upload GH_PROJECT+= nginx-upload-module:upload GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload CONFIGURE_ARGS+=--add-module=${WRKSRC_upload} -IGNORE= HTTP_UPLOAD: a patch requires .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} @@ -1055,7 +1050,7 @@ CONFIGURE_ARGS+=--with-http_v2_module .if ${PORT_OPTIONS:MNJS} GH_ACCOUNT+= nginx:njs GH_PROJECT+= njs:njs -GH_TAGNAME+= f106743:njs +GH_TAGNAME+= 753ebe6:njs .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx .else Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sat Apr 15 17:10:28 2017 (r438591) +++ head/www/nginx-devel/distinfo Sat Apr 15 17:39:35 2017 (r438592) @@ -1,4 +1,4 @@ -TIMESTAMP = 1492272157 +TIMESTAMP = 1492276562 SHA256 (nginx-1.12.0.tar.gz) = b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 SIZE (nginx-1.12.0.tar.gz) = 980831 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 @@ -25,8 +25,8 @@ SHA256 (giom-nginx_accept_language_modul SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393 SHA256 (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = e68b34e03516a4ab43006eb4c481d6bc5e813e0d40876359c606a26c5c68ccf6 SIZE (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = 16060 -SHA256 (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = b47b23a362aa338c377d6163d15abee6f33ff16bac5f86ee4d9543293fe8c4d1 -SIZE (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = 18120 +SHA256 (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) = 3d3fed1e19a532cdd2a37726953f2b2d4e20891a44119ff6075a6b5891324d2d +SIZE (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) = 18212 SHA256 (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 0ec4f099e50cc12a6319e37700e71540498d354831d1f09e113ee046ee0bb7b2 SIZE (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 17001 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 @@ -65,8 +65,8 @@ SHA256 (yaoweibin-ngx_http_substitutions SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 -SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05 -SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296 +SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd +SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990 SHA256 (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) = 52e6acd8c0264a59c5c948271015a59acd3cbcf91377456b7c8dc6f9feecef4a @@ -121,8 +121,8 @@ SHA256 (gabor-nginx-x-rid-header-0daa3cc SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 -SHA256 (nginx-njs-f106743_GH0.tar.gz) = 8be028634cc88c2cc09a2f9fafa521bed955c09b0ac033317071a9e96eb79ad8 -SIZE (nginx-njs-f106743_GH0.tar.gz) = 186625 +SHA256 (nginx-njs-753ebe6_GH0.tar.gz) = 43fc7a307ee98b9c55283374b36f1f4576cbf529a4101176cb94ab73f3110f67 +SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776 Modified: head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Sat Apr 15 17:10:28 2017 (r438591) +++ head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config Sat Apr 15 17:39:35 2017 (r438592) @@ -1,8 +1,9 @@ ---- ../spnego-http-auth-nginx-module-c85a38c/config.orig 2015-06-13 20:49:15.590751000 +0300 -+++ ../spnego-http-auth-nginx-module-c85a38c/config 2015-06-13 20:49:31.024936000 +0300 -@@ -1,4 +1,4 @@ +--- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig 2017-04-15 13:07:01.159506000 -0400 ++++ ../spnego-http-auth-nginx-module-0c6ff3f/config 2017-04-15 13:07:36.283398000 -0400 +@@ -1,5 +1,5 @@ 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" +-ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" ++ngx_feature_libs="%%GSSAPILIBS%% -lcom_err" + + if uname -o | grep -q FreeBSD; then + ngx_feature_libs="$ngx_feature_libs -lgssapi"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704151739.v3FHdat1041522>