Date: Fri, 5 Jun 2020 11:35:14 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538009 - in head/www/nginx: . files Message-ID: <202006051135.055BZE88035040@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Fri Jun 5 11:35:13 2020 New Revision: 538009 URL: https://svnweb.freebsd.org/changeset/ports/538009 Log: Merge r532900 from www/nginx-devel: Convert another 2 third-party modules to dynamic: o) slowfs_cache o) xss Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-xss-nginx-module-config (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Jun 5 11:31:35 2020 (r538008) +++ head/www/nginx/Makefile Fri Jun 5 11:35:13 2020 (r538009) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 8 +PORTREVISION?= 9 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Fri Jun 5 11:31:35 2020 (r538008) +++ head/www/nginx/Makefile.extmod Fri Jun 5 11:35:13 2020 (r538009) @@ -292,9 +292,8 @@ SFLOW_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_ SHIBBOLETH_GH_TUPLE= nginx-shib:nginx-http-shibboleth:f07bf3c:shibboleth SHIBBOLETH_VARS= DSO_EXTMODS+=shibboleth -SLOWFS_CACHE_MASTER_SITES= http://labs.frickle.com/files/:slowfs_cache -SLOWFS_CACHE_DISTFILES= ngx_slowfs_cache-1.10.tar.gz:slowfs_cache -SLOWFS_CACHE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_slowfs_cache-1.10 +SLOWFS_CACHE_GH_TUPLE= baysao:ngx_slowfs_cache:d011a18:slowfs_cache +SLOWFS_CACHE_VARS= DSO_EXTMODS+=slowfs_cache SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ libpcre.so:devel/pcre @@ -302,7 +301,6 @@ SMALL_LIGHT_GH_TUPLE= cubicdaiya:ngx_small_light:v0.9 SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.31:srcache -#SRCACHE_CONFIGURE_ON= --add-module=${WRKSRC_srcache} SRCACHE_VARS= DSO_EXTMODS+=srcache VOD_GH_TUPLE= kaltura:nginx-vod-module:1.23:vod @@ -314,8 +312,9 @@ VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-m VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} -XSS_GH_TUPLE= openresty:xss-nginx-module:v0.05:xss -XSS_CONFIGURE_ON= --add-module=${WRKSRC_xss} +XSS_GH_TUPLE= openresty:xss-nginx-module:v0.06:xss +XSS_VARS= DSO_EXTMODS+=xss +XSS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-xss-nginx-module-config WEBSOCKIFY_GH_TUPLE= tg123:websockify-nginx-module:e82d254:websockify WEBSOCKIFY_CONFIGURE_ON= --add-module=${WRKSRC_websockify} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Fri Jun 5 11:31:35 2020 (r538008) +++ head/www/nginx/distinfo Fri Jun 5 11:35:13 2020 (r538009) @@ -1,4 +1,4 @@ -TIMESTAMP = 1591338984 +TIMESTAMP = 1591352499 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -15,8 +15,6 @@ SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd8 SIZE (modsecurity-2.9.3.tar.gz) = 4307670 SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b SIZE (passenger-6.0.4.tar.gz) = 7347803 -SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 -SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 @@ -133,6 +131,8 @@ SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504 SHA256 (nginx-shib-nginx-http-shibboleth-f07bf3c_GH0.tar.gz) = db0c244fbd553846539e4020c5131e2c99700cddc0e5664aac0b807733607b05 SIZE (nginx-shib-nginx-http-shibboleth-f07bf3c_GH0.tar.gz) = 22177 +SHA256 (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 6ae8abb01a2aff788e75ec68621cb0159148a6f73730a84b30b0bdbc6cdc1758 +SIZE (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 11186 SHA256 (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 4cf660651d11330a13aab29eb1722bf792d7c3c42e2919a36a1957c4ed0f1533 SIZE (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 56502 SHA256 (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 3f9729e73a8340926fa9d9fc15707c2f287cd27b6a9fe42e83f660ca48a5972d @@ -143,5 +143,5 @@ SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 1 SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327 SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822aa0bfb9329a38d908a602b78a5e5fef9c7e946a26de6b SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378 -SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf -SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 +SHA256 (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 0b12bbc53a41f3e3d6df419c173b8c87434be3e6cd255a8193aa91345a2de6cf +SIZE (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 12448 Added: head/www/nginx/files/extra-patch-xss-nginx-module-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-xss-nginx-module-config Fri Jun 5 11:35:13 2020 (r538009) @@ -0,0 +1,15 @@ +--- ../xss-nginx-module-0.06/config.orig 2020-04-24 17:13:57.596040000 -0400 ++++ ../xss-nginx-module-0.06/config 2020-04-24 17:18:16.438437000 -0400 +@@ -1,5 +1,9 @@ + ngx_addon_name=ngx_http_xss_filter_module +-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_xss_filter_module" +-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_xss_filter_module.c $ngx_addon_dir/src/ngx_http_xss_util.c" +-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_xss_filter_module.h $ngx_addon_dir/src/ngx_http_xss_util.h" + ++ngx_module_name="$ngx_addon_name" ++ngx_module_type=HTTP_FILTER ++ ++ngx_module_srcs="$ngx_addon_dir/src/ngx_http_xss_filter_module.c $ngx_addon_dir/src/ngx_http_xss_util.c" ++ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_xss_filter_module.h $ngx_addon_dir/src/ngx_http_xss_util.h" ++ ++. auto/module Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Fri Jun 5 11:31:35 2020 (r538008) +++ head/www/nginx/pkg-plist Fri Jun 5 11:35:13 2020 (r538009) @@ -69,10 +69,12 @@ %%DSO%%%%RTMP%%libexec/nginx/ngx_rtmp_module.so %%DSO%%%%SET_MISC%%libexec/nginx/ngx_http_set_misc_module.so %%DSO%%%%SHIBBOLETH%%libexec/nginx/ngx_http_shibboleth_module.so +%%DSO%%%%SLOWFS_CACHE%%libexec/nginx/ngx_http_slowfs_module.so %%DSO%%%%SMALL_LIGHT%%libexec/nginx/ngx_http_small_light_module.so %%DSO%%%%SRCACHE%%libexec/nginx/ngx_http_srcache_filter_module.so %%DSO%%%%STREAM%%libexec/nginx/ngx_stream_module.so %%DSO%%%%VOD%%libexec/nginx/ngx_http_vod_module.so +%%DSO%%%%XSS%%libexec/nginx/ngx_http_xss_filter_module.so %%WWW%%@postexec mkdir -p -m 755 %D/www/nginx-dist %%WWW%%@postexec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi %%WWW%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006051135.055BZE88035040>