Date: Mon, 16 Sep 2019 20:38:21 +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: r512184 - in head/www/nginx-devel: . files Message-ID: <201909162038.x8GKcLoD070077@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Mon Sep 16 20:38:21 2019 New Revision: 512184 URL: https://svnweb.freebsd.org/changeset/ports/512184 Log: Add the following third-party modules: o) ip2location o) ip2proxy Add third-party slice_ahead feature. Update third-party passenger module to the latest release 6.0.3. Switch third-party lua module dependence from lang/luajit (2.0) to lang/luajit-openresty (2.1). Bump PORTREVISION. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/Makefile.options.desc head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Mon Sep 16 19:56:46 2019 (r512183) +++ head/www/nginx-devel/Makefile Mon Sep 16 20:38:21 2019 (r512184) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.17.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -70,21 +70,23 @@ OPTIONS_GROUP= MAILGRP HTTPGRP OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \ HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \ HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \ - HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB \ - HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD + HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SLICE_AHEAD \ + HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 STREAM STREAM_SSL \ + STREAM_SSL_PREREAD # External modules (arrayvar MUST appear after devel_kit for build-dep) OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \ ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \ GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \ HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \ - HTTP_FOOTER HTTP_GEOIP2 HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 \ - HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM HTTP_REDIS HTTP_RESPONSE \ - HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS \ - HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \ - HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA MEMC MODSECURITY \ - MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP \ - SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS + HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY HTTP_JSON_STATUS \ + HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM \ + HTTP_REDIS HTTP_RESPONSE HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD \ + HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \ + HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA \ + MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \ + RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \ + SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Mon Sep 16 19:56:46 2019 (r512183) +++ head/www/nginx-devel/Makefile.extmod Mon Sep 16 20:38:21 2019 (r512184) @@ -108,6 +108,14 @@ HTTP_GEOIP2_CFLAGS= -I${LOCALBASE}/include HTTP_GEOIP2_VARS= DSO_EXTMODS+=geoip2 HTTP_GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb +HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:d47d248:ip2location +HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location +HTTP_IP2LOCATION_CONFIGURE_ON= --add-module=${WRKSRC_ip2location} + +HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:d6fd05a:ip2proxy +HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy +HTTP_IP2PROXY_CONFIGURE_ON= --add-module=${WRKSRC_ip2proxy} + HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status HTTP_JSON_STATUS_CONFIGURE_ON= --add-module=${WRKSRC_json_status} @@ -139,6 +147,8 @@ HTTP_RESPONSE_MASTER_SITES= http://catap.ru/downloads/ HTTP_RESPONSE_DISTFILES= ngx_http_response-0.3.tar.gz:response HTTP_RESPONSE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_http_response-0.3 +HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c + HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:v0.6.4:subs_filter HTTP_SUBS_FILTER_CONFIGURE_ON= --add-module=${WRKSRC_subs_filter} @@ -190,8 +200,8 @@ LET_GH_TUPLE= arut:nginx-let-module:v0.0.4: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 \ +LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.15:lua LUA_VARS= DSO_EXTMODS+=lua @@ -223,7 +233,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:0.3.5:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -PASSENGER_NGINX_VER= 6.0.2 +PASSENGER_NGINX_VER= 6.0.3 PASSENGER_CATEGORIES= ruby PASSENGER_USE= ruby=yes PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake @@ -288,3 +298,6 @@ VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} XSS_GH_TUPLE= openresty:xss-nginx-module:v0.05:xss XSS_CONFIGURE_ON= --add-module=${WRKSRC_xss} + +WEBSOCKIFY_GH_TUPLE= tg123:websockify-nginx-module:e82d254:websockify +WEBSOCKIFY_CONFIGURE_ON= --add-module=${WRKSRC_websockify} Modified: head/www/nginx-devel/Makefile.options.desc ============================================================================== --- head/www/nginx-devel/Makefile.options.desc Mon Sep 16 19:56:46 2019 (r512183) +++ head/www/nginx-devel/Makefile.options.desc Mon Sep 16 20:38:21 2019 (r512184) @@ -43,6 +43,8 @@ HTTP_GEOIP2_DESC= 3rd party geoip2 module HTTP_GUNZIP_FILTER_DESC= Enable http_gunzip_filter module HTTP_GZIP_STATIC_DESC= Enable http_gzip_static module HTTP_IMAGE_FILTER_DESC= Enable http_image_filter module +HTTP_IP2LOCATION_DESC= 3rd party ip2location-nginx module +HTTP_IP2PROXY_DESC= 3rd party ip2proxy-nginx module HTTP_JSON_STATUS_DESC= 3rd party http_json_status module HTTP_MOGILEFS_DESC= 3rd party mogilefs module HTTP_MP4_DESC= Enable http_mp4 module @@ -58,6 +60,7 @@ HTTP_RESPONSE_DESC= 3rd party http_response module HTTP_REWRITE_DESC= Enable http_rewrite module HTTP_SECURE_LINK_DESC= Enable http_secure_link module HTTP_SLICE_DESC= Enable http_slice module +HTTP_SLICE_AHEAD_DESC= 3rd party http_slice_ahead module HTTP_SSL_DESC= Enable http_ssl module HTTP_STATUS_DESC= Enable http_stub_status module HTTP_SUBS_FILTER_DESC= 3rd party subs filter module @@ -107,3 +110,4 @@ VOD_DESC= 3rd party vod module VTS_DESC= 3rd party vts module WWW_DESC= Enable html sample files XSS_DESC= 3rd party xss module +WEBSOCKIFY_DESC= 3rd party websockify module Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Mon Sep 16 19:56:46 2019 (r512183) +++ head/www/nginx-devel/distinfo Mon Sep 16 20:38:21 2019 (r512184) @@ -1,4 +1,4 @@ -TIMESTAMP = 1566256984 +TIMESTAMP = 1568656400 SHA256 (nginx-1.17.3.tar.gz) = 3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c SIZE (nginx-1.17.3.tar.gz) = 1034586 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053 SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118 SIZE (modsecurity-2.9.3.tar.gz) = 4307670 -SHA256 (passenger-6.0.2.tar.gz) = 56b2273312e6dc9880f6ba83e381583b8759085a0b41338b782c9575d58346bc -SIZE (passenger-6.0.2.tar.gz) = 7204982 +SHA256 (passenger-6.0.3.tar.gz) = ee5de4165a8b9ea379b215b6570155b623e59a7ccd2755f98a23444df12e2dad +SIZE (passenger-6.0.3.tar.gz) = 7347651 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 @@ -69,6 +69,10 @@ SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934 SHA256 (leev-ngx_http_geoip2_module-3.2_GH0.tar.gz) = 15bd1005228cf2c869a6f09e8c41a6aaa6846e4936c473106786ae8ac860fab7 SIZE (leev-ngx_http_geoip2_module-3.2_GH0.tar.gz) = 8465 +SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c +SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542 +SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993 +SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 @@ -133,5 +137,7 @@ SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 80 SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053 SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65 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 Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Mon Sep 16 19:56:46 2019 (r512183) +++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Mon Sep 16 20:38:21 2019 (r512184) @@ -1,5 +1,5 @@ ---- ../passenger-6.0.2/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.2/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.3/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.3/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [ Modified: head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry Mon Sep 16 19:56:46 2019 (r512183) +++ head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry Mon Sep 16 20:38:21 2019 (r512184) @@ -1,5 +1,5 @@ ---- ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.3/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.3/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909162038.x8GKcLoD070077>