summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-07-31 03:02:30 +0100
committerSam James <sam@gentoo.org>2021-07-31 03:03:01 +0100
commitf07fbf4f25958dbe59deacaca26e0ecfa426d979 (patch)
treee8a4f105ab69ab6ffdb5e5e7fd7785086f4d5da3 /net-dns
parentgames-arcade/supertux: fix Boost dependency to include NLS (diff)
downloadgentoo-f07fbf4f25958dbe59deacaca26e0ecfa426d979.tar.gz
gentoo-f07fbf4f25958dbe59deacaca26e0ecfa426d979.tar.bz2
gentoo-f07fbf4f25958dbe59deacaca26e0ecfa426d979.zip
net-dns/getdns: fix stubby init script
Closes: https://bugs.gentoo.org/716492 Thanks-to: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/getdns/files/stubby.initd-r29
-rw-r--r--net-dns/getdns/getdns-1.7.0-r1.ebuild (renamed from net-dns/getdns/getdns-1.7.0.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 69e76c0acfdf..6af818c2db8a 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
index ebf797b77bec..98248f10308a 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)