diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-05 13:15:50 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-05 13:19:53 +0100 |
| commit | da627589defc40c1a2fbe1116e0e16d5631836b3 (patch) | |
| tree | ba65a98689fb6bacde182c668398cc5130b67415 | |
| parent | ac3bd71db50075cabf3c4acf38c562322e0dc77c (diff) | |
main/unbound: remove problematic logic for creating dir for control-interface
And change the default control-interface to /run/unbound.control.sock, so it
doesn't need to prepare the directory.
Fixes #11016
| -rw-r--r-- | main/unbound/APKBUILD | 6 | ||||
| -rw-r--r-- | main/unbound/conf.patch | 2 | ||||
| -rw-r--r-- | main/unbound/unbound.initd | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD index 6fe1d7f0ce8..a4fd477b370 100644 --- a/main/unbound/APKBUILD +++ b/main/unbound/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unbound pkgver=1.9.5 -pkgrel=2 +pkgrel=3 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver" url="http://unbound.net/" arch="all" @@ -109,7 +109,7 @@ migrate() { } sha512sums="0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea unbound-1.9.5.tar.gz -42ed61f8023a52a11fdb1eacb32b0c62f14b7b11d6b5f1f51f2e3627da401ea47212bd308be61821880d791166043184914cd1a43c9069a61140f7a1f0bb10ab conf.patch +10e76b0c0e256cf81d55a6f089644693feb94bd2470730bcbcedb5f340397d2316f3a9ee57adc3d5e84e83cc26109c8cb48f6e2e3bfdbd186e40071b7b4284f1 conf.patch 0a5c7b8f2b8c79c5384bce05962c8f8f5f31ce3aeb967b0e897361a24ea7065eb4e7c28ff3acfb0fb0d46be966d4e526e64b231f49b589ec63f576c25433bb59 migrate-dnscache-to-unbound -66ac5859ea722b7f3e3fd91e525fed2ed67e483eac2c0911c76945f3020a11b339cdcdfff37c8e3fc233a0d7479ee6dfe15dc3fcf36dd0cfe6d80dfe32d07cd2 unbound.initd +8ceabe5efcccfa1d9e210a8166de60ce218ea0261b9edf620524f33216786fad64d6cd8551255942091ee171247222a49a99a1a1ca1999d43fff00ccb17b6276 unbound.initd 40c660f275a78f93677761f52bdf7ef151941e8469dd17767a947dbe575880e0d113c320d15c7ea7e12ef636d8ec9453eeae804619678293fa35e3d4c7e75a71 unbound.confd" diff --git a/main/unbound/conf.patch b/main/unbound/conf.patch index dbf4140d473..d43b3d2dd3e 100644 --- a/main/unbound/conf.patch +++ b/main/unbound/conf.patch @@ -43,7 +43,7 @@ # give 0.0.0.0 and ::0 to listen to all interfaces. # set to an absolute path to use a unix local name pipe, certificates # are not used for that, so key and cert files need not be present. -+ control-interface: /run/unbound/control.sock ++ control-interface: /run/unbound.control.sock # control-interface: 127.0.0.1 # control-interface: ::1 diff --git a/main/unbound/unbound.initd b/main/unbound/unbound.initd index 76eb0f3a137..9fba36cff7d 100644 --- a/main/unbound/unbound.initd +++ b/main/unbound/unbound.initd @@ -32,13 +32,7 @@ checkconfig() { } start_pre() { - checkconfig || return 1 - - local i; for i in $(/usr/sbin/unbound-checkconf -o control-interface "$cfgfile"); do - case "$i" in - */*) test -e "$i" || checkpath -d -m 750 -o unbound:unbound "$(dirname "$i")" || return 1 - esac - done + checkconfig } reload() { |