Hello community, here is the log from the commit of package pdns for openSUSE:Factory checked in at 2020-09-15 16:28:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdns (Old) and /work/SRC/openSUSE:Factory/.pdns.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pdns" Tue Sep 15 16:28:26 2020 rev:69 rq:834287 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pdns/pdns.changes 2020-04-23 18:32:12.852291661 +0200 +++ /work/SRC/openSUSE:Factory/.pdns.new.4249/pdns.changes 2020-09-15 16:28:30.678609491 +0200 @@ -1,0 +2,6 @@ +Mon Sep 14 10:27:11 UTC 2020 - Adam Majer <adam.ma...@suse.de> + +- 9070.patch: backport compilation fix vs. latest Boost 1.74 + based on https://github.com/PowerDNS/pdns/pull/9070 (bsc#1176312) + +------------------------------------------------------------------- New: ---- 9070.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdns.spec ++++++ --- /var/tmp/diff_new_pack.MDj5LI/_old 2020-09-15 16:28:31.710610479 +0200 +++ /var/tmp/diff_new_pack.MDj5LI/_new 2020-09-15 16:28:31.714610483 +0200 @@ -63,6 +63,7 @@ Source1: https://downloads.powerdns.com/releases/pdns-%{version}.tar.bz2.sig Source2: https://powerdns.com/powerdns-keyblock.asc#/pdns.keyring Patch0: pdns-4.0.3_allow_dacoverride_in_capset.patch +Patch1: 9070.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -256,8 +257,7 @@ %endif %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 +%autosetup -n %{name}-%{version} -p1 %build %configure \ ++++++ 9070.patch ++++++ >From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001 From: Remi Gacogne <remi.gaco...@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/pdns/ixfrdist-web.cc b/pdns/ixfrdist-web.cc index dababdc3fd..ebc456cedb 100644 --- a/pdns/ixfrdist-web.cc +++ b/pdns/ixfrdist-web.cc @@ -30,7 +30,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 eafd3059a0..b47cc6d7e0 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 22c54dae28..c3ca5c29ae 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(); }
