community/powerdns to 4.3.1-2

This commit is contained in:
Kevin Mihelich 2020-12-09 15:15:48 +00:00
parent 9e26163630
commit 68e85bb703
2 changed files with 63 additions and 1 deletions

View file

@ -10,7 +10,7 @@
pkgname=powerdns
pkgver=4.3.1
pkgrel=1
pkgrel=2
pkgdesc='Authoritative DNS server'
url='https://www.powerdns.com/'
arch=('x86_64')
@ -31,9 +31,11 @@ provides=('pdns')
conflicts=('pdns')
backup=('etc/powerdns/pdns.conf')
source=(https://downloads.powerdns.com/releases/pdns-${pkgver}.tar.bz2{,.asc}
boost-1.73.patch
sysusers.conf)
sha512sums=('e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e'
'SKIP'
'ba902584687f0243a5d44a7733ed817432c603c0cdfd4d80e416b7dfac76f6631e256c5b59507e14a171cc63e47c8d0c8066bb54da0578c66f2ae64abce51fcf'
'522bde8b76367db6edd461fca8f81d50304a4d764addf33774b3e2c5c93a9e72d93993f54ddd4ee887ceeccf70280aceea3ffaf6370d26310e0a7ebbbf61f26a')
validpgpkeys=('B76CD4671C0968BAA87DE61C5E50715BF2FFE1A7' # Winkels, Erik <erik.winkels@open-xchange.com>
'16E12866B7738C73976A57436FFC33439B0D04DF' # Peter van Dijk <peter.van.dijk@powerdns.com>
@ -41,6 +43,7 @@ validpgpkeys=('B76CD4671C0968BAA87DE61C5E50715BF2FFE1A7' # Winkels, Erik <erik
prepare() {
cd pdns-${pkgver}
patch -Np1 -i ../boost-1.73.patch
# Patch the Makefile.in's so /powerdns is used instead of /pdns (for e.g. $LIBDIR)
# This allows for running pdns_server without setting `module-dir` in the config.
find . -name 'Makefile.in' -exec sed -i 's,pkglibdir = \$(libdir)/@PACKAGE@,pkglibdir = $(libdir)/powerdns,' {} \;

View file

@ -0,0 +1,59 @@
diff --git a/pdns/ixfrdist-web.cc b/pdns/ixfrdist-web.cc
index 485e720..58e4720 100644
--- a/pdns/ixfrdist-web.cc
+++ b/pdns/ixfrdist-web.cc
@@ -32,7 +32,7 @@ IXFRDistWebServer::IXFRDistWebServer(const ComboAddress &listenAddress, const Ne
{
d_ws->setACL(acl);
d_ws->setLogLevel(loglevel);
- d_ws->registerWebHandler("/metrics", boost::bind(&IXFRDistWebServer::getMetrics, this, _1, _2));
+ d_ws->registerWebHandler("/metrics", std::bind(&IXFRDistWebServer::getMetrics, this, std::placeholders::_1, std::placeholders::_2));
d_ws->bind();
}
diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index eafd305..b47cc6d 100644
--- a/pdns/webserver.cc
+++ b/pdns/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/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 8a8c433..df0e633 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -2328,8 +2328,8 @@ void AuthWebServer::webThread()
d_ws->registerApiHandler("/api", &apiDiscovery);
}
if (::arg().mustDo("webserver")) {
- d_ws->registerWebHandler("/style.css", boost::bind(&AuthWebServer::cssfunction, this, _1, _2));
- d_ws->registerWebHandler("/", boost::bind(&AuthWebServer::indexfunction, this, _1, _2));
+ d_ws->registerWebHandler("/style.css", std::bind(&AuthWebServer::cssfunction, this, std::placeholders::_1, std::placeholders::_2));
+ d_ws->registerWebHandler("/", std::bind(&AuthWebServer::indexfunction, this, std::placeholders::_1, std::placeholders::_2));
}
d_ws->go();
}