From owner-svn-ports-head@freebsd.org Wed Jan 9 12:33:31 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 AD21714A210D; Wed, 9 Jan 2019 12:33:31 +0000 (UTC) (envelope-from swills@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 4D56B84306; Wed, 9 Jan 2019 12:33:31 +0000 (UTC) (envelope-from swills@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 3FA2C1C06D; Wed, 9 Jan 2019 12:33:31 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x09CXVia012825; Wed, 9 Jan 2019 12:33:31 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x09CXUYZ012822; Wed, 9 Jan 2019 12:33:30 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201901091233.x09CXUYZ012822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 9 Jan 2019 12:33:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489774 - in head/dns/knot2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/dns/knot2: . files X-SVN-Commit-Revision: 489774 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D56B84306 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.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,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: Wed, 09 Jan 2019 12:33:31 -0000 Author: swills Date: Wed Jan 9 12:33:30 2019 New Revision: 489774 URL: https://svnweb.freebsd.org/changeset/ports/489774 Log: dns/knot2: update to 2.7.5 While here, patch init script to support automatically determining config type PR: 234751 Submitted by: Leo Vandewoestijne (maintainer) Modified: head/dns/knot2/Makefile (contents, props changed) head/dns/knot2/distinfo (contents, props changed) head/dns/knot2/files/knot.in Modified: head/dns/knot2/Makefile ============================================================================== --- head/dns/knot2/Makefile Wed Jan 9 12:30:03 2019 (r489773) +++ head/dns/knot2/Makefile Wed Jan 9 12:33:30 2019 (r489774) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= knot -DISTVERSION= 2.7.4 -PORTREVISION= 2 +DISTVERSION= 2.7.5 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ Modified: head/dns/knot2/distinfo ============================================================================== --- head/dns/knot2/distinfo Wed Jan 9 12:30:03 2019 (r489773) +++ head/dns/knot2/distinfo Wed Jan 9 12:33:30 2019 (r489774) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542114322 -SHA256 (knot-2.7.4.tar.xz) = acebe2fbcd8f67b0cb8969376114855316fe831df08321b795147502a5e9fd74 -SIZE (knot-2.7.4.tar.xz) = 1148652 +TIMESTAMP = 1546941720 +SHA256 (knot-2.7.5.tar.xz) = 7d70d6d8f708285517d1d7c4ff2e5ddfd119cd2962c7a8d3f50a4c695209a086 +SIZE (knot-2.7.5.tar.xz) = 1150904 Modified: head/dns/knot2/files/knot.in ============================================================================== --- head/dns/knot2/files/knot.in Wed Jan 9 12:30:03 2019 (r489773) +++ head/dns/knot2/files/knot.in Wed Jan 9 12:33:30 2019 (r489774) @@ -33,7 +33,8 @@ # # # optional: # NAME_config="%%PREFIX%%/etc/knot/NAME.conf" # (-c)onfig file -# NAME_diruser="%%USERS%%" # /var/db/NAME and /var/run/NAME are created if they +# NAME_config="db:/var/db/knot/confdb" # (-C)onfig database +# NAME_diruser="%%USERS%%" # /var/db/NAME and /var/run/NAME are created if they # NAME_dirgroup="%%GROUPS%%" # don't exist. These don't control the user/group knot # # runs as, the config file has a setting for that. # @@ -72,11 +73,26 @@ diruser="$(eval echo \${${name}_diruser})" dirgroup="$(eval echo \${${name}_dirgroup})" command=%%PREFIX%%/sbin/knotd -command_args="-c ${configfile} -d" -control=%%PREFIX%%/sbin/knotc -pidfile=/var/run/${name}/knot.pid +case "$configfile" in +db:*) + config_args="-C ${configfile#db:}" + ;; +*) + config_args="-c ${configfile}" + ;; +esac +command_args="${config_args} -d" +control="%%PREFIX%%/sbin/knotc" +pidfile="/var/run/${name}/knot.pid" -required_files=${configfile} +case "$configfile" in +db:*) + required_files=${configfile#db:}/data.mdb + ;; +*) + required_files=${configfile} + ;; +esac extra_commands=reload reload_cmd="knot_reload" @@ -90,13 +106,13 @@ knot_prestart() if [ ! -d /var/db/${name} ]; then install -d -o ${diruser} -g ${dirgroup} /var/db/${name} fi - ${control} -c ${configfile} conf-check + ${control} ${config_args} conf-check } knot_reload() { echo "Reloading ${name}." - ${control} -c ${configfile} reload + ${control} ${config_args} reload } run_rc_command "$1"