kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/powerdns: Remove unneeded patches after update to 4.4.0

Browse source
This commit is contained in:
otis 2020-12-21 00:28:17 +00:00
parent 308735d4ed
commit 579b106947
4 changed files with 0 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
net/powerdns/patches/patch-pdns_iputils.hh
View file

@ -1,35 +0,0 @@
$NetBSD: patch-pdns_iputils.hh,v 1.5 2020/07/02 13:01:38 otis Exp $
Rename some identifiers to non-clashing names.
Reference:
https://github.com/PowerDNS/pdns/issues/9279
--- pdns/iputils.hh.orig 2020-04-06 12:07:50.000000000 +0000
+++ pdns/iputils.hh
@@ -339,9 +339,9 @@ union ComboAddress {
index = 32 + index;
}
- uint32_t s_addr = ntohl(sin4.sin_addr.s_addr);
+ uint32_t ls_addr = ntohl(sin4.sin_addr.s_addr);
- return ((s_addr & (1<<index)) != 0x00000000);
+ return ((ls_addr & (1<<index)) != 0x00000000);
}
if(isIPv6()) {
if (index >= 128)
@@ -352,11 +352,11 @@ union ComboAddress {
index = 128 + index;
}
- uint8_t *s_addr = (uint8_t*)sin6.sin6_addr.s6_addr;
+ uint8_t *ls_addr = (uint8_t*)sin6.sin6_addr.s6_addr;
uint8_t byte_idx = index / 8;
uint8_t bit_idx = index % 8;
- return ((s_addr[15-byte_idx] & (1 << bit_idx)) != 0x00);
+ return ((ls_addr[15-byte_idx] & (1 << bit_idx)) != 0x00);
}
return false;
}

36
net/powerdns/patches/patch-pdns_lua-record.cc
View file

@ -1,36 +0,0 @@
$NetBSD: patch-pdns_lua-record.cc,v 1.1 2020/07/02 13:01:38 otis Exp $
Rename some identifiers to non-clashing names.
Reference:
https://github.com/PowerDNS/pdns/issues/9279
--- pdns/lua-record.cc.orig 2020-02-25 06:57:13.000000000 +0000
+++ pdns/lua-record.cc
@@ -658,12 +658,12 @@ void setupLuaRecords()
for(int i=0; i<8; ++i) {
if(i)
together+=":";
- string quad;
+ string lquad;
for(int j=0; j <4; ++j) {
- quad.append(1, labels[31-i*4-j][0]);
+ lquad.append(1, labels[31-i*4-j][0]);
together += labels[31-i*4-j][0];
}
- quads.push_back(quad);
+ quads.push_back(lquad);
}
ComboAddress ip6(together,0);
@@ -683,8 +683,8 @@ void setupLuaRecords()
fmt % labels[i];
fmt % dashed;
- for(const auto& quad : quads)
- fmt % quad;
+ for(const auto& lquad : quads)
+ fmt % lquad;
return fmt.str();
}

31
net/powerdns/patches/patch-pdns_webserver.cc
View file

@ -1,31 +0,0 @@
$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);
}

15
net/powerdns/patches/patch-pdns_ws-auth.cc
View file

@ -1,15 +0,0 @@
$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();
}