Date: Tue, 24 Apr 2018 22:29:18 +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: r468248 - in head/www/nginx-devel: . files Message-ID: <201804242229.w3OMTItk089752@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Apr 24 22:29:18 2018 New Revision: 468248 URL: https://svnweb.freebsd.org/changeset/ports/468248 Log: Merge from www/nginx and adopt next revisions: 468201, 468240. Update third-party modules to their recent versions. Enable libxml usage for third-party vod module. Bump PORTREVISION. Added: head/www/nginx-devel/files/extra-patch-nginx-vod-module-config (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Apr 24 21:51:32 2018 (r468247) +++ head/www/nginx-devel/Makefile Tue Apr 24 22:29:18 2018 (r468248) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ LOCAL/osa @@ -143,7 +143,7 @@ HTTP_CONFIGURE_OFF= --without-http HTTP_ADDITION_CONFIGURE_ON= --with-http_addition_module HTTP_AUTH_REQ_CONFIGURE_ON= --with-http_auth_request_module HTTP_CACHE_CONFIGURE_OFF= --without-http-cache -HTTP_DAV_CONFIGURE_ARGS= --with-http_dav_module +HTTP_DAV_CONFIGURE_ON= --with-http_dav_module HTTP_FLV_CONFIGURE_ON= --with-http_flv_module HTTP_GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP HTTP_GEOIP_VARS= DSO_BASEMODS+=http_geoip_module @@ -151,7 +151,7 @@ HTTP_GZIP_STATIC_CONFIGURE_ON= --with-http_gzip_static HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module HTTP_IMAGE_FILTER_LIB_DEPENDS= libgd.so:graphics/gd HTTP_IMAGE_FILTER_VARS= DSO_BASEMODS+=http_image_filter_module -HTTP_MP4_CONFIGURE_ARGS= --with-http_mp4_module +HTTP_MP4_CONFIGURE_ON= --with-http_mp4_module HTTP_PERL_CATEGORIES= perl5 HTTP_PERL_USES= perl5 HTTP_PERL_VARS= DSO_BASEMODS+=http_perl_module @@ -298,6 +298,11 @@ post-patch-SFLOW-on: @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKSRC_sflow}/ngx_http_sflow_config.h + +post-patch-VOD-on: + @${REINPLACE_CMD} \ + 's!%%PREFIX%%!${LOCALBASE}!g' \ + ${WRKSRC_vod}/config pre-configure-MODSECURITY-on: ( cd ${WRKSRC_MODSECURITY} && \ Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Apr 24 21:51:32 2018 (r468247) +++ head/www/nginx-devel/Makefile.extmod Tue Apr 24 22:29:18 2018 (r468248) @@ -8,11 +8,11 @@ ARRAYVAR_IMPLIES= DEVEL_KIT ARRAYVAR_GH_TUPLE= openresty:array-var-nginx-module:v0.05:arrayvar ARRAYVAR_VARS= DSO_EXTMODS+=arrayvar -AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:1e62670:aws_auth +AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:f1bcf3b:aws_auth AWS_AUTH_VARS= DSO_EXTMODS+=aws_auth BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli -BROTLI_GH_TUPLE= eustas:ngx_brotli:6a11744:brotli +BROTLI_GH_TUPLE= eustas:ngx_brotli:37ab9b2:brotli BROTLI_VARS= DSO_EXTMODS+=brotli CACHE_PURGE_MASTER_SITES= http://labs.frickle.com/files/:cache_purge @@ -22,13 +22,14 @@ CACHE_PURGE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_c CLOJURE_CATEGORIES+= java CLOJURE_USE= JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \ JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes -CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:v0.4.5:clojure +CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:1129712:clojure CLOJURE_CONFIGURE_ENV= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CLOJURE_VARS= DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c CT_IMPLIES= HTTP_SSL -CT_GH_TUPLE= grahamedgecombe:nginx-ct:v1.3.2:ct +CT_GH_TUPLE= grahamedgecombe:nginx-ct:93e9884:ct CT_VARS= DSO_EXTMODS+=ct +CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL ECHO_GH_TUPLE= openresty:echo-nginx-module:c65f5c6:echo ECHO_VARS= DSO_EXTMODS+=echo @@ -36,7 +37,7 @@ ECHO_VARS= DSO_EXTMODS+=echo DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle DRIZZLE_CONFIGURE_ENV= LIBDRIZZLE_INC=${LOCALBASE}/include \ LIBDRIZZLE_LIB=${LOCALBASE}/lib -DRIZZLE_GH_TUPLE= openresty:drizzle-nginx-module:v0.1.10:drizzle +DRIZZLE_GH_TUPLE= openresty:drizzle-nginx-module:b4f94ec:drizzle DRIZZLE_CONFIGURE_ON= --add-module=${WRKSRC_drizzle} DRIZZLE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config @@ -47,7 +48,7 @@ DEVEL_KIT_GH_TUPLE= simpl:ngx_devel_kit:v0.3.0:devel_ DEVEL_KIT_VARS= DSO_EXTMODS+=devel_kit ENCRYPTSESSION_IMPLIES= DEVEL_KIT -ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.07:encryptsession +ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.08:encryptsession ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession FASTDFS_GH_TUPLE= happyfish100:fastdfs-nginx-module:85347be:fastdfs @@ -154,7 +155,7 @@ HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload- HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck -HTTP_UPSTREAM_CHECK_CONFIGURE_ARGS= --add-module=${WRKSRC_upstreamcheck} +HTTP_UPSTREAM_CHECK_CONFIGURE_ON= --add-module=${WRKSRC_upstreamcheck} HTTP_UPSTREAM_CHECK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \ @@ -176,7 +177,7 @@ HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so: libswscale.so:multimedia/ffmpeg DA!LIBRESSL_1_0_APIHTTP_VIDEO_THUMBEXTRACTOR_USES= jpeg HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module:0.9.0:vte -HTTP_VIDEO_THUMBEXTRACTOR_CONFIGURE_ARGS=--add-module=${WRKSRC_vte} +HTTP_VIDEO_THUMBEXTRACTOR_CONFIGURE_ON= --add-module=${WRKSRC_vte} HTTP_ZIP_GH_TUPLE= anthonyryan1:mod_zip:74ef235:mod_zip HTTP_ZIP_CONFIGURE_ON= --add-module=${WRKSRC_mod_zip} @@ -188,16 +189,16 @@ ICONV_VARS= DSO_EXTMODS+=iconv ICONV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config LET_GH_TUPLE= arut:nginx-let-module:v0.0.4:let -LET_CONFIGURE_ARGS= --add-module=${WRKSRC_let} +LET_CONFIGURE_ON= --add-module=${WRKSRC_let} LUA_IMPLIES= DEVEL_KIT LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \ LUAJIT_LIB=${LOCALBASE}/lib -LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.11:lua +LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.13:lua LUA_VARS= DSO_EXTMODS+=lua -MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.18:memc +MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.19:memc MEMC_VARS= DSO_EXTMODS+=memc MODSECURITY_LIB_DEPENDS= libapr-1.so:devel/apr1 \ @@ -213,14 +214,14 @@ MODSECURITY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngi MODSECURITY_VARS= WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.2 MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:www/mod_security3 -MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:c0ae166:modsec +MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:4cde86b:modsec MODSECURITY3_CONFIGURE_ON= --add-module=${WRKSRC_modsec} NAXSI_NGINX_VER= 0.55.3 NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NJS_GH_TUPLE= nginx:njs:7dcacb4:njs +NJS_GH_TUPLE= nginx:njs:f910561:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx PASSENGER_NGINX_VER= 5.2.3 @@ -278,7 +279,9 @@ SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.31 SRCACHE_VARS= DSO_EXTMODS+=srcache VOD_GH_TUPLE= kaltura:nginx-vod-module:1.22:vod +VOD_USE= GNOME=libxml2 VOD_VARS= DSO_EXTMODS+=vod +VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.15:vts VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Apr 24 21:51:32 2018 (r468247) +++ head/www/nginx-devel/distinfo Tue Apr 24 22:29:18 2018 (r468248) @@ -1,4 +1,4 @@ -TIMESTAMP = 1524006429 +TIMESTAMP = 1524606446 SHA256 (nginx-1.14.0.tar.gz) = 5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5 SIZE (nginx-1.14.0.tar.gz) = 1016272 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -19,6 +19,38 @@ SHA256 (passenger-5.2.3.tar.gz) = 0a06a2c75688a0e6c857 SIZE (passenger-5.2.3.tar.gz) = 6956101 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 (anomalizer-ngx_aws_auth-f1bcf3b_GH0.tar.gz) = e250ce159a10dfbfa0d665870436d706a2dd95c3bd72db06253ec12d1e9e19f3 +SIZE (anomalizer-ngx_aws_auth-f1bcf3b_GH0.tar.gz) = 15369 +SHA256 (eustas-ngx_brotli-37ab9b2_GH0.tar.gz) = 402c58b4330f585153c43904b44fbcedf9ef0e0d1e5993158650ca17badfbd7b +SIZE (eustas-ngx_brotli-37ab9b2_GH0.tar.gz) = 12687 +SHA256 (nginx-clojure-nginx-clojure-1129712_GH0.tar.gz) = 2be00e9a51241f70d3eb38c0063400963e4f20f3ec4c6dea2affdd6ae50d4db3 +SIZE (nginx-clojure-nginx-clojure-1129712_GH0.tar.gz) = 624143 +SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2 +SIZE (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 7224 +SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 +SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455 +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 (openresty-drizzle-nginx-module-b4f94ec_GH0.tar.gz) = 68f3781c989da36a20513741321076e3a627dac8b635c9d34242376c6c8d76b4 +SIZE (openresty-drizzle-nginx-module-b4f94ec_GH0.tar.gz) = 50864 +SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 056fcd63cab39c2f0144d6a8c3ce16e8ae2cfb6e02ad66e5972ffeeca6c6a4d3 +SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 11015 +SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = aea1d10d9175a6471b34d436df937b5c97e7ba1ac4b4b2582a2cb6716d7fba4b +SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121 +SHA256 (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 6e526ea097c6805ec2cf1d0d3d79ed24326bc2d0babe158c29edd07d8c0d106a +SIZE (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 11802 +SHA256 (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 00bbcc70bfd711cd67ca685ad5620764c54be13f95299b8a5d175cdeb10b6d3c +SIZE (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 19835 +SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 +SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 +SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a +SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883 +SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172 +SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024 +SHA256 (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = ed996dc994ba31ae071e05f12bfac6ff86ee03a2e7d4263346b919870d8135ac +SIZE (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = 28139 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0 SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393 SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c @@ -29,20 +61,6 @@ SHA256 (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 78 SIZE (kvspb-nginx-auth-ldap-42d195d_GH0.tar.gz) = 18455 SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7 SIZE (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 6863 -SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 -SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704 -SHA256 (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = db7ceef4ae22cf5bfaf5abae64830dfeef203ca85f9f40f7d1f1d90f277478c0 -SIZE (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = 8260 -SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = c6d500f935dde5f87a6eb47ca473094a8ee2c9b4bb4578c9f99ccdc70a12d59e -SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064 -SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 -SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844 -SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = aea1d10d9175a6471b34d436df937b5c97e7ba1ac4b4b2582a2cb6716d7fba4b -SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121 -SHA256 (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 00bbcc70bfd711cd67ca685ad5620764c54be13f95299b8a5d175cdeb10b6d3c -SIZE (happyfish100-fastdfs-nginx-module-85347be_GH0.tar.gz) = 19835 -SHA256 (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = ed996dc994ba31ae071e05f12bfac6ff86ee03a2e7d4263346b919870d8135ac -SIZE (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = 28139 SHA256 (arut-nginx-dav-ext-module-v0.1.0_GH0.tar.gz) = 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a SIZE (arut-nginx-dav-ext-module-v0.1.0_GH0.tar.gz) = 6614 SHA256 (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 014bedb2b334ba8e8e23b4c660590357f8055dbed7b9b017e4cc2937876a8822 @@ -77,26 +95,20 @@ SHA256 (wandenberg-nginx-video-thumbextractor-module-0 SIZE (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 2709894 SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44 SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125 -SHA256 (openresty-drizzle-nginx-module-v0.1.10_GH0.tar.gz) = 4033b9af73241a695ff07162969ea2212f5401dd484f204b8e3e50f488f84a94 -SIZE (openresty-drizzle-nginx-module-v0.1.10_GH0.tar.gz) = 50674 -SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 056fcd63cab39c2f0144d6a8c3ce16e8ae2cfb6e02ad66e5972ffeeca6c6a4d3 -SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 11015 -SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 -SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455 -SHA256 (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66 -SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139 -SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a -SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883 -SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172 -SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024 +SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 +SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534 -SHA256 (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = c0fb91fcfd1c6e7dec34ca64826ef81ffebafdef6174d254467636f380566626 -SIZE (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = 616653 -SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d -SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113 +SHA256 (openresty-lua-nginx-module-v0.10.13_GH0.tar.gz) = ecea8c3d7f69dd48c6132498ddefb5d83ba9f387fa3d4da14e2abeacdfc8a3ee +SIZE (openresty-lua-nginx-module-v0.10.13_GH0.tar.gz) = 624102 +SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 +SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 +SHA256 (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = d56e12955d933a39c7573ebc327e0aed32fdcc40cc39770a612b9a584b3f1705 +SIZE (SpiderLabs-ModSecurity-nginx-4cde86b_GH0.tar.gz) = 26453 SHA256 (nbs-system-naxsi-0.55.3_GH0.tar.gz) = 0b3c95d250772dc89ad8b49e47c1e024c5ae2c76c0cffa445e9fe05c4dd13495 SIZE (nbs-system-naxsi-0.55.3_GH0.tar.gz) = 187416 +SHA256 (nginx-njs-f910561_GH0.tar.gz) = d0b66aaac3978e9ae398dff544d2838c4aef0af0741967f2586f2b181ce7db1a +SIZE (nginx-njs-f910561_GH0.tar.gz) = 252482 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742 SHA256 (openresty-rds-csv-nginx-module-v0.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79 @@ -123,15 +135,3 @@ SHA256 (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 5 SIZE (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 371128 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-7dcacb4_GH0.tar.gz) = 67f5b41c375ed0fe1b63b29ed678b0ceba138608d98dcb80f54575b77bac5bd3 -SIZE (nginx-njs-7dcacb4_GH0.tar.gz) = 251527 -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 (eustas-ngx_brotli-6a11744_GH0.tar.gz) = e8a34dd30ff08a23cb7060d026e4e63cf33fb9e3c3a05eb5126fafb1732a51a9 -SIZE (eustas-ngx_brotli-6a11744_GH0.tar.gz) = 12773 -SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 -SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 -SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 -SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 -SHA256 (SpiderLabs-ModSecurity-nginx-c0ae166_GH0.tar.gz) = 06790c202c7b11b8d17c3d92b3d9cf505db80fda0864d37db03508f8393ed2bb -SIZE (SpiderLabs-ModSecurity-nginx-c0ae166_GH0.tar.gz) = 26298 Modified: head/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL ============================================================================== --- head/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL Tue Apr 24 21:51:32 2018 (r468247) +++ head/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL Tue Apr 24 22:29:18 2018 (r468248) @@ -1,20 +1,20 @@ ---- ../ nginx-ct-1.3.2/ngx_ssl_ct_module.c.orig 2016-11-30 22:58:29.000000000 +0100 -+++ ../nginx-ct-1.3.2/ngx_ssl_ct_module.c 2017-02-11 19:42:19.741572000 +0100 -@@ -170,7 +170,7 @@ +--- ../nginx-ct-93e9884/ngx_ssl_ct_module.c.orig 2017-07-23 08:03:35.000000000 -0400 ++++ ../nginx-ct-93e9884/ngx_ssl_ct_module.c 2018-04-24 16:58:27.698435000 -0400 +@@ -158,7 +158,7 @@ #endif } -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) /* add OpenSSL TLS extension */ - if (SSL_CTX_add_server_custom_ext(ssl_ctx, NGX_SSL_CT_EXT, - &ngx_ssl_ct_ext_cb, NULL, NULL, NULL, NULL) == 0) -@@ -184,7 +184,7 @@ + # if OPENSSL_VERSION_NUMBER >= 0x10101000L + int context = SSL_EXT_CLIENT_HELLO +@@ -183,7 +183,7 @@ return NGX_CONF_OK; } -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) - int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, const unsigned char **out, - size_t *outlen, int *al, void *add_arg) - { + # if OPENSSL_VERSION_NUMBER >= 0x10101000L + int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, unsigned int context, + const unsigned char **out, size_t *outlen, X509 *x, size_t chainidx, Added: head/www/nginx-devel/files/extra-patch-nginx-vod-module-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nginx-vod-module-config Tue Apr 24 22:29:18 2018 (r468248) @@ -0,0 +1,17 @@ +--- ../nginx-vod-module-1.22/config.orig 2018-04-24 17:51:34.654430000 -0400 ++++ ../nginx-vod-module-1.22/config 2018-04-24 18:10:13.517041000 -0400 +@@ -154,8 +154,12 @@ + ngx_feature_run=no + ngx_feature_incs="#include <libxml/parser.h> + #include <libxml/tree.h>" +-ngx_feature_path="/usr/include/libxml2" +-ngx_feature_libs="-lxml2" ++ngx_feature_path="%%PREFIX%%/include/libxml2 %%PREFIX%%/include" ++if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lxml2 -lxslt" ++else ++ ngx_feature_libs="-L%%PREFIX%%/lib -lxml2 -lxslt" ++fi + ngx_feature_test="xmlReadMemory(NULL, 0, NULL, NULL, 0);" + . auto/feature + Modified: head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config Tue Apr 24 21:51:32 2018 (r468247) +++ head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config Tue Apr 24 22:29:18 2018 (r468248) @@ -1,5 +1,5 @@ ---- ../drizzle-nginx-module-0.1.10/config.orig 2011-12-30 10:26:53.000000000 +0400 -+++ ../drizzle-nginx-module-0.1.10/config 2011-12-30 10:28:20.000000000 +0400 +--- ../drizzle-nginx-module-b4f94ec/config.orig 2011-12-30 10:26:53.000000000 +0400 ++++ ../drizzle-nginx-module-b4f94ec/config 2011-12-30 10:28:20.000000000 +0400 @@ -22,12 +22,12 @@ if [ $ngx_found = no ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804242229.w3OMTItk089752>