gentoo resync : 15.06.2021

5 files changed, 103 insertions, 11 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 57c17ce63165..1ca2b69975c2 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,10 @@
-AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
+AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
 DIST pdns-recursor-4.4.3.tar.bz2 1398743 BLAKE2B d9429ef22bb2b196e42da91332332b38dee9220d490c8adda686b0bc144e0981ea4418973f4304d6d964ef8f6ac4adcde4bd3e6d6b208c620440eab1b11a7fc0 SHA512 bac69cbaabc1b0de0def681e07f7e77954e0d487732cb46dc722f7869576a8a477a4011f78c9cc66b5e9b45455eb81534602b2834dc1ad42b85f5f2801915cbb
+DIST pdns-recursor-4.4.4.tar.bz2 1399645 BLAKE2B 2ef2a59b9c402ab9d9b59d6b89e85b7103dbd9cdcc6147d08f09b85209cb2e298ff539dcb24895a4711f4e7c55c398d0307f237b22d1bdadaf01ec3925af0e8f SHA512 de8ac38d77a4700cd9dd64aad2ba7d1a97057683ace34f1dc3b2e9680faef5637ce7cedb66ceb0b7701f7ff6ef80cbee653549302805b30f9a6defa3a4e8e830
 DIST pdns-recursor-4.5.1.tar.bz2 1463138 BLAKE2B 863cddbe4001b32cf457dc489bd39ad7b045f19183b1d13bc31bfd7fa28cc6e7e69755216715e0fd75fd0d724de20f7b89c89017fc42dff35de4e45e9351af75 SHA512 0cfbc95e3e84a2ab2cd88ee638b0ff26f5f35b64754086483555df28f045d64b5fdfab3e8c430c0b4e97dc4eda624226c37ec0f50902ffe5f84882d814e8051e
-EBUILD pdns-recursor-4.4.2-r100.ebuild 1943 BLAKE2B 399a16bbf1255ddf34affacb8d19fe3175aab3b93fbd00844fc4cab88152a40a52dba708f292c21299b7805e48ed7af9f3f7262596f5fd397ff4d7b4f0d53d9c SHA512 4798d926465bc53fb38dc28b83c3d1e5a444307933575119938a65761f303d141c31d3e89aad53458421dee3e0c764275022a6ecb45241833f038e75fdcc17b8
+DIST pdns-recursor-4.5.2.tar.bz2 1464834 BLAKE2B 88acd7a6edecf8188b366a9fcff0eaf1b71429df8aad4dbcf157be39901b56ee3c9a9d55bf55bb060bcbb59f68b3ff8987788f4186a7122787874f895be1e751 SHA512 02a9f725c7528f91eb45409b32ffa06cb7fca1f0151907efcd8b75100942e98f593858543df15423413d69c9fd433bad3c8bad0a84f8144af07c637f22a86d5e
 EBUILD pdns-recursor-4.4.3.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
-EBUILD pdns-recursor-4.5.1.ebuild 1893 BLAKE2B 1210686544fc58dfdde1d931ccd8e7757684b89a8dd1368c67e2466f508293178c80a92ef0550b9e037cee77dbb33be49053a3ace5a0debc3353812c0ddab96d SHA512 845010f783223095ce06793621906d1996dc6206ff77fd78c88951664a019aa719c601330a570236dbd3556ce03f9353930a8076aca69cfb04980b359bb8ecb5
+EBUILD pdns-recursor-4.4.4.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
+EBUILD pdns-recursor-4.5.1.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
+EBUILD pdns-recursor-4.5.2.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
index 01ce79167bbc..0ca3dfc18782 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor-r2
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -1,12 +1,18 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+get_config_option() {
+	awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}"
+}
+
 PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
 
 PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_CHROOTDIR="$( get_config_option chroot )"
+PDNS_SOCKETDIR="$( get_config_option socket-dir )"
+PDNS_SETUID="$( get_config_option setuid )"
+PDNS_SETGID="$( get_config_option setgid )"
 [ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor"
 
 name="PowerDNS Recursor"
@@ -31,7 +37,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+	checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
 }
 
 ping() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild
index 59d7eaeaa9d4..dc546d8cd6ca 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild
@@ -13,10 +13,11 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug dnstap protobuf snmp sodium systemd"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap protobuf snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	dnstap? ( protobuf )"
+RESTRICT="!test? ( test )"
 
 DEPEND="${LUA_DEPS}
 	protobuf? (
@@ -52,6 +53,7 @@ src_configure() {
 		$(use_enable debug verbose-logging) \
 		$(use_enable systemd) \
 		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
 		$(use_with sodium libsodium) \
 		$(use_with protobuf) \
 		$(use_with snmp net-snmp)
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild
index dc9c75ab0e85..391869be2aec 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.2.ebuild
new file mode 100644
index 000000000000..391869be2aec
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}