diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-05 13:21:45 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-05 13:21:53 +0100 |
| commit | 90c90abb73119d17db970f3694bfe81a19e66cf9 (patch) | |
| tree | 6721313f2d4277349633124f5b46dda506739970 | |
| parent | da627589defc40c1a2fbe1116e0e16d5631836b3 (diff) | |
| download | aports-90c90abb73119d17db970f3694bfe81a19e66cf9.tar.bz2 aports-90c90abb73119d17db970f3694bfe81a19e66cf9.tar.xz | |
main/nsd: remove problematic logic for creating dir for control-interface
And change the default control-interface to /run/nsd.control.sock, so it
doesn't need to prepare the directory.
See #11016
| -rw-r--r-- | main/nsd/APKBUILD | 6 | ||||
| -rw-r--r-- | main/nsd/config.patch | 2 | ||||
| -rw-r--r-- | main/nsd/nsd.initd | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD index e483820dbf..4d45944413 100644 --- a/main/nsd/APKBUILD +++ b/main/nsd/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nsd pkgver=4.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="Authoritative only, high performance and simple DNS server" url="https://www.nlnetlabs.nl/projects/nsd" arch="all" @@ -49,5 +49,5 @@ package() { } sha512sums="08349375caf96d870a7ba6e8de6342794f4bba356ef75d46f3c3f50462d356317f3e82a252febda21e2fbfe36bf7ad0c53f40079779faf204a4aaebd41fdc965 nsd-4.2.3.tar.gz -ac902fda67477e469776a773c10035bc77e544df6388886de56ffe1f1ded1b00cfc375c936948b996800d67689a096eb1050182bfb1b0ed8975ac501e6005ee9 nsd.initd -524adb9f35602555492b041e68154452d11f4411ddd796244ff4c24c7922c1b8dc56e5cb2bc2681baa26448e8e0349f9a72858495f7bfbd6d9871c58cca0fe18 config.patch" +bc2b27d98b99db067c7c4b152ee40ae81b8ee66989f873ca0c21f57333c3734bb342866f68d5837f10bb56cb598fafc794095c02b8bc97ef6dace450cae526a6 nsd.initd +4c107bba33785a031f29c2d078419c8f0858c94a2488e192a6e76085e7135755352446d350ad4561b02beb767fecd488ac710fc1d2ba9e19a9c42f484331bd3c config.patch" diff --git a/main/nsd/config.patch b/main/nsd/config.patch index 52749a50b0..244f95b755 100644 --- a/main/nsd/config.patch +++ b/main/nsd/config.patch @@ -22,7 +22,7 @@ # what interfaces are listened to for control, default is on localhost. # with an absolute path, a unix local named pipe is used for control # (and key and cert files are not needed, use directory permissions). -+ control-interface: /run/nsd/control.sock ++ control-interface: /run/nsd.control.sock # control-interface: 127.0.0.1 # control-interface: ::1 diff --git a/main/nsd/nsd.initd b/main/nsd/nsd.initd index 628c8c3d24..d1ac1c7c8f 100644 --- a/main/nsd/nsd.initd +++ b/main/nsd/nsd.initd @@ -26,13 +26,7 @@ depend() { } start_pre() { - checkconfig || return 1 - - local i; for i in $(/usr/sbin/nsd-checkconf -o control-interface "$cfgfile"); do - case "$i" in - */*) test -e "$i" || checkpath -d -m 750 -o nsd:nsd "$(dirname "$i")" || return 1 - esac - done + checkconfig } checkconfig() { |