sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 01:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Third-party postgres module is dynamic now and remove

Browse source 
the legacy patch.
While I'm here update the PORTSCOUT.

Bump PORTREVISION.
This commit is contained in:
Sergey A. Osokin 2020-04-23 14:43:27 +00:00
parent 1bf1bee454
commit 17af7c8bfc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=532682
6 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/nginx-devel/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS_INSTALL= nginx
PORTSCOUT= limit:^1\.17\.[0-9]*
PORTSCOUT= limit:^1\.19\.[0-9]*
USES= cpe

7
www/nginx-devel/Makefile.extmod
View file

@ -254,10 +254,9 @@ PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
${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.09:rdscsv
RDS_CSV_CONFIGURE_ON= --add-module=${WRKSRC_rdscsv}

6
www/nginx-devel/distinfo
View file

@ -1,4 +1,4 @@
TIMESTAMP = 1587645713
TIMESTAMP = 1587652049
SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
SIZE (nginx-1.18.0.tar.gz) = 1039530
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@ -115,8 +115,8 @@ SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e91
SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
SHA256 (nginx-njs-0.4.0_GH0.tar.gz) = 5c35dc18db01d4736501ef2e8ecf7d7d4c806a84117419849a92b1e1fa36673b
SIZE (nginx-njs-0.4.0_GH0.tar.gz) = 418439
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.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

4
www/nginx-devel/files/extra-patch-ngx_postgres-config
View file

@ -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

17
www/nginx-devel/files/extra-patch-ngx_postgres_module.c
View file

@ -1,17 +0,0 @@
--- ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c.orig 2016-11-20 15:34:25.763542000 -0500
+++ ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c 2016-11-20 15:34:41.023867000 -0500
@@ -1320,12 +1320,14 @@
continue;
}
+#if (nginx_version < 1011006)
if (uscfp[i]->default_port && url->default_port
&& (uscfp[i]->default_port != url->default_port))
{
dd("default_port doesn't match");
continue;
}
+#endif
dd("returning");
return uscfp[i];

1
www/nginx-devel/pkg-plist
View file

@ -49,6 +49,7 @@
%%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
%%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_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