From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 078A2139000 for ; Sat, 31 Jul 2021 02:04:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B819E08AD; Sat, 31 Jul 2021 02:04:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 123D5E08A0 for ; Sat, 31 Jul 2021 02:04:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 113AC3438D8 for ; Sat, 31 Jul 2021 02:04:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42C367AF for ; Sat, 31 Jul 2021 02:04:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1627696981.f07fbf4f25958dbe59deacaca26e0ecfa426d979.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/getdns/files/stubby.initd-r2 net-dns/getdns/getdns-1.7.0-r1.ebuild net-dns/getdns/getdns-1.7.0.ebuild X-VCS-Directories: net-dns/getdns/ net-dns/getdns/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f07fbf4f25958dbe59deacaca26e0ecfa426d979 X-VCS-Branch: master Date: Sat, 31 Jul 2021 02:04:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d09a168-7216-4b03-b71b-26cbc15d1b43 X-Archives-Hash: 6ea16e06bef8e4ed4c67451c17222e5f commit: f07fbf4f25958dbe59deacaca26e0ecfa426d979 Author: Sam James gentoo org> AuthorDate: Sat Jul 31 02:02:30 2021 +0000 Commit: Sam James gentoo 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 maciej.szmigiero.name> Signed-off-by: Sam James 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)