svn commit: r538059 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Fri Jun 5 22:54:17 UTC 2020
Author: joneum
Date: Fri Jun 5 22:54:15 2020
New Revision: 538059
URL: https://svnweb.freebsd.org/changeset/ports/538059
Log:
Merge r532959 from www/nginx-devel:
Convert another 2 third-party modules to dynamic:
o) rds_csv
o) rds_json
Sponsored by: Netzkommune GmbH
Added:
head/www/nginx/files/extra-patch-rds-csv-nginx-module-config (contents, props changed)
head/www/nginx/files/extra-patch-rds-json-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 22:38:15 2020 (r538058)
+++ head/www/nginx/Makefile Fri Jun 5 22:54:15 2020 (r538059)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 9
+PORTREVISION?= 10
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Fri Jun 5 22:38:15 2020 (r538058)
+++ head/www/nginx/Makefile.extmod Fri Jun 5 22:54:15 2020 (r538059)
@@ -268,11 +268,13 @@ POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:post
POSTGRES_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_postgres-config
POSTGRES_VARS= DSO_EXTMODS+=postgres
-RDS_CSV_GH_TUPLE= openresty:rds-csv-nginx-module:v0.08:rdscsv
-RDS_CSV_CONFIGURE_ON= --add-module=${WRKSRC_rdscsv}
+RDS_CSV_GH_TUPLE= openresty:rds-csv-nginx-module:v0.09:rdscsv
+RDS_CSV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rds-csv-nginx-module-config
+RDS_CSV_VARS= DSO_EXTMODS+=rdscsv
-RDS_JSON_GH_TUPLE= openresty:rds-json-nginx-module:v0.14:rdsjson
-RDS_JSON_CONFIGURE_ON= --add-module=${WRKSRC_rdsjson}
+RDS_JSON_GH_TUPLE= openresty:rds-json-nginx-module:v0.15:rdsjson
+RDS_JSON_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rds-json-nginx-module-config
+RDS_JSON_VARS= DSO_EXTMODS+=rdsjson
REDIS2_GH_TUPLE= openresty:redis2-nginx-module:v0.15:redis2
REDIS2_VARS= DSO_EXTMODS+=redis2
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Fri Jun 5 22:38:15 2020 (r538058)
+++ head/www/nginx/distinfo Fri Jun 5 22:54:15 2020 (r538059)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1591352499
+TIMESTAMP = 1591369113
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
@@ -117,10 +117,10 @@ SHA256 (nginx-njs-629027e_GH0.tar.gz) = ea541abadd1e92
SIZE (nginx-njs-629027e_GH0.tar.gz) = 418481
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544
-SHA256 (openresty-rds-csv-nginx-module-v0.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79
-SIZE (openresty-rds-csv-nginx-module-v0.08_GH0.tar.gz) = 20518
-SHA256 (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 99aedf222a9664484918392988cce41b1a6238240d42f8bd44f5ff102c05c36c
-SIZE (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 33496
+SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea
+SIZE (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 20531
+SHA256 (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = eaf18f60e981ea2442a7902689a26eba6cf6f36ebee712feeb1f4429eb654bdc
+SIZE (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = 34744
SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471
SHA256 (ut0mt8-nginx-rtmp-module-f0ea623_GH0.tar.gz) = a66fc786e17c84a85db5e9598007b5934405945f19d4b9c5af1e12460bb649d9
Added: head/www/nginx/files/extra-patch-rds-csv-nginx-module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-rds-csv-nginx-module-config Fri Jun 5 22:54:15 2020 (r538059)
@@ -0,0 +1,15 @@
+--- ../rds-csv-nginx-module-0.09/config.orig 2020-04-25 11:37:21.896900000 -0400
++++ ../rds-csv-nginx-module-0.09/config 2020-04-25 11:39:06.371176000 -0400
+@@ -1,5 +1,9 @@
+ ngx_addon_name=ngx_http_rds_csv_filter_module
+-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_csv_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.c $ngx_addon_dir/src/ngx_http_rds_csv_processor.c $ngx_addon_dir/src/ngx_http_rds_csv_util.c $ngx_addon_dir/src/ngx_http_rds_csv_output.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.h $ngx_addon_dir/src/ngx_http_rds_csv_processor.h $ngx_addon_dir/src/ngx_http_rds_csv_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h"
+
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP_FILTER
++
++ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_csv_filter_module.c $ngx_addon_dir/src/ngx_http_rds_csv_processor.c $ngx_addon_dir/src/ngx_http_rds_csv_util.c $ngx_addon_dir/src/ngx_http_rds_csv_output.c"
++ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.h $ngx_addon_dir/src/ngx_http_rds_csv_processor.h $ngx_addon_dir/src/ngx_http_rds_csv_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h"
++
++. auto/module
Added: head/www/nginx/files/extra-patch-rds-json-nginx-module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-rds-json-nginx-module-config Fri Jun 5 22:54:15 2020 (r538059)
@@ -0,0 +1,15 @@
+--- ../rds-json-nginx-module-0.15/config.orig 2020-04-25 11:39:29.003855000 -0400
++++ ../rds-json-nginx-module-0.15/config 2020-04-25 11:40:18.345148000 -0400
+@@ -1,5 +1,9 @@
+ ngx_addon_name=ngx_http_rds_json_filter_module
+-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_json_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h"
+
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP_FILTER
++
++ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c"
++ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h"
++
++. auto/module
Modified: head/www/nginx/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist Fri Jun 5 22:38:15 2020 (r538058)
+++ head/www/nginx/pkg-plist Fri Jun 5 22:54:15 2020 (r538059)
@@ -65,6 +65,8 @@
%%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so
%%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
%%DSO%%%%POSTGRES%%libexec/nginx/ngx_postgres_module.so
+%%DSO%%%%RDS_CSV%%libexec/nginx/ngx_http_rds_csv_filter_module.so
+%%DSO%%%%RDS_JSON%%libexec/nginx/ngx_http_rds_json_filter_module.so
%%DSO%%%%REDIS2%%libexec/nginx/ngx_http_redis2_module.so
%%DSO%%%%RTMP%%libexec/nginx/ngx_rtmp_module.so
%%DSO%%%%SET_MISC%%libexec/nginx/ngx_http_set_misc_module.so
More information about the svn-ports-all
mailing list