svn commit: r538085 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Sat Jun 6 10:45:28 UTC 2020
Author: joneum
Date: Sat Jun 6 10:45:27 2020
New Revision: 538085
URL: https://svnweb.freebsd.org/changeset/ports/538085
Log:
Merge r533146 from www/nginx-devel:
Convert another 3 third-party modules to dynamic:
o) ngx_http_subs_filter
o) ngx_http_upstream_check
o) ngx_http_response
Sponsored by: Netzkommune GmbH
Added:
head/www/nginx/files/extra-patch-nginx_upstream_check_module-config (contents, props changed)
head/www/nginx/files/extra-patch-ngx_http_response-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 Sat Jun 6 10:27:58 2020 (r538084)
+++ head/www/nginx/Makefile Sat Jun 6 10:45:27 2020 (r538085)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 11
+PORTREVISION?= 12
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Sat Jun 6 10:27:58 2020 (r538084)
+++ head/www/nginx/Makefile.extmod Sat Jun 6 10:45:27 2020 (r538085)
@@ -157,12 +157,13 @@ HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9
HTTP_RESPONSE_MASTER_SITES= http://catap.ru/downloads/nginx/:response
HTTP_RESPONSE_DISTFILES= ngx_http_response-0.3.tar.gz:response
-HTTP_RESPONSE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_http_response-0.3
+HTTP_RESPONSE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_response-config
+HTTP_RESPONSE_VARS= DSO_EXTDIRS+=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}
+HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:b8a71ea:subs_filter
+HTTP_SUBS_FILTER_VARS= DSO_EXTMODS+=subs_filter
HTTP_TARANTOOL_LIB_DEPENDS= libmsgpuck.so:devel/msgpuck \
libyajl.so:devel/yajl
@@ -178,12 +179,13 @@ 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_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 \
${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \
- ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h
+ ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h \
+ ${PATCHDIR}/extra-patch-nginx_upstream_check_module-config
+HTTP_UPSTREAM_CHECK_VARS= DSO_EXTMODS+=upstreamcheck
HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair
HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Sat Jun 6 10:27:58 2020 (r538084)
+++ head/www/nginx/distinfo Sat Jun 6 10:45:27 2020 (r538085)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1591369113
+TIMESTAMP = 1591435465
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
@@ -81,8 +81,8 @@ SHA256 (slact-nchan-v1.1.14_GH0.tar.gz) = 70b38d9e5482
SIZE (slact-nchan-v1.1.14_GH0.tar.gz) = 630564
SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 5253bb8a804ea679e514137a234637298f044c3ef63c053670bf3802ff3535b1
SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493
-SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3
-SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230
+SHA256 (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 08f966328fc1b77e0dbbcacd9532c3905060c20c45b6461b6f2075cd844d0891
+SIZE (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 94039
SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a
SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378
SHA256 (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 2285245bdef11656e5bcc866e693e48f84b7443d36924f45a6fb8647cd35319a
Added: head/www/nginx/files/extra-patch-nginx_upstream_check_module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-nginx_upstream_check_module-config Sat Jun 6 10:45:27 2020 (r538085)
@@ -0,0 +1,32 @@
+--- ../nginx_upstream_check_module-9aecf15/config.orig 2020-04-27 09:51:23.976467000 -0400
++++ ../nginx_upstream_check_module-9aecf15/config 2020-04-27 09:54:11.429571000 -0400
+@@ -1,23 +1,7 @@
+-ngx_feature="ngx_http_upstream_check_module"
+-ngx_feature_name=
+-ngx_feature_run=no
+-ngx_feature_incs=
+-ngx_feature_path="$ngx_addon_dir"
+-ngx_feature_deps="$ngx_addon_dir/ngx_http_upstream_check_module.h"
+-ngx_check_src="$ngx_addon_dir/ngx_http_upstream_check_module.c"
+-ngx_feature_test="int a;"
+-. auto/feature
++ngx_addon_name=ngx_http_upstream_check_module
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++ngx_module_deps="$ngx_addon_dir/ngx_http_upstream_check_module.h"
++ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_check_module.c"
+
+-if [ $ngx_found = yes ]; then
+- have=NGX_HTTP_UPSTREAM_CHECK . auto/have
+- CORE_INCS="$CORE_INCS $ngx_feature_path"
+- ngx_addon_name=ngx_http_upstream_check_module
+- HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_check_module"
+- NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_feature_deps"
+- NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_check_src"
+-else
+- cat << END
+- $0: error: the ngx_http_upstream_check_module addon error.
+-END
+- exit 1
+-fi
++. auto/module
Added: head/www/nginx/files/extra-patch-ngx_http_response-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-ngx_http_response-config Sat Jun 6 10:45:27 2020 (r538085)
@@ -0,0 +1,11 @@
+--- ../ngx_http_response-0.3/config.orig 2020-04-27 11:41:14.626983000 -0400
++++ ../ngx_http_response-0.3/config 2020-04-27 11:41:50.008905000 -0400
+@@ -1,3 +1,6 @@
+ ngx_addon_name=ngx_http_response_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_response_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_response_module.c"
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++ngx_module_srcs="$ngx_addon_dir/ngx_http_response_module.c"
++ngx_module_deps=""
++. auto/module
Modified: head/www/nginx/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist Sat Jun 6 10:27:58 2020 (r538084)
+++ head/www/nginx/pkg-plist Sat Jun 6 10:45:27 2020 (r538085)
@@ -48,9 +48,12 @@
%%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
%%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so
%%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so
+%%DSO%%%%HTTP_RESPONSE%%libexec/nginx/ngx_http_response_module.so
+%%DSO%%%%HTTP_SUBS_FILTER%%libexec/nginx/ngx_http_subs_filter_module.so
%%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
%%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so
%%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so
+%%DSO%%%%HTTP_UPSTREAM_CHECK%%libexec/nginx/ngx_http_upstream_check_module.so
%%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so
%%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/nginx/ngx_http_sticky_module.so
%%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/nginx/ngx_http_video_thumbextractor_module.so
More information about the svn-ports-all
mailing list