gentoo resync : 30.05.2020

3 files changed, 174 insertions, 0 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 3a4c3d54a643..43622ccee803 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,3 +1,4 @@
+AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
 DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
@@ -5,9 +6,11 @@ DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 11eecf1ca69e6855be1cb1a1a6bfef
 DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
 DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba SHA512 ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff
 DIST pdns-recursor-4.3.0.tar.bz2 1349359 BLAKE2B cdb9d38a350ef371c3675185c0f52f416d55338df034ff32a9d9fc85d783de04513555ec96fbc1dd07ecd7214d889cfe6fba80bc6981e66a6b8d4fe6f1da7dfa SHA512 6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085
+DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8
 EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7
 EBUILD pdns-recursor-4.1.15.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
 EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
 EBUILD pdns-recursor-4.2.1.ebuild 1783 BLAKE2B 85b1dfe2efe41551397d6a1ad8d41ee779f841ca965359a0904902e7d78637fd4308a095034ccbc6d3bf72da6ee4b1efbb04ba082b8527255b599a5edb4a5a15 SHA512 06e83d7bd1d7e048abda6d5d4f9d0f8a3fc0eb86a1e4e14ef5f6c935fceae4542579897fe10c31391d01fae793d1e401e5cc49df484ef89b5a0834437f1d5587
 EBUILD pdns-recursor-4.3.0-r1.ebuild 1788 BLAKE2B fcb244abbc5c831806206768cfc72c5e4455ba2b43ab98156a2fbcedad2651ec821e62e73a0898e5a8963f8370cdeaca025c9584bc5d02d5d637f9ad06ca18ba SHA512 c3e4c7b3042146f8643e520c3abbd92d3d870acb588c12fdd09054f38f163b0df06130e85ff8ae1a254f5c3dadadd8e323294c78928b615623c8c2537f83c41b
+EBUILD pdns-recursor-4.3.1.ebuild 1838 BLAKE2B 389c8d068c0f4113c5b9744d36dd6d391a837b778c5b3e2d407da76ae8bf74712668e10832967f55e7e62816a85a70e031d96d6fd4a028535744056eb7741e1b SHA512 5be2829788177687609fccfd370b5108d85bc2504022bd88e695b362833a9b75870106fa71a8764dd2cee92ee9780f22c466d55ff558503580da6d4efbfd21a0
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
new file mode 100644
index 000000000000..02b8df751ef9
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
@@ -0,0 +1,89 @@
+From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
+From: Remi Gacogne <remi.gacogne@powerdns.com>
+Date: Tue, 28 Apr 2020 17:51:47 +0200
+Subject: [PATCH] Replace boost's placeholders with the ones from the std
+ namespace
+
+Boost 1.73 moved boost::bind placeholders to the placeholders
+namespace which did not exist before 1.60, let's switch to
+std::bind and std::placeholders instead of doing per-version handling.
+---
+ pdns/ixfrdist-web.cc |  2 +-
+ pdns/webserver.cc    |  6 +++---
+ pdns/ws-auth.cc      |  4 ++--
+ pdns/ws-recursor.cc  | 12 ++++++------
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/webserver.cc b/webserver.cc
+index eafd3059a0..b47cc6d7e0 100644
+--- a/webserver.cc
++++ b/webserver.cc
+@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque
+ 
+ void WebServer::registerBareHandler(const string& url, HandlerFunction handler)
+ {
+-  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2);
++  YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2);
+   YaHTTP::Router::Any(url, f);
+ }
+ 
+@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) {
+-  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword);
++  HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword);
+   registerBareHandler(url, f);
+ }
+ 
+@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
+-  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2);
++  HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2);
+   registerBareHandler(url, f);
+ }
+ 
+diff --git a/ws-recursor.cc b/ws-recursor.cc
+index cd8997309f..a074460c2f 100644
+--- a/ws-recursor.cc
++++ b/ws-recursor.cc
+@@ -382,9 +382,9 @@ static void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) {
+   DNSName canon = apiNameToDNSName(req->getvars["domain"]);
+   bool subtree = (req->getvars.count("subtree") > 0 && req->getvars["subtree"].compare("true") == 0);
+ 
+-  int count = broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeCache, canon, subtree));
+-  count += broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, canon, subtree));
+-  count += broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeAndCountNegCache, canon, subtree));
++  int count = broadcastAccFunction<uint64_t>(std::bind(pleaseWipeCache, canon, subtree));
++  count += broadcastAccFunction<uint64_t>(std::bind(pleaseWipePacketCache, canon, subtree));
++  count += broadcastAccFunction<uint64_t>(std::bind(pleaseWipeAndCountNegCache, canon, subtree));
+   resp->setBody(Json::object {
+     { "count", count },
+     { "result", "Flushed cache." }
+@@ -512,7 +512,7 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
+   d_ws->bind();
+ 
+   // legacy dispatch
+-  d_ws->registerApiHandler("/jsonstat", boost::bind(&RecursorWebServer::jsonstat, this, _1, _2), true);
++  d_ws->registerApiHandler("/jsonstat", std::bind(&RecursorWebServer::jsonstat, this, std::placeholders::_1, std::placeholders::_2), true);
+   d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
+   d_ws->registerApiHandler("/api/v1/servers/localhost/config/allow-from", &apiServerConfigAllowFrom);
+   d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);
+@@ -664,7 +664,7 @@ void AsyncServerNewConnectionMT(void *p) {
+ void AsyncServer::asyncWaitForConnections(FDMultiplexer* fdm, const newconnectioncb_t& callback)
+ {
+   d_asyncNewConnectionCallback = callback;
+-  fdm->addReadFD(d_server_socket.getHandle(), boost::bind(&AsyncServer::newConnection, this));
++  fdm->addReadFD(d_server_socket.getHandle(), std::bind(&AsyncServer::newConnection, this));
+ }
+ 
+ void AsyncServer::newConnection()
+@@ -743,5 +743,5 @@ void AsyncWebServer::go() {
+   auto server = std::dynamic_pointer_cast<AsyncServer>(d_server);
+   if (!server)
+     return;
+-  server->asyncWaitForConnections(d_fdm, boost::bind(&AsyncWebServer::serveConnection, this, _1));
++  server->asyncWaitForConnections(d_fdm, std::bind(&AsyncWebServer::serveConnection, this, std::placeholders::_1));
+ }
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
new file mode 100644
index 000000000000..30eca37b6ed7
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+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 libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( 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/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.73.0.patch
+)
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(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
+}