gentoo resync : 25.11.2020

6 files changed, 142 insertions, 99 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 0d26e299c43c..0bfa888c21cf 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,7 +1,9 @@
-AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
+AUX pdns-recursor-4.3.5-boost-1.73.0.patch 2071 BLAKE2B fdf1477fe0af5d943223c589aba3b4469b52b353542fb167ceb352248ff88871b2e329b087c4d7c3abebcdf9b8a0084fe5516a086927454166c4ac4beca2d296 SHA512 22871d24190699d7b3e79b04d235af2b44b4bca24d3a26630966650aee2b6c399fe3c6a73d0125fe3430248aea13f5b8057b127251686307c7f0c735a8034d41
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5 SHA512 285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5
-DIST pdns-recursor-4.3.4.tar.bz2 1359380 BLAKE2B b55829b843f3abc9394bcb943c223b24684ebe67854fbde8590aded09a8ef18d8b15d1e2ebe1b88d24833b8782266b1ce853d98c0ce510e115e8d16ce900ece2 SHA512 cfc34f42ed95c7fd2be1ab7ba172672e5e1db96b4ced171c1eae7bd60fb7db482aed928028811b133d326550de35c506a8fc480b12ae39ab7fa142408e0b42d8
-EBUILD pdns-recursor-4.3.3.ebuild 1948 BLAKE2B 55673baa5e17e3ea95e049bd6901a86b657e55ef8e7980acb52a902642da29b33d4d4b7c87e40d454d7e66692757820faf59cd87ce0d86adb07c5a9082f261de SHA512 3f5e5e8d8fdce3eaba2410a2d953ca6ba84ee8008a3c7ca106843691705b31fc51eb84c0591420bc8b31e911463a9a301f01bd21b507ecf062daf9a9b52ac36b
-EBUILD pdns-recursor-4.3.4.ebuild 1950 BLAKE2B 3d4ca29820d37d1bd97f1d247a2384a4cbc59747eccec10d8851fc12dba7401fb4a0b2b5cb0995205d9c69e9cde11e28ac927923f82e9341c4f920c88827cf2c SHA512 b2c36166659af410264681fc2c0c55e258bf6c03bff1a95f7917f8da709f20a7606a89de2a886eb240f7be7b190036e76505c5a094ff50367e140961736e0d31
+DIST pdns-recursor-4.3.5.tar.bz2 1341930 BLAKE2B 8f81182cb5283e6b8f459c5d23281d20cba02d22cec8776fdab67d452834b82945f467186c98784519d2c79d9df8438b174fc644fb11d68d04f9f636e51a5551 SHA512 2d39e6016000951c0beca38b26c41664b57c059dee762d7499f34e599ed6c2653af73edb31ba5a8d35f749534f24c0d85b6aedf4c35dc8a05777ffebd1b25851
+DIST pdns-recursor-4.4.0.tar.bz2 1395544 BLAKE2B 3e963a0e481db0d96813d5aa43e231548d765ecf7c18ce777ab3e1fb4b057722b257ec59ae95bf5cb11cb2f9114eb0e087aebecd4b19b96519e9a1e9cf6bb307 SHA512 06ec7788510b656ee8e08e54d989d8789685a3acb8b11172aff5de21bff493227368bbfca8203c56853da97d209facc4d88005b4b565a5986788a1b5f16a9fb6
+DIST pdns-recursor-4.4.1.tar.bz2 1395506 BLAKE2B 20a7b9612d03b96b92bab91b0281b08750221da06c56936c81fb4e1dccf83ca00f73bb7446523cd2a693b2774ee46ab673428cfdb4fc3f1702ef1e690a1112de SHA512 e5bdcf7f9b0095bd7169d605536e45beaa675cb9ac6e58280bf725535f1d3274dd4872418461ca5e216b310472ec08b8153c6da46d6ecf9ce545feb6ab3cd235
+EBUILD pdns-recursor-4.3.5.ebuild 1941 BLAKE2B 29f7cae51b6726ac94e401c5f5b69ffc00e9bc9117f437972229f5f565f82f67db0c0a5898ff01605ba6151e7d62f67b337f374bf2bf949fe18a3f637ec7572a SHA512 c05357a560c132f75b992e522e3375dc9188c84ee984f754633ba7de57fb4ed96b461e101aab46498c73ecc4b9b7163be99f5a1e26aea323a9332972625f4a3e
+EBUILD pdns-recursor-4.4.0.ebuild 1993 BLAKE2B fb5f48241f025472bf31ed9f8a88f932fd6ad99cbc5c319fbbe06a16d948b4bcf7c3789d91250d34f7d985e800636f577a6b62af1f5fad83c19ad87667843c35 SHA512 09aaa3837515a802fc52e94cd25439f594bb27267479e185a99f6ecb5033c146f6856f45aa8d7ad867cdb6a9893c3fc211595c737ee4c54edddd771bc42a0a6c
+EBUILD pdns-recursor-4.4.1.ebuild 1993 BLAKE2B fb5f48241f025472bf31ed9f8a88f932fd6ad99cbc5c319fbbe06a16d948b4bcf7c3789d91250d34f7d985e800636f577a6b62af1f5fad83c19ad87667843c35 SHA512 09aaa3837515a802fc52e94cd25439f594bb27267479e185a99f6ecb5033c146f6856f45aa8d7ad867cdb6a9893c3fc211595c737ee4c54edddd771bc42a0a6c
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
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
deleted file mode 100644
index 02b8df751ef9..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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/files/pdns-recursor-4.3.5-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
new file mode 100644
index 000000000000..40a6ae565847
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
@@ -0,0 +1,47 @@
+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/net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
index bffba0080a4c..3859c9821d6b 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
@@ -37,7 +37,7 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}"/${P/_/-}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-boost-1.73.0.patch
+	"${FILESDIR}"/${P}-boost-1.73.0.patch
 )
 
 pkg_setup() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
index cb9a0daba0e2..6e6a0b941303 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
@@ -36,10 +36,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-boost-1.73.0.patch
-)
-
 pkg_setup() {
 	filter-flags -ftree-vectorize
 }
@@ -47,6 +43,9 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
 		--with-lua=$(usex luajit luajit lua) \
 		$(use_enable debug verbose-logging) \
 		$(use_enable systemd) \
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
new file mode 100644
index 000000000000..6e6a0b941303
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
@@ -0,0 +1,84 @@
+# 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 dnstap libressl luajit protobuf snmp sodium systemd"
+REQUIRED_USE="dnstap? ( protobuf )"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	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:= )
+	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/_/-}
+
+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=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(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
+}