CVS commit: pkgsrc/net/powerdns

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat May 16 02:14:47 UTC 2020

Modified Files:
        pkgsrc/net/powerdns: distinfo
Added Files:
        pkgsrc/net/powerdns/patches: patch-pdns_webserver.cc
            patch-pdns_ws-auth.cc

Log Message:
boost::placeholders fallout


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/powerdns/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/powerdns/patches/patch-pdns_webserver.cc \
    pkgsrc/net/powerdns/patches/patch-pdns_ws-auth.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/powerdns/distinfo
diff -u pkgsrc/net/powerdns/distinfo:1.38 pkgsrc/net/powerdns/distinfo:1.39
--- pkgsrc/net/powerdns/distinfo:1.38   Tue Mar 17 19:04:49 2020
+++ pkgsrc/net/powerdns/distinfo        Sat May 16 02:14:47 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2020/03/17 19:04:49 adam Exp $
+$NetBSD: distinfo,v 1.39 2020/05/16 02:14:47 joerg Exp $
 
 SHA1 (pdns-4.2.1.tar.bz2) = 81a4edb44f53f3f2c36793760ce30f81429fbc97
 RMD160 (pdns-4.2.1.tar.bz2) = 0efc805e4ed45ebdaf16cd97e2e797a37e000ca3
@@ -11,3 +11,5 @@ SHA1 (patch-pdns_iputils.cc) = fbd3bb210
 SHA1 (patch-pdns_iputils.hh) = 714277322ea721ea0439fc6aa0265bd290219e8b
 SHA1 (patch-pdns_qtype.hh) = 0f8bca4c0cafea9a5257a08077fa42b4c52127f5
 SHA1 (patch-pdns_version.cc) = 25917c329dafa34e657fa31c7a9abd99110bb4b0
+SHA1 (patch-pdns_webserver.cc) = b698338a168066f65a96313eab1bb1292192df94
+SHA1 (patch-pdns_ws-auth.cc) = fd68549574240a9e99b31f501e40461f0318d1ed

Added files:

Index: pkgsrc/net/powerdns/patches/patch-pdns_webserver.cc
diff -u /dev/null pkgsrc/net/powerdns/patches/patch-pdns_webserver.cc:1.1
--- /dev/null   Sat May 16 02:14:47 2020
+++ pkgsrc/net/powerdns/patches/patch-pdns_webserver.cc Sat May 16 02:14:47 2020
@@ -0,0 +1,31 @@
+$NetBSD: patch-pdns_webserver.cc,v 1.1 2020/05/16 02:14:47 joerg Exp $
+
+--- pdns/webserver.cc.orig     2020-05-14 23:32:52.641862905 +0000
++++ pdns/webserver.cc
+@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer
+ 
+ void WebServer::registerBareHandler(const string& url, HandlerFunction handler)
+ {
+-  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2);
++  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, boost::placeholders::_1, boost::placeholders::_2);
+   YaHTTP::Router::Any(url, f);
+ }
+ 
+@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::Ha
+ }
+ 
+ void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) {
+-  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword);
++  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, boost::placeholders::_1, boost::placeholders::_2, allowPassword);
+   registerBareHandler(url, f);
+ }
+ 
+@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::Ha
+ }
+ 
+ void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
+-  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2);
++  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, boost::placeholders::_1, boost::placeholders::_2);
+   registerBareHandler(url, f);
+ }
+ 
Index: pkgsrc/net/powerdns/patches/patch-pdns_ws-auth.cc
diff -u /dev/null pkgsrc/net/powerdns/patches/patch-pdns_ws-auth.cc:1.1
--- /dev/null   Sat May 16 02:14:47 2020
+++ pkgsrc/net/powerdns/patches/patch-pdns_ws-auth.cc   Sat May 16 02:14:47 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-pdns_ws-auth.cc,v 1.1 2020/05/16 02:14:47 joerg Exp $
+
+--- pdns/ws-auth.cc.orig       2020-05-14 23:22:34.214926173 +0000
++++ pdns/ws-auth.cc
+@@ -2297,8 +2297,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", boost::bind(&AuthWebServer::cssfunction, this, boost::placeholders::_1, boost::placeholders::_2));
++      d_ws->registerWebHandler("/", boost::bind(&AuthWebServer::indexfunction, this, boost::placeholders::_1, boost::placeholders::_2));
+     }
+     d_ws->go();
+   }