diff options
Diffstat (limited to 'www/nginx-devel')
| -rw-r--r-- | www/nginx-devel/Makefile | 2 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 8 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-xss-nginx-module-config | 15 | ||||
| -rw-r--r-- | www/nginx-devel/pkg-plist | 2 |
5 files changed, 25 insertions, 8 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0a9082e1cae0..6d507a29b381 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION= 7 +PORTREVISION= 8 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 18cd195529b0..dc556f74cd46 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -284,9 +284,8 @@ SFLOW_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ SHIBBOLETH_GH_TUPLE= nginx-shib:nginx-http-shibboleth:fe5fcd2: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 @@ -305,7 +304,8 @@ VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_VARS= DSO_EXTMODS+=vts XSS_GH_TUPLE= openresty:xss-nginx-module:v0.06:xss -XSS_CONFIGURE_ON= --add-module=${WRKSRC_xss} +XSS_VARS= DSO_EXTMODS+=xss +XSS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-xss-nginx-module-config WEBSOCKIFY_GH_TUPLE= tg123:websockify-nginx-module:c11bc9a:websockify WEBSOCKIFY_VARS= DSO_EXTMODS+=websockify diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 89d40723170a..c78eee31b9a3 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1587747726 +TIMESTAMP = 1587764044 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -13,8 +13,6 @@ SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1 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-a964a0b_GH0.tar.gz) = 0c786660ce2e5c6d23cf02e957786ad581a04cc6315145eb144ec271f7f81326 SIZE (yaoweibin-nginx_ajp_module-a964a0b_GH0.tar.gz) = 109940 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 @@ -131,6 +129,8 @@ SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f6 SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504 SHA256 (nginx-shib-nginx-http-shibboleth-fe5fcd2_GH0.tar.gz) = e7cbb0abe919370dec583a4c8a3db5986bc2eb83f5a0a37210002734a41820a7 SIZE (nginx-shib-nginx-http-shibboleth-fe5fcd2_GH0.tar.gz) = 23250 +SHA256 (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 6ae8abb01a2aff788e75ec68621cb0159148a6f73730a84b30b0bdbc6cdc1758 +SIZE (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 11186 SHA256 (dvershinin-ngx_small_light-v0.9.4_GH0.tar.gz) = 31e232726ee879087cd79f60b6210ed269eeeee97ce80d21b75101bdaf06f3d9 SIZE (dvershinin-ngx_small_light-v0.9.4_GH0.tar.gz) = 56771 SHA256 (openresty-srcache-nginx-module-v0.32rc1_GH0.tar.gz) = 16b858e239fca7616cf10bdd95c9c6d7f783dad838edb992a2ee3b733a67f52f diff --git a/www/nginx-devel/files/extra-patch-xss-nginx-module-config b/www/nginx-devel/files/extra-patch-xss-nginx-module-config new file mode 100644 index 000000000000..c5dc537b783c --- /dev/null +++ b/www/nginx-devel/files/extra-patch-xss-nginx-module-config @@ -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 diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index 923e026a915d..ab070705cbd8 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -68,6 +68,7 @@ %%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%%%%NJS%%libexec/nginx/ngx_stream_js_module.so @@ -75,6 +76,7 @@ %%DSO%%%%VOD%%libexec/nginx/ngx_http_vod_module.so %%DSO%%%%VTS%%libexec/nginx/ngx_http_vhost_traffic_status_module.so %%DSO%%%%WEBSOCKIFY%%libexec/nginx/ngx_http_websockify_module.so +%%DSO%%%%XSS%%libexec/nginx/ngx_http_xss_filter_module.so %%HTTP_PERL%%%%SITE_ARCH%%/auto/nginx/nginx.so %%HTTP_PERL%%%%SITE_ARCH%%/nginx.pm %%NJS%%sbin/njs |