gentoo resync : 18.05.2019

8 files changed, 95 insertions, 9 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d3e8f5ca62c5..4c0baa0c2f19 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index eddd91efe8e5..64c6489e05ce 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,6 +1,6 @@
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
-AUX dnsdist.initd 1321 BLAKE2B 44fd27bb150dc2ff77acb7f91cf4c73398a483ef22d5920abfc0e3e061c78274d07223837fa5b1a45699a23be6b92ad0d09d21acf2d86ec1b4d6476a028d08e6 SHA512 5c535df831a7d513f65ada4b433366e00088ce82b5b17880ebb19a6c048b40b808f10ceb7baa6c4976da69420f81643c09c1b980a3bfaf7fd3ad344f95689a20
+AUX dnsdist.initd 1334 BLAKE2B db80ebec89cfc9050d0e43402d8cc9af56bd764ba52a6db948747585d23896d3e6daed4eaa5fabc2b500dc96c1f86e9e8624b8da755b87fdd3c730104c9082fd SHA512 0d17c476ba3d775bc6e2bda0133516bf5cf48183fdeaaf913337c393080eaff4770267842e81d7b6e66a7ae087ce3d73ba4daea3cbf9982719e0f205b0d096ba
 DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
 EBUILD dnsdist-1.3.3-r1.ebuild 2619 BLAKE2B ea4d0160d868605d48f5ff7b89974ed01dd4fe3308a8fde5c6f0998b274ef9f967b8216910ab67220547ee471758b127b8f4bd6257133c660ad53318a9edc45d SHA512 3d6ad071ee27455d0dbdd1db5459cbcb092e4949b0b88c2ab13d89a0aaf25dedeb09b4f924856b61dbbf09b0dc4b6473680ef38a5f946bcfb6911eb70357ca2b
 EBUILD dnsdist-9999.ebuild 2619 BLAKE2B ea4d0160d868605d48f5ff7b89974ed01dd4fe3308a8fde5c6f0998b274ef9f967b8216910ab67220547ee471758b127b8f4bd6257133c660ad53318a9edc45d SHA512 3d6ad071ee27455d0dbdd1db5459cbcb092e4949b0b88c2ab13d89a0aaf25dedeb09b4f924856b61dbbf09b0dc4b6473680ef38a5f946bcfb6911eb70357ca2b
diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index 17c86ca431d4..f15a6d9e6a48 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -31,7 +31,7 @@ start() {
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-b -- -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
+		-b -- --supervised -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
 		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
 	eend $?
 }
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index a23ac6fd14ae..2472c432152e 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -3,5 +3,7 @@ AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
 DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
-EBUILD getdns-1.5.1.ebuild 2084 BLAKE2B 82001d1fe871e1f7aacdb101d005ca8a28bd07601e820cbad7521fe996387bdc633d18e1fac497539768446e9f71aa1f598d80d0d5ab5983457544a27c8d7c18 SHA512 fc393adb50f840ff5783d0a8cf8fed564d1361955edb4bd9e4c65064253a1cffef53637744cbaae69e8be87254b1b2c74120921219c364299678c8ac83b84a81
+DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
+EBUILD getdns-1.5.1.ebuild 2086 BLAKE2B 0ed0e7e26b1281ef4eebc09a786e4cb0d5124f5db19135746813cc1e88168c8d033f6fbc989bf7b285312b1e9c9f213d5731d79cbe66be8b3b3b43fa66a58ff6 SHA512 ea45872a78ee6bfaaa42d44e4f2aec8bab1a615f0e847fab94414fa3d321bd6160ef4aed915c4672fcd6ae548ad8a9b23fef3086161d0f5f61443a7a23ec7dc1
+EBUILD getdns-1.5.2.ebuild 2086 BLAKE2B 0ed0e7e26b1281ef4eebc09a786e4cb0d5124f5db19135746813cc1e88168c8d033f6fbc989bf7b285312b1e9c9f213d5731d79cbe66be8b3b3b43fa66a58ff6 SHA512 ea45872a78ee6bfaaa42d44e4f2aec8bab1a615f0e847fab94414fa3d321bd6160ef4aed915c4672fcd6ae548ad8a9b23fef3086161d0f5f61443a7a23ec7dc1
 MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1
diff --git a/net-dns/getdns/getdns-1.5.1.ebuild b/net-dns/getdns/getdns-1.5.1.ebuild
index 619bd5568797..05ba4798a0f4 100644
--- a/net-dns/getdns/getdns-1.5.1.ebuild
+++ b/net-dns/getdns/getdns-1.5.1.ebuild
@@ -75,7 +75,7 @@ pkg_postinst() {
 		fcaps cap_net_bind_service=ei /usr/bin/stubby
 	fi
 
-	if has_version <dev-libs/libressl-2.7.0; then
+	if has_version '<dev-libs/libressl-2.7.0'; then
 		ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
 		if use stubby; then
 			ewarn "You will NOT be able to use strict profile in Stubby."
diff --git a/net-dns/getdns/getdns-1.5.2.ebuild b/net-dns/getdns/getdns-1.5.2.ebuild
new file mode 100644
index 000000000000..05ba4798a0f4
--- /dev/null
+++ b/net-dns/getdns/getdns-1.5.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps systemd user
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +getdns_query +getdns_server_mon +idn libev libevent libressl libuv static-libs stubby +threads +unbound"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libbsd:=
+	dev-libs/libyaml:=
+	idn? ( net-dns/libidn2:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	libev? ( dev-libs/libev:= )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	unbound? ( >=net-dns/unbound-1.4.16:= )
+"
+RDEPEND="
+	${DEPEND}
+	stubby? ( sys-libs/libcap:= )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
+src_configure() {
+	econf \
+		--runstatedir=/var/run \
+		$(use_enable static-libs static) \
+		$(use_with getdns_query) \
+		$(use_with getdns_server_mon) \
+		$(use_with idn libidn2) \
+		$(use_with libev) \
+		$(use_with libevent) \
+		$(use_with libuv) \
+		$(use_with stubby) \
+		$(use_with threads libpthread) \
+		$(use_with unbound libunbound) \
+		--without-libidn \
+		--with-piddir=/var/run/stubby
+}
+
+src_install() {
+	default
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
+	fi
+}
+
+pkg_postinst() {
+	if use stubby; then
+		enewgroup stubby
+		enewuser stubby -1 -1 -1 stubby
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+	fi
+
+	if has_version '<dev-libs/libressl-2.7.0'; then
+		ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
+		if use stubby; then
+			ewarn "You will NOT be able to use strict profile in Stubby."
+		fi
+	fi
+}
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 675e025fb05d..3c820a25e271 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,5 +1,5 @@
 AUX pdnsd.conf.test 370 BLAKE2B f48396e0f78954a6c0c21df19776b1bb8f221b5325612413b76f61110779d5f109eeffc952d66492dda308eba6f9d4bcc03b1c5a0f2748a22052a6028a7a57b4 SHA512 1882df76c4f3280041b9045b8ae06b929c8c418206270c25b09e604e591a5fb287328af340ec9164fb36c5af8bd2c9216a6a0fdf6eefad3986cc3221880d8138
-AUX pdnsd.online.2 568 BLAKE2B b314a2895dff071497af2c8976719b0b1826af7cb0ff84d611f84c92e630c79ad4b15fb4461d18bc24d6ea954818774bcabfd8c105986c3a9febaf49106273a4 SHA512 d1844e7e21a0f2fb44779604883f21117b8aefa900e842ed079ada0769288416bf288f424a6980f0744b92b0e502af3e578bfcdadc59187f4c4693e306241efb
+AUX pdnsd.online.2 568 BLAKE2B 05c51f8769c6d32ada77f8a0f1784680ff6a3156d46e478442d90b5b240a568ef0ff65a52cfe261fb4de6fd76f5c41bb54e535dd690de3026861b0c7e2a28d84 SHA512 15d0be2ec2c6e9c9b598bc63a30d72e77ea7b80a14547f0a1c7af1680afabc4fe56eb4ff8ad8470642ed1b441acff11d6b4f01f14e9486d1502f9b841beab99d
 AUX pdnsd.rc8 573 BLAKE2B 9ba317e4c8df4c351452cb2de554c38b341e3ddf621d40c1486baec2312cc300091590a0afe6bd0e279f7371d003a3e95a6fd413eca7601245a22c3c3d705856 SHA512 be012cc164301bada209dfa26087eac85735fae2dd82d76e3f1154ba21df122be2be05bc029e9219c69514de4835495aed51dcbb99e19daf3fec75110b5d941c
 AUX pdnsd.resolvconf-r1 17538 BLAKE2B 0797bf3800e5ca1bf3d4c55cbd0862bb8a6964b5b1c4554fa9e500368909a8fb2d309a561d5b097ac828f1e1dd5601df3a7a112ae9dd4132fdae2731a3cd3096 SHA512 22a92df825d560ec03860c1a9a6000f32e19b33ccda0f6412830ebca13499e6d45161267bb30658aa9ed4b5862bae04e304e25358c30ee6d80a9deea90ba989f
 AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2
diff --git a/net-dns/pdnsd/files/pdnsd.online.2 b/net-dns/pdnsd/files/pdnsd.online.2
index 089f4e76e9cc..be33bfaa03e1 100644
--- a/net-dns/pdnsd/files/pdnsd.online.2
+++ b/net-dns/pdnsd/files/pdnsd.online.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/sbin/pdnsd-ctl"
@@ -10,10 +10,10 @@ depend() {
 
 wait_for_socket() {
 	local i=0 pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
-	while [ $i -lt 10 ]; do
+	while [ ${i} -lt 10 ]; do
 		[ -S "${pdnsd_socket}" ] && return 0
-		i=$(($i+1))
-		sleep 1s
+		i=$((${i}+1))
+		sleep 1
 	done
 
     	return 1