From 6f3f27a91a10e118d2e163764f5ae15eda8d7fa3 Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens@fedoraproject.org>
Date: Thu, 4 Jun 2020 11:23:59 +0200
Subject: [PATCH] Rebuilt for Boost 1.73

---
 pdns-boost173.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++
 pdns.spec           |  6 ++++-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 pdns-boost173.patch

diff --git a/pdns-boost173.patch b/pdns-boost173.patch
new file mode 100644
index 0000000..cd05fbc
--- /dev/null
+++ b/pdns-boost173.patch
@@ -0,0 +1,59 @@
+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();
+   }
diff --git a/pdns.spec b/pdns.spec
index 352fa09..157607d 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -3,12 +3,13 @@
 
 Name: pdns
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 License: GPLv2
 URL: http://powerdns.com
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Patch0: pdns-disable-secpoll.patch
+Patch1: pdns-boost173.patch
 
 Requires(pre): shadow-utils
 Requires(post): systemd-units
@@ -309,6 +310,9 @@ chown -R root:pdns %{_sysconfdir}/%{name}
 %{_unitdir}/ixfrdist@.service
 
 %changelog
+* Thu Jun 04 2020 Morten Stevens <mstevens@fedoraproject.org> - 4.3.0-3
+- Rebuilt for Boost 1.73
+
 * Wed May 27 2020 Morten Stevens <mstevens@fedoraproject.org> - 4.3.0-2
 - Updated file permissions