| 1 |
commit: f07fbf4f25958dbe59deacaca26e0ecfa426d979 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 31 02:02:30 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 31 02:03:01 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f07fbf4f |
| 7 |
|
| 8 |
net-dns/getdns: fix stubby init script |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/716492 |
| 11 |
Thanks-to: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-dns/getdns/files/stubby.initd-r2 | 9 ++------- |
| 15 |
net-dns/getdns/{getdns-1.7.0.ebuild => getdns-1.7.0-r1.ebuild} | 2 +- |
| 16 |
2 files changed, 3 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2 |
| 19 |
index 69e76c0acfd..6af818c2db8 100644 |
| 20 |
--- a/net-dns/getdns/files/stubby.initd-r2 |
| 21 |
+++ b/net-dns/getdns/files/stubby.initd-r2 |
| 22 |
@@ -5,7 +5,7 @@ |
| 23 |
stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}" |
| 24 |
command="capsh" |
| 25 |
command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'" |
| 26 |
-pidfile="/run/stubby.pid" |
| 27 |
+pidfile="/run/stubby/stubby.pid" |
| 28 |
name="DNS Privacy Daemon" |
| 29 |
|
| 30 |
depend() |
| 31 |
@@ -18,11 +18,6 @@ depend() |
| 32 |
|
| 33 |
start_pre() |
| 34 |
{ |
| 35 |
- checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid |
| 36 |
+ checkpath -d -m 0755 -o stubby:stubby /run/stubby |
| 37 |
checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log |
| 38 |
} |
| 39 |
- |
| 40 |
-stop_post() |
| 41 |
-{ |
| 42 |
- [ -f /run/stubby.pid ] && rm /run/stubby.pid |
| 43 |
-} |
| 44 |
|
| 45 |
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild |
| 46 |
similarity index 97% |
| 47 |
rename from net-dns/getdns/getdns-1.7.0.ebuild |
| 48 |
rename to net-dns/getdns/getdns-1.7.0-r1.ebuild |
| 49 |
index ebf797b77be..98248f10308 100644 |
| 50 |
--- a/net-dns/getdns/getdns-1.7.0.ebuild |
| 51 |
+++ b/net-dns/getdns/getdns-1.7.0-r1.ebuild |
| 52 |
@@ -58,7 +58,7 @@ PATCHES=( |
| 53 |
|
| 54 |
src_configure() { |
| 55 |
local mycmakeargs=( |
| 56 |
- -DCMAKE_INSTALL_RUNSTATEDIR=/var/run |
| 57 |
+ -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby |
| 58 |
-DBUILD_DOXYGEN=$(usex doc) |
| 59 |
-DBUILD_GETDNS_QUERY=$(usex getdns-query) |
| 60 |
-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon) |
Archives