gentoo resync : 15.01.2020

4 files changed, 119 insertions, 5 deletions

diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 54d4f9f52453..a9a1d0de8eb1 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,9 +1,12 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
+AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
 DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
 DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
+DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
 EBUILD getdns-1.5.1.ebuild 2117 BLAKE2B 1e9a9cd2140fe0609310cea1bb2e751005c2cb25832e3f52b4b1eea006ac14e86d047ade4a81b6643a5eb7371b5fdb686b599f4611a2599860cd05c415f810a0 SHA512 04d57c28f0e172b1f4c920c07f610add18e374ff36e1f970f6cafc35ef1206e900ec3f1d9bc6bb3ac757c2fcc66e1d4b07b1fdd3acfec2d3e0b2d5324f83a80c
 EBUILD getdns-1.5.2-r2.ebuild 2255 BLAKE2B f474c9739b83a2c3d15440882934266efcb845a11a49d60a0caa481489becec7ce3b414ba01248ab3e80b39df97bb15537c7914e441f2912ee19b7038072b8ee SHA512 1a45a6b80d714b7b4637f1ee4d4755ab8c4849f9ee89ed42bdf40f01090d3f5bf67364cc1fc5d5921e9d4f7066ed71398cdbdda4c08753505e19e6c5fd50683c
-MISC metadata.xml 935 BLAKE2B 8a1cec2e5db3f06da68bdd753fd558b7ba94b7366be054a421d585af5e6383d6f5440372fc998f5c55a42dd7efb1f51d171a00155d722e8317ce6e1f77720a36 SHA512 3d1bb8b1a423d976334131c803c7bdb917bcf30c8e4974312bb7d82e3ae3e342839f132e2b7680ef4857c94d14ca2e24293a452c2cc48ae91b052aaa91c0ca16
+EBUILD getdns-1.6.0_beta1-r2.ebuild 2030 BLAKE2B 3497e73868f256d25108f564ec8b427bd5ad6ac501e1a975680ff39b143877d314d103c808fe9f65732b0806a4198cb3c88372cb7e58414584d904a361f6381f SHA512 1ca54e0a776808debab7eb3ae96faac2e7d7b5b4418f6a8c8c096656dfcd28bd7cce3bbc9f5ca4ea29de78e53e404e3adbe4d65e1f3f3b6076b9918fdbbf17bf
+MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
new file mode 100755
index 000000000000..69e76c0acfdf
--- /dev/null
+++ b/net-dns/getdns/files/stubby.initd-r2
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+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"
+name="DNS Privacy Daemon"
+
+depend()
+{
+	provide dns
+	need localmount net
+	after bootmisc
+	use logger
+}
+
+start_pre()
+{
+	checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid
+	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.6.0_beta1-r2.ebuild b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..543db3e2c784
--- /dev/null
+++ b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake fcaps systemd
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libbsd
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	idn? ( net-dns/libidn2:= )
+	gnutls? (
+		net-libs/gnutls:0=[dane,openssl]
+		dev-libs/nettle:0=
+	)
+	libev? ( dev-libs/libev:= )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	>=net-dns/unbound-1.5.9:=
+"
+RDEPEND="
+	${DEPEND}
+	stubby? (
+		acct-group/stubby
+		acct-user/stubby
+		sys-libs/libcap
+	)
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
+		-DBUILD_DOXYGEN=$(usex doc)
+		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
+		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
+		-DBUILD_STUBBY=$(usex stubby)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DUSE_LIBEV=$(usex libev)
+		-DUSE_LIBEVENT2=$(usex libevent)
+		-DUSE_LIBIDN2=$(usex idn)
+		-DUSE_LIBUV=$(usex libuv)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r2 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
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+	fi
+}
diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml
index dbf4417374b7..eef66059a1eb 100644
--- a/net-dns/getdns/metadata.xml
+++ b/net-dns/getdns/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gentoo@retornaz.com</email>
-		<name>Quentin Retornaz</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>