gentoo resync : 29.12.2022

5 files changed, 4 insertions, 111 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 89bf2e6c40e1..8d807e20f930 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,9 +1,7 @@
-AUX pdns-recursor-4.6.1-parseACL.patch 550 BLAKE2B 9475e2bb256827dcab48bc3d93d56924a848f1a2ad12b57433ed16cc85c1914a91b9604609c3f803fc9c1f4e835566fad0bf320ec43968dd42092c24e8b7c75c SHA512 0650d904c5d11bb495015c952e872209de1c245e0e2d023895d2a87e6095a1cd03b70cd21aeccdf83dfeaec3cde49114a1f26bc470f71ffc5e3d43a3010bdc3b
 AUX pdns-recursor-4.6.2-parseACL.patch 711 BLAKE2B 95e5a602909b0d293b50304d21844e1c14a14b1278d2cd90cecf216e18e4bd683a752dcf7bd5b22bacceb85ec8ff4be25d768c4db65b5a0bffc67891d4e98fc4 SHA512 fbeeebb6901162f03a7af092ee6ef9b7d18e42f3589437bc93cdc637ac48677a48840b457a86b1317d6d9af86a2271cbe22cd46b43dc5c9979bb4f2ade6ef4b7
 AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
-DIST pdns-recursor-4.6.1.tar.bz2 1541000 BLAKE2B fede4f654cd9900780df8dcc39585e95d8b0536c6d14476fde6f33a2d307144f50fb7b51bf6e0c950dcaff74120a101effee0c92cf15c4acedfa94a2682b0c5c SHA512 b595dd382bb4bff5cd47bff854952c8ee40bedeafe4236f935c8eceeca7ac97e8668b884e1ec0ce490ce535fab10d161ffc53ca395c0bb02ffcf6005a692674b
 DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d SHA512 20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc
-EBUILD pdns-recursor-4.6.1-r1.ebuild 2086 BLAKE2B 80f87f1c82906388f40d4e749953383e275607f41524e597e326d422bd8076862da4977abe4a10d088416ed673e99f3655e67bb0e722f27ae13040ba2ab73d5f SHA512 c60d6e5bc4f93d050195951f1bce3ba9d119a037347d173b59a5d632b8c5e3fdda1e95f293c2d1f817bd87e8db6db09abf83a9beae123daebc12873fbaf48c09
-EBUILD pdns-recursor-4.6.1.ebuild 2027 BLAKE2B cd9b9f81e013eae71d479b0383a8d5c2de50c62f4892939afc788cbfec3215089761da9c29a7a97a52d0cd15bf7482cf81423a34b84aefe0de1c90fd0fd63f19 SHA512 880e31f327b1ffe4dcd93314864b35247c4263481ffe9602db43bc16268288cfceccd1bcfd599e69d49bf7f74a1fd9d1e482a3ccf1d3e369691f7bf4725be33c
-EBUILD pdns-recursor-4.6.2.ebuild 2086 BLAKE2B 80f87f1c82906388f40d4e749953383e275607f41524e597e326d422bd8076862da4977abe4a10d088416ed673e99f3655e67bb0e722f27ae13040ba2ab73d5f SHA512 c60d6e5bc4f93d050195951f1bce3ba9d119a037347d173b59a5d632b8c5e3fdda1e95f293c2d1f817bd87e8db6db09abf83a9beae123daebc12873fbaf48c09
+DIST pdns-recursor-4.7.0.tar.bz2 1596954 BLAKE2B d2fb35caef19ee21ff495deb19939659940f245b44f6ff38977f328af9821862b939c48b5052b42ae83ae09647bab53094816b6dbe784737ef4c53ba02add855 SHA512 095272311623684a5a465ae48bd97b86ffe27d4092dea5dceee915ebb071ffb976eeb4055d560d834a3fafab0b15808137e384f28b7cec24719b78ac024e48c2
+EBUILD pdns-recursor-4.6.2.ebuild 2084 BLAKE2B 450ba72505ca8c6d1c9f30c89490e6a6f19d20c25b15fc125827b589397ece3af97a8e5f3f7d37a9fc4e974d5a206108ee47bc8a82831b395d386ef6ece09d88 SHA512 019bdd87dfd978127b558d56e174b00913320d7b61edd87fc9a421025685adfa27bac612d7b925f4b5bf4b3f7a05fc09b40d215720025911a646296a280d63fb
+EBUILD pdns-recursor-4.7.0.ebuild 2038 BLAKE2B 3fe15ab77462c178800157bb3248a19751537d8f22871f68ab7b4aaac6cf418bf44723fc8a02f07c31082f9779769a3108ba5dde8f3b5d54eed489f956a597ec SHA512 1c701eb0f365992294ebc93ea073d1ed6dc5b1336d0ce57657a70ce14a4448aa16ef433c1f71ca076ca516d268847fb40295e1c2c369c20ae1314fb4a0d26f1b
 MISC metadata.xml 930 BLAKE2B 997ed7f557ddae9d8a5b3f92396cb5acb9cde67de5cc750c4c3b051635557ff22fcdd94400a95cc7e5328ccca9786fe3b780c81d57f785865a18e68701916d00 SHA512 3415ed721ad143cae712ee309ba9f3057273b8e594617fe12382bd316cad7dc6e2ed66d660d9c13fa3db993852c85f21d1ea1c0367e595dd5bbf782add225cd1
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
deleted file mode 100644
index 594fc8eca609..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/pdns_recursor.cc w/pdns_recursor.cc
-index 1700a9fde..ed09f2680 100644
---- i/pdns_recursor.cc
-+++ w/pdns_recursor.cc
-@@ -4844,7 +4844,7 @@ void parseACLs()
- 
-   auto allowFrom = parseACL("allow-from-file", "allow-from");
- 
--  if(allowFrom->size() == 0) {
-+  if(allowFrom == nullptr || allowFrom->size() == 0) {
-     if(::arg()["local-address"]!="127.0.0.1" && ::arg().asNum("local-port")==53)
-       g_log<<Logger::Warning<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl;
-     allowFrom = nullptr;
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild
deleted file mode 100644
index 174f5e949b3f..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 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 ~arm x86"
-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:= )
-	elibc_glibc? (
-		arm? ( >=sys-libs/glibc-2.34 )
-		x86? ( >=sys-libs/glibc-2.34 )
-	)
-	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
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-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
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
index fff451a76927..9de99bbdbbdd 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.2.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 ~arm x86"
 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.6.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild
index fff451a76927..fe258d909f08 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild
@@ -37,10 +37,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-	"${FILESDIR}"/${P}-parseACL.patch
-)
-
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize