svn commit: r532746 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Fri Apr 24 08:45:47 UTC 2020
Author: joneum
Date: Fri Apr 24 08:45:46 2020
New Revision: 532746
URL: https://svnweb.freebsd.org/changeset/ports/532746
Log:
Add the knob for the quiet startup. [1]
Update 3rd party Modul njs
Update Portscout
PR: 245830 [1]
Sponsored by: Netzkommune GmbH
Modified:
head/www/nginx/Makefile
head/www/nginx/Makefile.extmod
head/www/nginx/distinfo
head/www/nginx/files/nginx.in
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Fri Apr 24 08:33:16 2020 (r532745)
+++ head/www/nginx/Makefile Fri Apr 24 08:45:46 2020 (r532746)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
@@ -22,7 +22,7 @@ BROKEN_mips64= error ngx_spinlock() or ngx_atomic_cmp_
CONFLICTS_INSTALL= nginx-devel
-PORTSCOUT= limit:^1\.16\.[0-9]*
+PORTSCOUT= limit:^1\.18\.[0-9]*
USES= cpe
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Fri Apr 24 08:33:16 2020 (r532745)
+++ head/www/nginx/Makefile.extmod Fri Apr 24 08:45:46 2020 (r532746)
@@ -246,7 +246,7 @@ NAXSI_NGINX_VER= 0.56
NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi
NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
-NJS_GH_TUPLE= nginx:njs:0a73870:njs
+NJS_GH_TUPLE= nginx:njs:629027e:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
PASSENGER_NGINX_VER= 6.0.4
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Fri Apr 24 08:33:16 2020 (r532745)
+++ head/www/nginx/distinfo Fri Apr 24 08:45:46 2020 (r532746)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1587550403
+TIMESTAMP = 1587666533
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
@@ -115,8 +115,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz
SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920
SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4
SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
-SHA256 (nginx-njs-0a73870_GH0.tar.gz) = 31058483a7ce7a2eb477c90172f52cf412ab9c5b86c0afffd58ed5d504b343b9
-SIZE (nginx-njs-0a73870_GH0.tar.gz) = 413991
+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 (openresty-rds-csv-nginx-module-v0.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79
Modified: head/www/nginx/files/nginx.in
==============================================================================
--- head/www/nginx/files/nginx.in Fri Apr 24 08:33:16 2020 (r532745)
+++ head/www/nginx/files/nginx.in Fri Apr 24 08:45:46 2020 (r532746)
@@ -17,6 +17,8 @@
# nginxlimits_enable (bool): Set to "NO" by default.
# Set it to yes to run `limits $limits_args`
# just before nginx starts.
+# nginx_reload_quiet (bool): Set to "NO" by default.
+# Set it to yes to suppress info output when testng config.
# nginx_flags (str): Set to "" by default.
# Extra flags passed to start command.
# nginxlimits_args (str): Default to "-e -U %%WWWOWN%%"
@@ -44,10 +46,11 @@ _tmpprefix="%%NGINX_TMPDIR%%"
required_files=%%PREFIX%%/etc/nginx/nginx.conf
extra_commands="reload configtest upgrade gracefulstop"
-[ -z "$nginx_enable" ] && nginx_enable="NO"
+[ -z "$nginx_enable" ] && nginx_enable="NO"
[ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO"
[ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%"
-[ -z "$nginx_http_accept_enable" ] && nginx_http_accept_enable="NO"
+[ -z "$nginx_http_accept_enable" ] && nginx_http_accept_enable="NO"
+[ -z "$nginx_reload_quiet" ] && nginx_reload_quiet="NO"
load_rc_config $name
@@ -97,8 +100,12 @@ nginx_checkconfig()
{
nginx_checktmpdir
- echo "Performing sanity check on nginx configuration:"
- eval ${command} ${nginx_flags} -t
+ if checkyesno nginx_reload_quiet; then
+ eval ${command} ${nginx_flags} -t -q
+ else
+ echo "Performing sanity check on nginx configuration:"
+ eval ${command} ${nginx_flags} -t
+ fi
}
nginx_gracefulstop()
More information about the svn-ports-all
mailing list