From 13cbf2cfa10bdf974c6e3da349b128e87379d31f Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 15 Jan 2021 17:03:07 -0300 Subject: community/pdns: fix build with boost >= 1.73.0 --- community/pdns/APKBUILD | 4 +++- community/pdns/boost.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 community/pdns/boost.patch diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD index 92a2d3889d3..264d04187bd 100644 --- a/community/pdns/APKBUILD +++ b/community/pdns/APKBUILD @@ -36,6 +36,7 @@ pkggroups="pdns" source="https://downloads.powerdns.com/releases/pdns-$pkgver.tar.bz2 $pkgname.initd $pkgname.conf + boost.patch " # secfixes: @@ -146,4 +147,5 @@ backend_pgsql() { sha512sums="e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e pdns-4.3.1.tar.bz2 3a55547e1b6407e7d2faa6e02982ed903c2364381af1b7eeb626ae3a8b0e32558dd79bf31c982b134414e5636d4868c1f3660ac523f25d2440ed6f7b436843bf pdns.initd -3f809f3257680c3e496fa6a4c86c8a636db5d9d5b92aef96fe54c29b8266ee590deb792d13205cc171e27307fa73295dd3b101b09102fd66a2393a7cdbf9dd27 pdns.conf" +3f809f3257680c3e496fa6a4c86c8a636db5d9d5b92aef96fe54c29b8266ee590deb792d13205cc171e27307fa73295dd3b101b09102fd66a2393a7cdbf9dd27 pdns.conf +306a1c14479b1078a4025efacaa893b2ef3a2f64f7dd5d06a2a18e3a23098f810f8fbb9f443015d6071c1e794a13c75f581b0da78ddd5e4737886a1419cf250c boost.patch" diff --git a/community/pdns/boost.patch b/community/pdns/boost.patch new file mode 100644 index 00000000000..5975b09f099 --- /dev/null +++ b/community/pdns/boost.patch @@ -0,0 +1,57 @@ +Fix compatibility with boost-1.73+ + +Backport of https://github.com/PowerDNS/pdns/commit/71246536642590e8e8b21c11307ec4bd0e165066 + +--- 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(); + } + +--- 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); + } + +--- 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(); + } -- cgit v1.2.3