gentoo resync : 06.04.2022

7 files changed, 78 insertions, 23 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index cb3dcca2a363..89bf2e6c40e1 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,9 @@
+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.4.7.tar.bz2 1404116 BLAKE2B 42808634fe20735ba0a933a20b7c4dfae0c32b25976e713be46dddfcdf03599b2b29ca8407781ac304fcb004f8a8a29856dc70aeb468f4e773ee5e5a9d1e7631 SHA512 eb4008ec65e42e10d9fc4d0e0fc6c4d4716224f04f530649d88adbc505ea2a8b570bfd738455f9c769e6c242e7996905c7cc457e9f685b06e5d0f73fdffd30a7
-DIST pdns-recursor-4.5.7.tar.bz2 1475537 BLAKE2B e58a28ed1ca2a9ae69436f9367e83f046ed5bc47bfd13783bd7c956f917c4a6d9c93a9a8e1c4df55ad42bc6ba024faca936fefdaffb2125e4f6635c5e6a20b19 SHA512 dc4a2a129039f79440420c285c37fd11536f2c0b74a39da74560eb782f1ad881839831e97f2a803b1812f128e899ad7c460fada42a831994b21f301f8892e60a
-DIST pdns-recursor-4.6.0.tar.bz2 1549434 BLAKE2B 3834c3cf58d99ba03b9e2c325a35e7bdc29a6da3fc77998b44a875033a1ce9a538762f21270754c0207be175a2b9f06d06677822a7dffd7f57fe510425772f96 SHA512 ca7e7a4aed904a68f4dcb25e62393d44cbe5a1b64b76882b086e3dcfc08face8d399d2652aeb3c03d8a68b2c9531e78223b815256d7d9e82777621aba8ad068b
-EBUILD pdns-recursor-4.4.7.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
-EBUILD pdns-recursor-4.5.7.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
-EBUILD pdns-recursor-4.6.0-r1.ebuild 1944 BLAKE2B 5ab6b6c6d3e65d6b2b269fbb236c36290269c1cc8229950702000855c89c8f4bfcd21e8c7be72f52b2c8911d6e08db4d3783acdbf05212d70124aac347d1983c SHA512 4049bf95a163552acd3f466d57ea75dfbfd14b7e564690268a50a6354577130ca78dae6a8e47f5f9d946e27d855bf5fa042b7e015899c9a86ca127ed02176c28
-MISC metadata.xml 1009 BLAKE2B a35c31c4e5478addf07b90464caf1068c7780801f2da35023fb8226e2d64b055378b8020e4dedc9b7795cf8df94500cfd116ebb3196ee27f1ebe83befb453e89 SHA512 2b0ea758d5ab725c1142c9e5abf66fcb7c7fb7916f76a0871e975624de415ba48fbd2a45bcff4afc4cf19bb40f978f1093b4db356e83d8312fda860565d28497
+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
+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
new file mode 100644
index 000000000000..594fc8eca609
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
@@ -0,0 +1,13 @@
+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/files/pdns-recursor-4.6.2-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
new file mode 100644
index 000000000000..ee58e055f09a
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
@@ -0,0 +1,24 @@
+--- a/pdns_recursor.cc
++++ b/pdns_recursor.cc
+@@ -4775,8 +4775,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
+       result->addMask(line);
+     }
+     g_log<<Logger::Info<<"Done parsing "<<result->size()<<" "<<aclSetting<<" ranges from file '"<<::arg()[aclFile]<<"' - overriding '"<<aclSetting<<"' setting"<<endl;
+-
+-    return result;
+   }
+   else if(!::arg()[aclSetting].empty()) {
+     vector<string> ips;
+@@ -4790,11 +4788,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
+       g_log<<Logger::Info<<*i;
+     }
+     g_log<<Logger::Info<<endl;
+-
+-    return result;
+   }
+ 
+-  return nullptr;
++  return result;
+ }
+ 
+ void parseACLs()
diff --git a/net-dns/pdns-recursor/metadata.xml b/net-dns/pdns-recursor/metadata.xml
index 593db831ec21..f36a13ab15c8 100644
--- a/net-dns/pdns-recursor/metadata.xml
+++ b/net-dns/pdns-recursor/metadata.xml
@@ -16,7 +16,6 @@ nameserver performance.
 </longdescription>
 <use>
 	<flag name="dnstap">Enable support for dnstap</flag>
-	<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag>
 	<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
index cf3bf318576d..fff451a76927 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -23,8 +23,12 @@ DEPEND="${LUA_DEPS}
 	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:="
+	>=dev-libs/boost-1.35:=[context]"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
 	acct-user/pdns
@@ -33,9 +37,15 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parseACL.patch
+)
+
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
 }
 
 src_configure() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.0-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild
index 076ff5c64a8c..174f5e949b3f 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.6.0-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.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 ~arm x86"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -23,6 +23,10 @@ DEPEND="${LUA_DEPS}
 	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}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
index 6233a790ac76..fff451a76927 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,23 +13,22 @@ 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 test"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	dnstap? ( protobuf )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 DEPEND="${LUA_DEPS}
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
 	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:="
+	>=dev-libs/boost-1.35:=[context]"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
 	acct-user/pdns
@@ -38,9 +37,15 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parseACL.patch
+)
+
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
 }
 
 src_configure() {
@@ -55,7 +60,6 @@ src_configure() {
 		$(use_enable dnstap dnstap) \
 		$(use_enable test unit-tests) \
 		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
 		$(use_with snmp net-snmp)
 }