aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-02-27 04:51:53 +0100
committerAndy Postnikov <apostnikov@gmail.com>2021-02-27 04:25:06 +0000
commitfde4219d2e353c77de246466d867b498d82cba55 (patch)
tree1ef4dda6d0864740ec41c9b3b12d323115d074c4
parent05d372f0c114633773a640df943b1a72443c75f6 (diff)
downloadaports-fde4219d2e353c77de246466d867b498d82cba55.tar.gz
aports-fde4219d2e353c77de246466d867b498d82cba55.tar.bz2
aports-fde4219d2e353c77de246466d867b498d82cba55.tar.xz
community/pdns: upgrade to 4.4.1
-rw-r--r--community/pdns/APKBUILD10
-rw-r--r--community/pdns/boost.patch57
2 files changed, 4 insertions, 63 deletions
diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD
index 264d04187b..4ce3ec2ae1 100644
--- a/community/pdns/APKBUILD
+++ b/community/pdns/APKBUILD
@@ -6,8 +6,8 @@
# Contributor: Fabian Zoske <fabian@zoske.it>
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=pdns
-pkgver=4.3.1
-pkgrel=3
+pkgver=4.4.1
+pkgrel=0
pkgdesc="PowerDNS Authoritative Server"
url="https://www.powerdns.com/"
arch="all !aarch64" # Failing tests on aarch64
@@ -36,7 +36,6 @@ pkggroups="pdns"
source="https://downloads.powerdns.com/releases/pdns-$pkgver.tar.bz2
$pkgname.initd
$pkgname.conf
- boost.patch
"
# secfixes:
@@ -145,7 +144,6 @@ backend_pgsql() {
mv "$pkgdir/etc/$pkgname/4.1.0_to_4.2.0_schema.pgsql.sql" "$subpkgdir/etc/$pkgname/"
}
-sha512sums="e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e pdns-4.3.1.tar.bz2
+sha512sums="a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e pdns-4.4.1.tar.bz2
3a55547e1b6407e7d2faa6e02982ed903c2364381af1b7eeb626ae3a8b0e32558dd79bf31c982b134414e5636d4868c1f3660ac523f25d2440ed6f7b436843bf pdns.initd
-3f809f3257680c3e496fa6a4c86c8a636db5d9d5b92aef96fe54c29b8266ee590deb792d13205cc171e27307fa73295dd3b101b09102fd66a2393a7cdbf9dd27 pdns.conf
-306a1c14479b1078a4025efacaa893b2ef3a2f64f7dd5d06a2a18e3a23098f810f8fbb9f443015d6071c1e794a13c75f581b0da78ddd5e4737886a1419cf250c boost.patch"
+3f809f3257680c3e496fa6a4c86c8a636db5d9d5b92aef96fe54c29b8266ee590deb792d13205cc171e27307fa73295dd3b101b09102fd66a2393a7cdbf9dd27 pdns.conf"
diff --git a/community/pdns/boost.patch b/community/pdns/boost.patch
deleted file mode 100644
index 5975b09f09..0000000000
--- a/community/pdns/boost.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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();
- }