gentoo resync : 01.08.2021

4 files changed, 8 insertions, 11 deletions

diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index e2c3a85295b0..75e904d0ba30 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,8 +1,8 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
 AUX getdns-1.7.0-docdir.patch 769 BLAKE2B d6eabd639382b1fdaefb344c440dabbdcd5a61e5999a31d8565c994baf80bb9a05efad6cd54dd5dd871c4d6c4b05febb9302a68c8bb36184b5d024c5f6fcfd30 SHA512 7eb0895ca0707f396a326469b3ecf09e43cb52f7d83e2288570f88b13cc884770a2aa634f8f0128ee38c2f4ea43074e80797ae8c07788dcca66706af2cd050b7
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
-AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
-AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
+AUX stubby.initd-r2 625 BLAKE2B 83737407d4ba1d64edabd346868e8401438a9b90b7ddea2d11387ca2dd4d27b68b53039dbf83c60d54c63e9e72171421c40ecaefd5b9b6d8bd4a09eb2a6dcb54 SHA512 0149fd219af720102988663f58f730228f8684267daaf279bcb80fbf70aba3d3d8cd41e745af2b3afbae6270259232dcc5bada0f58c935e6157620c06c53f347
+AUX stubby.logrotate 90 BLAKE2B 8417a72ee319a12a38b94dcbd38617925539ec4971443097be155012ca7eefadb558c9ea01af03e77f1c28441f06fce73f01c2bfbbe9d305ec56b728b5eb886c SHA512 1dc35b1d0572de915304e632d9b4e6f3017deb3c906d93fad532564d70b961c5595194ac8e11d1888710ff3b5cf9512e1a1a5007d10128dde31875bee8c9e0e0
 DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
-EBUILD getdns-1.7.0.ebuild 2204 BLAKE2B 116183bd38d48b081e2ced7f848b7d6041836f3b0252feb6bfb63a4684ff471daac34ef73ac9c313f8b5de658d1e283430678471264234545f2d53bf5f399850 SHA512 f80e4c56c358af1d40b90db57e4f8fe456a92edfa36ec0cddd9248ee2d494008525cf509bc986bcf6ff0586b980bdd222b6231f9b8488ca05a8142b4a0ce49b5
+EBUILD getdns-1.7.0-r1.ebuild 2242 BLAKE2B 7468adf7cf9711c877583a06f1cd9a96a3b3ffc751cc5598b55e5077c5271a78970788e42d3aa740811bba07c661c03e4a28817f63625f54b347445457a51c4f SHA512 9392d61012b16b669b6459403f3cbd09a4aeb998041864e3de9e51a7ef456940be95df467776c6ee294b549171afe8ab6a04cfe87bb3885374915e9c2f02eacb
 MISC metadata.xml 745 BLAKE2B 9cb2fc16135f99e9d57f767fbfa621d1ebe4fe1544b7aa27d38abb874868f641cc47bcf4fb5dae852110bca97ed7f5ceb8afd79faa9577350f986e83c83a4ca3 SHA512 fa3dcfa3e3e8b05f41d428c028171f74fbd7120bb16b10802f176a8a03baaba7cfc079f5d02125ad5602b03d3f6588fc47c4638a75d614a32e70ec8069db4ca4
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/files/stubby.logrotate b/net-dns/getdns/files/stubby.logrotate
index 48058782594c..ca41d872cfd4 100644
--- a/net-dns/getdns/files/stubby.logrotate
+++ b/net-dns/getdns/files/stubby.logrotate
@@ -1,6 +1,7 @@
 /var/log/stubby.log {
 	rotate 4
 	compress
+	copytruncate
 	size 200k
 	noolddir
 	missingok
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild
index 0be2dffb7beb..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)
@@ -90,5 +90,6 @@ src_install() {
 pkg_postinst() {
 	if use stubby; then
 		fcaps cap_net_bind_service=ei /usr/bin/stubby
+		tmpfiles_process stubby.conf
 	fi
 }