From owner-svn-ports-head@freebsd.org Tue May 28 20:09:00 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92E0D15AAB44; Tue, 28 May 2019 20:09:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 314A48F8C8; Tue, 28 May 2019 20:09:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C04E1F2FD; Tue, 28 May 2019 20:09:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4SK8xk7057631; Tue, 28 May 2019 20:08:59 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4SK8x2W057630; Tue, 28 May 2019 20:08:59 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201905282008.x4SK8x2W057630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 28 May 2019 20:08:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502912 - in head/www/varnish6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/www/varnish6: . files X-SVN-Commit-Revision: 502912 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 314A48F8C8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 May 2019 20:09:00 -0000 Author: feld Date: Tue May 28 20:08:59 2019 New Revision: 502912 URL: https://svnweb.freebsd.org/changeset/ports/502912 Log: www/varnish6: Fix configtest on a restart Submitted by: NISHIMURA Yutaka MFH: 2019Q2 Modified: head/www/varnish6/Makefile head/www/varnish6/files/varnishd.in Modified: head/www/varnish6/Makefile ============================================================================== --- head/www/varnish6/Makefile Tue May 28 20:06:20 2019 (r502911) +++ head/www/varnish6/Makefile Tue May 28 20:08:59 2019 (r502912) @@ -3,7 +3,7 @@ PORTNAME= varnish PORTVERSION= 6.2.0 DISTVERSIONPREFIX= varnish- -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www PKGNAMESUFFIX= 6 Modified: head/www/varnish6/files/varnishd.in ============================================================================== --- head/www/varnish6/files/varnishd.in Tue May 28 20:06:20 2019 (r502911) +++ head/www/varnish6/files/varnishd.in Tue May 28 20:08:59 2019 (r502912) @@ -83,7 +83,7 @@ varnishd_checkconfig() echo "${name}: nothing to check, no configuration file defined, builtin VCL used" else echo "Performing sanity check on ${name} configuration:" - if eval ${command} ${varnishd_flags} -C -f "${varnishd_config}" 2> /dev/null ; then + if eval ${command} -s ${varnishd_storage} ${varnishd_extra_flags} -C -f "${varnishd_config}" 2> /dev/null ; then echo "${name}: the configuration file ${varnishd_config} syntax is ok" else err 1 "${name}: the configuration file ${varnishd_config} syntax is NOT ok"