commit: f07fbf4f25958dbe59deacaca26e0ecfa426d979 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 31 02:02:30 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 31 02:03:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f07fbf4f
net-dns/getdns: fix stubby init script Closes: https://bugs.gentoo.org/716492 Thanks-to: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name> Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/getdns/files/stubby.initd-r2 | 9 ++------- net-dns/getdns/{getdns-1.7.0.ebuild => getdns-1.7.0-r1.ebuild} | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2 index 69e76c0acfd..6af818c2db8 100644 --- a/net-dns/getdns/files/stubby.initd-r2 +++ b/net-dns/getdns/files/stubby.initd-r2 @@ -5,7 +5,7 @@ stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}" command="capsh" command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'" -pidfile="/run/stubby.pid" +pidfile="/run/stubby/stubby.pid" name="DNS Privacy Daemon" depend() @@ -18,11 +18,6 @@ depend() start_pre() { - checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid + checkpath -d -m 0755 -o stubby:stubby /run/stubby checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log } - -stop_post() -{ - [ -f /run/stubby.pid ] && rm /run/stubby.pid -} diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild similarity index 97% rename from net-dns/getdns/getdns-1.7.0.ebuild rename to net-dns/getdns/getdns-1.7.0-r1.ebuild index ebf797b77be..98248f10308 100644 --- a/net-dns/getdns/getdns-1.7.0.ebuild +++ b/net-dns/getdns/getdns-1.7.0-r1.ebuild @@ -58,7 +58,7 @@ PATCHES=( src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_RUNSTATEDIR=/var/run + -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby -DBUILD_DOXYGEN=$(usex doc) -DBUILD_GETDNS_QUERY=$(usex getdns-query) -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
