diff options
| author | swills <swills@FreeBSD.org> | 2019-01-09 20:33:30 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2019-01-09 20:33:30 +0800 |
| commit | 9b04a7ea25bad48feee3c4db2afff3778fdf2632 (patch) | |
| tree | 009a9c2a5adb6dc3ada82e8fed5bc36155e96dce /dns | |
| parent | 20a4c621668a8c45ef47c68d663b62ec31db6ed6 (diff) | |
| download | freebsd-ports-gnome-9b04a7ea25bad48feee3c4db2afff3778fdf2632.tar.gz freebsd-ports-gnome-9b04a7ea25bad48feee3c4db2afff3778fdf2632.tar.zst freebsd-ports-gnome-9b04a7ea25bad48feee3c4db2afff3778fdf2632.zip | |
dns/knot2: update to 2.7.5
While here, patch init script to support automatically determining
config type
PR: 234751
Submitted by: Leo Vandewoestijne <freebsd@dns.company> (maintainer)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/knot2/Makefile | 3 | ||||
| -rw-r--r-- | dns/knot2/distinfo | 6 | ||||
| -rw-r--r-- | dns/knot2/files/knot.in | 30 |
3 files changed, 27 insertions, 12 deletions
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile index 40a04c3ea2a0..465c99f933ae 100644 --- a/dns/knot2/Makefile +++ b/dns/knot2/Makefile @@ -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/ diff --git a/dns/knot2/distinfo b/dns/knot2/distinfo index 7ce9ff7ea3cd..1c4d52bfc18b 100644 --- a/dns/knot2/distinfo +++ b/dns/knot2/distinfo @@ -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 diff --git a/dns/knot2/files/knot.in b/dns/knot2/files/knot.in index d502f6a313df..7a177d531e3a 100644 --- a/dns/knot2/files/knot.in +++ b/dns/knot2/files/knot.in @@ -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" |