From owner-svn-ports-all@freebsd.org Wed Jun 6 18:48:09 2018 Return-Path: Delivered-To: svn-ports-all@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 97121FDE544; Wed, 6 Jun 2018 18:48:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4873E81B0E; Wed, 6 Jun 2018 18:48:09 +0000 (UTC) (envelope-from brnrd@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 29AD96D71; Wed, 6 Jun 2018 18:48:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w56Im9MO070265; Wed, 6 Jun 2018 18:48:09 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w56Im9Zj070264; Wed, 6 Jun 2018 18:48:09 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201806061848.w56Im9Zj070264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 6 Jun 2018 18:48:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471876 - branches/2018Q2/dns/unbound/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q2/dns/unbound/files X-SVN-Commit-Revision: 471876 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2018 18:48:09 -0000 Author: brnrd Date: Wed Jun 6 18:48:08 2018 New Revision: 471876 URL: https://svnweb.freebsd.org/changeset/ports/471876 Log: MFH: r470572 dns/unbound: Fix errors when unbound_conf is set PR: 228390 Approved by: maintainer Approved by: ports-secteam (feld) Modified: branches/2018Q2/dns/unbound/files/unbound.in Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/unbound/files/unbound.in ============================================================================== --- branches/2018Q2/dns/unbound/files/unbound.in Wed Jun 6 18:46:27 2018 (r471875) +++ branches/2018Q2/dns/unbound/files/unbound.in Wed Jun 6 18:48:08 2018 (r471876) @@ -23,7 +23,6 @@ rcvar=unbound_enable command="%%PREFIX%%/sbin/unbound" extra_commands="reload" start_precmd="start_precmd" -reload_precmd="%%PREFIX%%/sbin/unbound-checkconf ${unbound_conf} >/dev/null" load_rc_config $name @@ -32,6 +31,8 @@ unbound_enable=${unbound_enable:-"NO"} unbound_anchorflags=${unbound_anchorflags:-""} unbound_conf=${unbound_conf:-"%%ETCDIR%%/unbound.conf"} unbound_flags=${unbound_flags:-" -c ${unbound_conf}"} + +reload_precmd="%%PREFIX%%/sbin/unbound-checkconf ${unbound_conf} >/dev/null" start_precmd() {