Date: Wed, 3 Jun 2020 08:05:29 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537601 - in head/www/nginx: . files Message-ID: <202006030805.05385T1T075334@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Wed Jun 3 08:05:29 2020 New Revision: 537601 URL: https://svnweb.freebsd.org/changeset/ports/537601 Log: Merge r532582 from www/nginx-devel: Third-party postgres module is dynamic now and remove the legacy patch. Sponsored by: Netzkommune GmbH Deleted: head/www/nginx/files/extra-patch-ngx_postgres_module.c Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/files/extra-patch-ngx_postgres-config head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Wed Jun 3 06:47:51 2020 (r537600) +++ head/www/nginx/Makefile Wed Jun 3 08:05:29 2020 (r537601) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Wed Jun 3 06:47:51 2020 (r537600) +++ head/www/nginx/Makefile.extmod Wed Jun 3 08:05:29 2020 (r537601) @@ -263,10 +263,9 @@ PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passen ${PATCHDIR}/extra-patch-passenger-system-calls POSTGRES_USES= pgsql -POSTGRES_GH_TUPLE= FRiCKLE:ngx_postgres:1.0rc7:postgres -POSTGRES_CONFIGURE_ON= --add-module=${WRKSRC_postgres} -POSTGRES_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_postgres-config \ - ${PATCHDIR}/extra-patch-ngx_postgres_module.c +POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres +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} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Wed Jun 3 06:47:51 2020 (r537600) +++ head/www/nginx/distinfo Wed Jun 3 08:05:29 2020 (r537601) @@ -1,4 +1,4 @@ -TIMESTAMP = 1591086628 +TIMESTAMP = 1591122333 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,8 +117,8 @@ SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd3 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120 SHA256 (nginx-njs-629027e_GH0.tar.gz) = ea541abadd1e928081f71a0e1a843d4ca6573cdf5dcb2004367062fc4b795cbf SIZE (nginx-njs-629027e_GH0.tar.gz) = 418481 -SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 -SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742 +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 Modified: head/www/nginx/files/extra-patch-ngx_postgres-config ============================================================================== --- head/www/nginx/files/extra-patch-ngx_postgres-config Wed Jun 3 06:47:51 2020 (r537600) +++ head/www/nginx/files/extra-patch-ngx_postgres-config Wed Jun 3 08:05:29 2020 (r537601) @@ -1,5 +1,5 @@ ---- ../ngx_postgres-1.0rc7/config.orig 2015-05-26 20:52:25.649166000 +0300 -+++ ../ngx_postgres-1.0rc7/config 2015-05-26 20:53:10.331122000 +0300 +--- ../ngx_postgres-8aa7359/config.orig 2015-05-26 20:52:25.649166000 +0300 ++++ ../ngx_postgres-8aa7359/config 2015-05-26 20:53:10.331122000 +0300 @@ -48,12 +48,12 @@ if [ $ngx_found = no ]; then Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Wed Jun 3 06:47:51 2020 (r537600) +++ head/www/nginx/pkg-plist Wed Jun 3 08:05:29 2020 (r537601) @@ -50,6 +50,7 @@ %%DSO%%%%HTTP%%%%NJS%%libexec/nginx/ngx_http_js_module.so %%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%%%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006030805.05385T1T075334>