[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/

[Sven Wegener]

commit: ccb50fe9480656be84a66d14524b46788bf9319a
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Aug 22 18:51:41 2022 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Aug 22 18:54:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb50fe9

net-dns/pdns-recursor: Cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns-recursor/Manifest |  2 -
 .../files/pdns-recursor-4.6.2-parseACL.patch   | 24 --
 net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild   | 92 --
 net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild   | 88 -
 4 files changed, 206 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 8f1f81fe706d..30f5b141869d 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,3 +1 @@
-DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 
3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d
 SHA512 
20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc
-DIST pdns-recursor-4.7.0.tar.bz2 1596954 BLAKE2B 
d2fb35caef19ee21ff495deb19939659940f245b44f6ff38977f328af9821862b939c48b5052b42ae83ae09647bab53094816b6dbe784737ef4c53ba02add855
 SHA512 
095272311623684a5a465ae48bd97b86ffe27d4092dea5dceee915ebb071ffb976eeb4055d560d834a3fafab0b15808137e384f28b7cec24719b78ac024e48c2
 DIST pdns-recursor-4.7.1.tar.bz2 1597536 BLAKE2B 
fc5d7ee80823ad55a986a9317d4be5be7d1ec1d1b993a5bb1bf0c138a901d4f81d4ebcef5e9774cd5de88c9f650053be26dc01dfd31b989dae25d53d12b87bad
 SHA512 
7769c4c082bbf52b0e13adbe9c1c7272a638c0b2b11e1d76794cea66dfe8dc83b07989fa16707a7cc682e8c366ef4c1d37a614ad2841af33ccb9adec6270e07f

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
deleted file mode 100644
index ee58e055f09a..
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 a/pdns_recursor.cc
-+++ b/pdns_recursor.cc
-@@ -4775,8 +4775,6 @@ static std::shared_ptr parseACL(const 
std::string& aclFile, const
-   result->addMask(line);
- }
- g_log[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2022-06-16

Thread
Sven Wegener

commit: f16a4c9a5a5397fed4a80415892bc41a6b0bb120
Author: Sven Wegener  gentoo  org>
AuthorDate: Thu Jun 16 20:47:10 2022 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Thu Jun 16 21:24:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16a4c9a

net-dns/pdns-recursor: Cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns-recursor/Manifest |  1 -
 .../files/pdns-recursor-4.6.1-parseACL.patch   | 13 ---
 .../pdns-recursor/pdns-recursor-4.6.1-r1.ebuild| 92 --
 net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild   | 88 -
 4 files changed, 194 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 1c4b24746f84..b2acf40866c2 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,3 +1,2 @@
-DIST pdns-recursor-4.6.1.tar.bz2 1541000 BLAKE2B 
fede4f654cd9900780df8dcc39585e95d8b0536c6d14476fde6f33a2d307144f50fb7b51bf6e0c950dcaff74120a101effee0c92cf15c4acedfa94a2682b0c5c
 SHA512 
b595dd382bb4bff5cd47bff854952c8ee40bedeafe4236f935c8eceeca7ac97e8668b884e1ec0ce490ce535fab10d161ffc53ca395c0bb02ffcf6005a692674b
 DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 
3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d
 SHA512 
20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc
 DIST pdns-recursor-4.7.0.tar.bz2 1596954 BLAKE2B 
d2fb35caef19ee21ff495deb19939659940f245b44f6ff38977f328af9821862b939c48b5052b42ae83ae09647bab53094816b6dbe784737ef4c53ba02add855
 SHA512 
095272311623684a5a465ae48bd97b86ffe27d4092dea5dceee915ebb071ffb976eeb4055d560d834a3fafab0b15808137e384f28b7cec24719b78ac024e48c2

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
deleted file mode 100644
index 594fc8eca609..
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/pdns_recursor.cc w/pdns_recursor.cc
-index 1700a9fde..ed09f2680 100644
 i/pdns_recursor.cc
-+++ w/pdns_recursor.cc
-@@ -4844,7 +4844,7 @@ void parseACLs()
- 
-   auto allowFrom = parseACL("allow-from-file", "allow-from");
- 
--  if(allowFrom->size() == 0) {
-+  if(allowFrom == nullptr || allowFrom->size() == 0) {
- if(::arg()["local-address"]!="127.0.0.1" && 
::arg().asNum("local-port")==53)
-   g_log[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2020-10-17

Thread
Sven Wegener

commit: edf1122e56fa58755f0da35606bbac283bf1bd30
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Oct 17 09:23:09 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Oct 17 09:23:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf1122e

net-dns/pdns-recursor: Cleanup

Bug: https://bugs.gentoo.org/746923
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns-recursor/Manifest |  2 -
 .../files/pdns-recursor-4.3.1-boost-1.73.0.patch   | 89 --
 net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild   | 85 -
 net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild   | 85 -
 4 files changed, 261 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 6208b5c960a..32b5c61225b 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,4 +1,2 @@
-DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B 
fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5
 SHA512 
285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5
-DIST pdns-recursor-4.3.4.tar.bz2 1359380 BLAKE2B 
b55829b843f3abc9394bcb943c223b24684ebe67854fbde8590aded09a8ef18d8b15d1e2ebe1b88d24833b8782266b1ce853d98c0ce510e115e8d16ce900ece2
 SHA512 
cfc34f42ed95c7fd2be1ab7ba172672e5e1db96b4ced171c1eae7bd60fb7db482aed928028811b133d326550de35c506a8fc480b12ae39ab7fa142408e0b42d8
 DIST pdns-recursor-4.3.5.tar.bz2 1341930 BLAKE2B 
8f81182cb5283e6b8f459c5d23281d20cba02d22cec8776fdab67d452834b82945f467186c98784519d2c79d9df8438b174fc644fb11d68d04f9f636e51a5551
 SHA512 
2d39e6016000951c0beca38b26c41664b57c059dee762d7499f34e599ed6c2653af73edb31ba5a8d35f749534f24c0d85b6aedf4c35dc8a05777ffebd1b25851
 DIST pdns-recursor-4.4.0-rc2.tar.bz2 1393346 BLAKE2B 
00f03dc05747e3b0962fdbff0e2d15b8e9d4703b84bafa086a5e1c229613b42d010ec963296845fe981c9bb99f02f8d60897fe180943091d0b904d0f65f453c0
 SHA512 
91f63924c30d89bf06dcaf48a588f116cedef530319b4e4682daf14682998b4879aca5d1796aa36a50ba327053523659f9a8ad180d592e5857f898e37f0064ec

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
deleted file mode 100644
index 02b8df751ef..000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
-From: Remi Gacogne 
-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/webserver.cc b/webserver.cc
-index eafd3059a0..b47cc6d7e0 100644
 a/webserver.cc
-+++ b/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(, handler, _1, 
_2);
-+  YaHTTP::THandlerFunction f = std::bind(, 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(::apiWrapper, this, handler, _1, 
_2, allowPassword);
-+  HandlerFunction f = std::bind(::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(::webWrapper, this, handler, _1, 
_2);
-+  HandlerFunction f = std::bind(::webWrapper, this, handler, 
std::placeholders::_1, std::placeholders::_2);
-   registerBareHandler(url, f);
- }
- 
-diff --git a/ws-recursor.cc b/ws-recursor.cc
-index cd8997309f..a074460c2f 100644
 a/ws-recursor.cc
-+++ b/ws-recursor.cc
-@@ -382,9 +382,9 @@ static void apiServerCacheFlush(HttpRequest* req, 
HttpResponse* resp) {
-   DNSName canon = apiNameToDNSName(req->getvars["domain"]);
-   bool subtree = (req->getvars.count("subtree") > 0 && 
req->getvars["subtree"].compare("true") == 0);
- 
--  int 



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2020-10-14

Thread
Sven Wegener

commit: a0014e52097aa0abc9f681c8f0b589a482c5781c
Author: Sven Wegener  gentoo  org>
AuthorDate: Wed Oct 14 07:08:29 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Wed Oct 14 07:09:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0014e52

net-dns/pdns-recursor: Add part of boost-1.73 patch for 4.3.5

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sven Wegener  gentoo.org>

 .../files/pdns-recursor-4.3.5-boost-1.73.0.patch   | 47 ++
 net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild   |  4 ++
 2 files changed, 51 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
new file mode 100644
index 000..40a6ae56584
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
@@ -0,0 +1,47 @@
+From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
+From: Remi Gacogne 
+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/webserver.cc b/webserver.cc
+index eafd3059a0..b47cc6d7e0 100644
+--- a/webserver.cc
 b/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(, handler, _1, 
_2);
++  YaHTTP::THandlerFunction f = std::bind(, 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(::apiWrapper, this, handler, _1, 
_2, allowPassword);
++  HandlerFunction f = std::bind(::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(::webWrapper, this, handler, _1, 
_2);
++  HandlerFunction f = std::bind(::webWrapper, this, handler, 
std::placeholders::_1, std::placeholders::_2);
+   registerBareHandler(url, f);
+ }
+ 

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild 
b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
index 0806261b1f4..a02b4e16a14 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
@@ -36,6 +36,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+   "${FILESDIR}"/${P}-boost-1.73.0.patch
+)
+
 pkg_setup() {
filter-flags -ftree-vectorize
 }






[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2020-05-30

Thread
Sven Wegener

commit: 38a9eb2394ab521f7bc044464b59ce840ac5bbf6
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat May 30 09:52:24 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat May 30 09:53:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a9eb23

net-dns/pdns-recursor: Cleanup

Bug: https://bugs.gentoo.org/723986
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns-recursor/Manifest |  5 --
 net-dns/pdns-recursor/files/pdns-recursor-r1   | 37 --
 net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild  | 79 --
 net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild  | 79 --
 net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild   | 78 -
 net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild   | 78 -
 .../pdns-recursor/pdns-recursor-4.3.0-r1.ebuild| 78 -
 7 files changed, 434 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 71108799dd6..52c8e3e1c43 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1 @@
-DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 
8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e
 SHA512 
9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
-DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 
11eecf1ca69e6855be1cb1a1a6bfefd6b65cf38a6fcfd1e98727fd7813958024b47f974a12fa05cf0a92079a7d14ecb1a6b199a51ba0b4731aa4a1a8b638441a
 SHA512 
d493de78086a88784dbf8b54732faddca7e0dec008cf80a757240f8e1943d230edc4f0ef5a372cb1897be01956bbcfd282a979150901c0df6cc304ccdc6d878d
-DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 
3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f
 SHA512 
e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
-DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 
19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba
 SHA512 
ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff
-DIST pdns-recursor-4.3.0.tar.bz2 1349359 BLAKE2B 
cdb9d38a350ef371c3675185c0f52f416d55338df034ff32a9d9fc85d783de04513555ec96fbc1dd07ecd7214d889cfe6fba80bc6981e66a6b8d4fe6f1da7dfa
 SHA512 
6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085
 DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 
1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397
 SHA512 
49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r1 
b/net-dns/pdns-recursor/files/pdns-recursor-r1
deleted file mode 100644
index 57c9df1eaa4..000
--- a/net-dns/pdns-recursor/files/pdns-recursor-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
-
-PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" 
)"
-[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && 
PDNS_SOCKETDIR="/var/run"
-
-name="PowerDNS Recursor"
-description="Recursive name server"
-
-extra_started_commands="ping"
-description_ping="Ping the PowerDNS instance"
-
-command="/usr/sbin/pdns_recursor"
-command_args="--config-dir=${PDNS_CONFIGDIR}"
-command_args_foreground="--daemon=no"
-command_args_background="--daemon=yes"
-yesno ${rc_verbose} || command_args_background="${command_args_background} 
>/dev/null 2>&1"
-
-pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
-
-control_command="/usr/bin/rec_control"
-control_command_args="${command_args}"
-
-depend() {
-   need net
-}
-
-ping() {
-   ebegin "Pinging ${name}"
-   ${control_command} ${control_command_args} ping >/dev/null 2>&1
-   eend $?
-}

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild 
b/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
deleted file mode 100644
index 25a4668601a..000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS 



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2020-05-30

Thread
Sven Wegener

commit: 13cb72bb0421f600e12802111db6d05514d763d8
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat May 30 09:50:25 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat May 30 09:53:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cb72bb

net-dns/pdns-recursor: Fix building with gcc-10, bug #724398

Closes: https://bugs.gentoo.org/724398
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sven Wegener  gentoo.org>

 .../files/pdns-recursor-4.3.1-gcc-10.patch | 61 ++
 net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild   |  1 +
 2 files changed, 62 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch
new file mode 100644
index 000..8244a456e64
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch
@@ -0,0 +1,61 @@
+commit b35614ed8b45adba304bcddcb3f2db6cb36b1462
+Author: Sander Hoentjen 
+Date:   Mon Dec 16 22:44:43 2019 +0100
+
+Fix build with gcc-10
+
+From an e-mail from Jeff Law :
+
+Subject: Minor problem in pdns, dnsdist and pdns-recursor packages in 
Fedora
+
+[ All three packages have embedded copies of the same problematic code
+and the same patch fixes all three. ]
+
+Red Hat's compiler team continues to try and be proactive in identifying
+issues that will arise as a result of the introduction of a new GCC
+release into Fedora each spring.
+
+You're being contacted because a package you maintain in Fedora is going
+to fail to build with gcc-10 in the spring.  Yes, I know that's a few
+months away, but it's far easier to fix this stuff proactively now than
+wait.
+
+Fixing it now also means that your package will continue to be built
+with testing versions of gcc-10 as we proceed through the development
+process thus allowing additional issues to be caught early.
+
+Your particular package will fail due to an uninstantiated template for
+AsyncLoader.  These kinds of problems are relatively common due to
+changes in the tuning of the inliner for gcc-10:
+
+> BUILDSTDERR: /usr/bin/ld: webserver.o: in function 
`WebServer::serveConnection(std::shared_ptr) const':
+> BUILDSTDERR: /builddir/build/BUILD/pdns-4.2.1/pdns/webserver.cc:373: 
undefined reference to 
`YaHTTP::AsyncLoader::feed(std::__cxx11::basic_string, std::allocator > const&)'
+> BUILDSTDERR: collect2: error: ld returned 1 exit status
+> BUILDSTDERR: make[3]: *** [Makefile:2751: ixfrdist] Error 1
+>
+
+The attached patch arranges for an instance to be instantiated when
+compiling reqresp.cpp and is sufficient to fix this problem.  The
+choice of reqresp.cpp fairly arbitrary IIRC.
+
+Ideally you'll with upstream to get this fixed, but a Fedora patch is
+clearly OK as well.   I'll install the attached fix into Fedora in a
+week or so if I haven't heard from you.
+
+Jeff
+
+(cherry picked from commit ffb885e937c27bb1c62dee8f18c58ae0d5d52d39)
+
+diff --git a/ext/yahttp/yahttp/reqresp.cpp b/ext/yahttp/yahttp/reqresp.cpp
+index 686a6c7bd..ca2154f6a 100644
+--- a/ext/yahttp/yahttp/reqresp.cpp
 b/ext/yahttp/yahttp/reqresp.cpp
+@@ -2,6 +2,8 @@
+ 
+ namespace YaHTTP {
+ 
++  template class AsyncLoader;
++
+   bool isspace(char c) {
+ return std::isspace(c) != 0;
+   }

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild 
b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
index 30eca37b6ed..378e02c50a6 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}"/${P/_/-}
 
 PATCHES=(
"${FILESDIR}"/${P}-boost-1.73.0.patch
+   "${FILESDIR}"/${P}-gcc-10.patch
 )
 
 pkg_setup() {






[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2019-01-24

Thread
Sven Wegener

commit: 9cc6c29be1d45345e3259e4c04f6673f0d4e711a
Author: Sven Wegener  gentoo  org>
AuthorDate: Thu Jan 24 16:34:18 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Jan 25 06:31:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc6c29b

net-dns/pdns-recursor: Version bump

This release just incorporates the protobuf fix, which is why I'm
committing it directly to stable.

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-dns/pdns-recursor/Manifest |  2 +-
 .../files/pdns-recursor-4.1.9-protobuf-fix.patch   | 32 --
 ...or-4.1.9.ebuild => pdns-recursor-4.1.10.ebuild} |  4 ---
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index b28e2a3f4a1..62cf394f365 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1 +1 @@
-DIST pdns-recursor-4.1.9.tar.bz2 1237727 BLAKE2B 
e060120edbbccd6688f614e0c00f0ecb9954b2d1f96194f7fff53d7111ec8c843348c25e206e998e1d0eb920b68b4a4631fb0806810e14956bd04957ece0c960
 SHA512 
2deaf1cdc8c32087f744efe0d142421cfd2d89dc9b31edcdea55c1efc2637987e8557891716498e3703c4b1af4b0d301e2a53316c5a97c7a18ec85016ccfa8f1
+DIST pdns-recursor-4.1.10.tar.bz2 1238148 BLAKE2B 
b68e33b40d5f1a680cbbd76c9864439a84416071dc75d658a3988e891da7f6a5d0c197d8dda7ff014a30b7f762bfbe5db4a616a6cad4415fd46db119b51ba70a
 SHA512 
204ea40f5c14d1e589935af4fbd24c102090390d741dbc5ad28f4c20044011f4b2b1c7926d8caaf144a7b2b1680f793e66199c5e9238e926da9fba60c5573dcd

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch
deleted file mode 100644
index b0e3f4f5cef..000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6b34c39dce4483f97d48201929ff6acd4abbef84 Mon Sep 17 00:00:00 2001
-From: Remi Gacogne 
-Date: Mon, 21 Jan 2019 16:07:29 +0100
-Subject: [PATCH] rec: Fix compilation in handleRunningTCPQuestion without
- protobuf support
-

- pdns/pdns_recursor.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/pdns_recursor.cc b/pdns_recursor.cc
-index d92b1ffae..98232dca2 100644
 a/pdns_recursor.cc
-+++ b/pdns_recursor.cc
-@@ -1535,6 +1535,9 @@ static void handleRunningTCPQuestion(int fd, 
FDMultiplexer::funcparam_t& var)
- LprotobufServer || 
luaconfsLocal->outgoingProtobufServer) {
- dc->d_requestorId = requestorId;
-@@ -1542,7 +1545,6 @@ static void handleRunningTCPQuestion(int fd, 
FDMultiplexer::funcparam_t& var)
- dc->d_uuid = (*t_uuidGenerator)();
-   }
- 
--  const struct dnsheader* dh = (const struct dnsheader*) conn->data;
-   if(luaconfsLocal->protobufServer) {
- try {
- 

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild 
b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
similarity index 97%
rename from net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
rename to net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
index 57436494bb1..45a74d2b943 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
@@ -32,10 +32,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-   "${FILESDIR}"/${P}-protobuf-fix.patch
-)
-
 pkg_setup() {
filter-flags -ftree-vectorize
 }






[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2019-01-21

Thread
Sven Wegener

commit: 6fad89dca5912b9f36ea41977987b8e8ef6cc53f
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Jan 21 15:21:45 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Jan 21 15:22:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fad89dc

net-dns/pdns-recursor: Version bump, security bug #675968

Bug: https://bugs.gentoo.org/675968
Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-dns/pdns-recursor/Manifest |  1 +
 .../files/pdns-recursor-4.1.9-protobuf-fix.patch   | 32 +
 net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild   | 82 ++
 3 files changed, 115 insertions(+)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index e3bcab62e0c..63a87021f03 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1 +1,2 @@
 DIST pdns-recursor-4.1.8.tar.bz2 1237750 BLAKE2B 
1170198ea2ed9f1d16f7d8fa76e4c9f8bc56e3c72a391d094e7380d84657b55daa6f45acf4737a9d9b144f2deae64103c40dc3b95550a853ee6f41f0f8a92c78
 SHA512 
5c09b8ce3f2f3ed6bb350cbd20e6cad4b66f9db85677605d57eca67187c05ddde5071af246a7398e2821c9ed2e5ff101d2b4928366b3ddf12013020fa9b74e61
+DIST pdns-recursor-4.1.9.tar.bz2 1237727 BLAKE2B 
e060120edbbccd6688f614e0c00f0ecb9954b2d1f96194f7fff53d7111ec8c843348c25e206e998e1d0eb920b68b4a4631fb0806810e14956bd04957ece0c960
 SHA512 
2deaf1cdc8c32087f744efe0d142421cfd2d89dc9b31edcdea55c1efc2637987e8557891716498e3703c4b1af4b0d301e2a53316c5a97c7a18ec85016ccfa8f1

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch
new file mode 100644
index 000..b0e3f4f5cef
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch
@@ -0,0 +1,32 @@
+From 6b34c39dce4483f97d48201929ff6acd4abbef84 Mon Sep 17 00:00:00 2001
+From: Remi Gacogne 
+Date: Mon, 21 Jan 2019 16:07:29 +0100
+Subject: [PATCH] rec: Fix compilation in handleRunningTCPQuestion without
+ protobuf support
+
+---
+ pdns/pdns_recursor.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pdns_recursor.cc b/pdns_recursor.cc
+index d92b1ffae..98232dca2 100644
+--- a/pdns_recursor.cc
 b/pdns_recursor.cc
+@@ -1535,6 +1535,9 @@ static void handleRunningTCPQuestion(int fd, 
FDMultiplexer::funcparam_t& var)
+ LprotobufServer || 
luaconfsLocal->outgoingProtobufServer) {
+ dc->d_requestorId = requestorId;
+@@ -1542,7 +1545,6 @@ static void handleRunningTCPQuestion(int fd, 
FDMultiplexer::funcparam_t& var)
+ dc->d_uuid = (*t_uuidGenerator)();
+   }
+ 
+-  const struct dnsheader* dh = (const struct dnsheader*) conn->data;
+   if(luaconfsLocal->protobufServer) {
+ try {
+ 

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild 
b/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
new file mode 100644
index 000..2bf5e320d81
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/;
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+   luajit? ( dev-lang/luajit:= )
+   protobuf? (
+   dev-libs/protobuf
+   >=dev-libs/boost-1.42:=
+   )
+   systemd? ( sys-apps/systemd:0= )
+   snmp? ( net-analyzer/net-snmp )
+   sodium? ( dev-libs/libsodium:= )
+   libressl? ( dev-libs/libressl:= )
+   !libressl? ( dev-libs/openssl:= )
+   >=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+   !




[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2016-12-30

Thread
Sven Wegener

commit: 411c750707380365e61d23cf9d1d1e4724ec5e50
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Dec 30 11:23:48 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Dec 30 11:26:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411c7507

net-dns/pdns-recursor: Cleanup

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 net-dns/pdns-recursor/Manifest |  5 --
 net-dns/pdns-recursor/files/precursor  | 28 
 net-dns/pdns-recursor/files/recursor.conf  | 21 --
 net-dns/pdns-recursor/pdns-recursor-3.6.4.ebuild   | 55 
 net-dns/pdns-recursor/pdns-recursor-3.7.3.ebuild   | 61 --
 .../pdns-recursor/pdns-recursor-4.0.0-r1.ebuild| 73 -
 net-dns/pdns-recursor/pdns-recursor-4.0.1.ebuild   | 75 --
 net-dns/pdns-recursor/pdns-recursor-4.0.2.ebuild   | 75 --
 8 files changed, 393 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index f5ab239..d92f997 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1 @@
-DIST pdns-recursor-3.6.4.tar.bz2 200278 SHA256 
b1ab90cd91b10a4888d0641b39195d5b3dc85d780a9b20c8fd95c117a1c171aa SHA512 
c803b3118f5fa75060538fcc7c5ad94458aaee2c989389a10b74f9b476d25dcd9b457e47fed1d4fb73b201b518c6d0581a5cd995db6a9b67a881a73a8e719833
 WHIRLPOOL 
fca1d9d2eb2ef6b54fff54860aa0585fdb2890bade817498d99d52e95a6ac701f6950a8fb49254c631bd9c8ef47d22735489bb4426f8cdf7c6e4f8c3c2f36257
-DIST pdns-recursor-3.7.3.tar.bz2 245192 SHA256 
859ca6071147dd2e2ac1b2a5c3d5c2cbff0f5cbc501660db4259e7cbf27fea11 SHA512 
35b95130e46d04c91adc3c4676a6e5546ac25d21ec576734162764732993d876d34f0e8124b7b6934c8354c0d042ffa5ec30f138b83a9aeaafcefa3808adcf23
 WHIRLPOOL 
62bc6b2cb5d6b8350da378af1b3fdf621e5719cd07968603c57dabfdbe384f56971e45c0a757c0b654a727729de55d59798683fe92f5338fc23684d22e372c9a
-DIST pdns-recursor-4.0.0.tar.bz2 1034944 SHA256 
900a5d5858c9caa825afd9df657dadebcc1842e3068754c19562eeaab8c791fd SHA512 
1a0a9ce39e5540a79308721bb47cccde54679570a218cef9740be06cfe9971af88f1cf82b3daabc4c1733484446a4432ffaf4e875ae9532cbb4a9264fcac7798
 WHIRLPOOL 
0a8577f582390844f0ad7d4aafce977383ed6984f4d4543f442b3b029d68c86c9d41742488edd4dec31fdc38a63bc6bf1333445dab626b9cc714e90589e7579e
-DIST pdns-recursor-4.0.1.tar.bz2 1035584 SHA256 
472db541307c8ca83a846d260ecfc854fd8e879c1bb2ce5683a8df5d21e860b0 SHA512 
3e69606bda3d296b0c3fd9212afa2a098ab04637718356d220a9490bc3e2a0ca97210934d398ad740509cea9e8f8d2ab2e16a1ba75d559f6b82bf64a729ad018
 WHIRLPOOL 
5702272c34835238b7a63de6bc4bae0836d9879e8e98d97d7f79e08397f5c2f2d75f10878b94c44fdf862ad924635b6f86a65b31312e0fb16ab38f30c4646bac
-DIST pdns-recursor-4.0.2.tar.bz2 1045767 SHA256 
d0c46bf47a3f9b3100043319ef9cdec83eba2c35f0a268d704d5c3a3facfea41 SHA512 
74dea771deb0bcce6209c256f4c2c82a76d34a80a4a67497b58bf8889166a51864c2649527475aa6e6355af8bba86a68d599828274eaa7521006384223f2e937
 WHIRLPOOL 
4eda1d13a888f31e1dc90ff3238acee8999423197d514a7ba49ce1fc623512d13694ffd0cf8891d4141e34907cc2ff9f30607b327179f4257a8ed89b4d9973d4
 DIST pdns-recursor-4.0.3.tar.bz2 1045041 SHA256 
ae9813a64d13d9ebe4b44e89e8e4e44fc438693b6ce4c3a98e4cab1af22d9627 SHA512 
03c77cff58851f9802eba434fb674d9cbd19b849620996df84b8dccc97539607895e06c1beb662b1ce08146bbc2b51a72bde2d6d90ef88c929ab645d9b5a33c4
 WHIRLPOOL 
25a6f40bca7575ffa07a87be15c0f6d6943878ed5f9b5cd28fa4eb782048a82aed56e5f76b578be78b5d9078dbd4a2838a1b07da22e125903e677d7e7e60bb8f

diff --git a/net-dns/pdns-recursor/files/precursor 
b/net-dns/pdns-recursor/files/precursor
deleted file mode 100644
index 8c6cb9a..
--- a/net-dns/pdns-recursor/files/precursor
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="ping"
-
-depend() {
-   need net
-}
-
-start() {
-   ebegin "Starting PowerDNS Recursor"
-   /usr/sbin/pdns_recursor --daemon=yes &>/dev/null
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping PowerDNS Recursor"
-   /usr/sbin/rec_control quit &>/dev/null
-   eend $?
-}
-
-ping() {
-   ebegin "Pinging PowerDNS Recursor"
-   /usr/sbin/rec_control ping &>/dev/null
-   eend $?
-}

diff --git a/net-dns/pdns-recursor/files/recursor.conf 
b/net-dns/pdns-recursor/files/recursor.conf
deleted file mode 100644
index e231b9f..
--- a/net-dns/pdns-recursor/files/recursor.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Drop uid
-setuid=nobody
-
-# Drop gid
-setgid=nobody
-
-# Don't log queries
-quiet=on
-
-# Local IP address to bind to
-local-address=127.0.0.1
-
-# Local port to bind to
-local-port=53
-
-# Change root for safety
-chroot=/var/lib/powerdns

diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.4.ebuild 




[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2016-10-14

Thread
Sven Wegener

commit: 62dbdfb90a5079d7e0ca0cf540bb5cfee960011a
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Oct 14 12:36:39 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Oct 14 12:47:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62dbdfb9

net-dns/pdns-recursor: Fix building with >=boost-1.61, bug #595988

Package-Manager: portage-2.3.0

 .../pdns-recursor-4.0.3-boost-1.61-fcontext.patch  | 152 +
 net-dns/pdns-recursor/pdns-recursor-4.0.3.ebuild   |   6 +-
 2 files changed, 157 insertions(+), 1 deletion(-)

diff --git 
a/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-boost-1.61-fcontext.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-boost-1.61-fcontext.patch
new file mode 100644
index ..c6cd9a3
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-boost-1.61-fcontext.patch
@@ -0,0 +1,152 @@
+diff --git a/mtasker_fcontext.cc b/mtasker_fcontext.cc
+index bc37e76..8d96fa1 100644
+--- a/mtasker_fcontext.cc
 b/mtasker_fcontext.cc
+@@ -23,14 +23,15 @@
+ #include 
+ #include 
+ #include 
+-#if BOOST_VERSION > 106100
+-#include 
+-#else
+-#include 
+-#endif
+ #include 
+-
++#if BOOST_VERSION < 106100
++#include 
+ using boost::context::make_fcontext;
++#else
++#include 
++using boost::context::detail::make_fcontext;
++#endif /* BOOST_VERSION < 106100 */
++
+ 
+ #if BOOST_VERSION < 105600
+ /* Note: This typedef means functions taking fcontext_t*, like 
jump_fcontext(),
+@@ -61,8 +62,15 @@ jump_fcontext (fcontext_t* const ofc, fcontext_t const nfc,
+ }
+ }
+ #else
++
++#if BOOST_VERSION < 106100
+ using boost::context::fcontext_t;
+ using boost::context::jump_fcontext;
++#else
++using boost::context::detail::fcontext_t;
++using boost::context::detail::jump_fcontext;
++using boost::context::detail::transfer_t;
++#endif /* BOOST_VERSION < 106100 */
+ 
+ static_assert (std::is_pointer::value,
+"Boost Context has changed the fcontext_t type again :-(");
+@@ -72,7 +80,9 @@ static_assert (std::is_pointer::value,
+  * jump. args_t simply provides a way to pass more by reference.
+  */
+ struct args_t {
++#if BOOST_VERSION < 106100
+ fcontext_t prev_ctx = nullptr;
++#endif
+ pdns_ucontext_t* self = nullptr;
+ boost::function* work = nullptr;
+ };
+@@ -80,7 +90,11 @@ struct args_t {
+ extern "C" {
+ static
+ void
++#if BOOST_VERSION < 106100
+ threadWrapper (intptr_t const xargs) {
++#else
++threadWrapper (transfer_t const t) {
++#endif
+ /* Access the args passed from pdns_makecontext, and copy them directly 
from
+  * the calling stack on to ours (we're now using the MThreads stack).
+  * This saves heap allocating an args object, at the cost of an extra
+@@ -90,11 +104,28 @@ threadWrapper (intptr_t const xargs) {
+  * the behaviour of the System V implementation, which can inherently only
+  * be passed ints and pointers.
+  */
++#if BOOST_VERSION < 106100
+ auto args = reinterpret_cast(xargs);
++#else
++auto args = reinterpret_cast(t.data);
++#endif
+ auto ctx = args->self;
+ auto work = args->work;
++/* we switch back to pdns_makecontext() */
++#if BOOST_VERSION < 106100
+ jump_fcontext (reinterpret_cast(>uc_mcontext),
+static_cast(args->prev_ctx), 0);
++#else
++transfer_t res = jump_fcontext (t.fctx, 0);
++/* we got switched back from pdns_swapcontext() */
++if (res.data) {
++  /* if res.data is not a nullptr, it holds a pointer to the context
++ we just switched from, and we need to fill it to be able to
++ switch back to it later. */
++  fcontext_t* ptr = static_cast(res.data);
++  *ptr = res.fctx;
++}
++#endif
+ args = nullptr;
+ 
+ try {
+@@ -106,9 +137,14 @@ threadWrapper (intptr_t const xargs) {
+ 
+ /* Emulate the System V uc_link feature. */
+ auto const next_ctx = ctx->uc_link->uc_mcontext;
++#if BOOST_VERSION < 106100
+ jump_fcontext (reinterpret_cast(>uc_mcontext),
+static_cast(next_ctx),
+static_cast(ctx->exception));
++#else
++jump_fcontext (static_cast(next_ctx), 0);
++#endif
++
+ #ifdef NDEBUG
+ __builtin_unreachable();
+ #endif
+@@ -129,10 +165,27 @@ pdns_ucontext_t::~pdns_ucontext_t
+ void
+ pdns_swapcontext
+ (pdns_ucontext_t& __restrict octx, pdns_ucontext_t const& __restrict ctx) {
++  /* we either switch back to threadwrapper() if it's the first time,
++ or we switch back to pdns_swapcontext(),
++ in both case we will be returning from a call to jump_fcontext(). */
++#if BOOST_VERSION < 106100
+ if (jump_fcontext (reinterpret_cast(_mcontext),
+static_cast(ctx.uc_mcontext), 0)) {
+ std::rethrow_exception (ctx.exception);
+ }
++#else
++  transfer_t res = jump_fcontext (static_cast(ctx.uc_mcontext), 
_mcontext);
++  if (res.data) {
++/* if res.data is 



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2016-07-19

Thread
Sven Wegener

commit: 5150f75e101d89f146fb2286e768b12ac0c823d0
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Jul 19 21:23:10 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Jul 19 22:02:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5150f75e

net-dns/pdns-recursor: Rename init script, bug #322581

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns-recursor/files/pdns-recursor| 28 
 net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor 
b/net-dns/pdns-recursor/files/pdns-recursor
new file mode 100644
index 000..151176b
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="ping"
+
+depend() {
+   need net
+}
+
+start() {
+   ebegin "Starting PowerDNS Recursor"
+   /usr/sbin/pdns_recursor --daemon=yes &>/dev/null
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping PowerDNS Recursor"
+   /usr/sbin/rec_control quit &>/dev/null
+   eend $?
+}
+
+ping() {
+   ebegin "Pinging PowerDNS Recursor"
+   /usr/sbin/rec_control ping &>/dev/null
+   eend $?
+}

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild 
b/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
index ac2fe3d..4fd1a47 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
@@ -50,7 +50,7 @@ src_install() {
insinto /etc/powerdns
doins "${FILESDIR}"/recursor.conf
 
-   doinitd "${FILESDIR}"/precursor
+   doinitd "${FILESDIR}"/pdns-recursor
 
# Pretty ugly, uh?
dodir /var/lib/powerdns/var/lib






[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/


2015-11-03

Thread
Sven Wegener

commit: 88153f4d34a0719cee3960acb6423d7a6a7845cb
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Nov  3 19:30:13 2015 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Nov  3 19:30:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88153f4d

net-dns/pdns-recursor: cleanup

Signed-off-by: Sven Wegener  gentoo.org>

 .../pdns-recursor-3.1.7.2-error-message.patch  | 11 
 .../files/pdns-recursor-3.5.3-fdlimit.patch| 67 --
 .../files/pdns-recursor-3.6.1-CVE-2014-8601.patch  | 52 -
 .../pdns-recursor/pdns-recursor-3.6.1-r1.ebuild| 59 ---
 net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild   | 55 --
 net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild   | 55 --
 net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild   | 61 
 net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild   | 61 
 8 files changed, 421 deletions(-)

diff --git 
a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch
deleted file mode 100644
index 7fdf208..000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 pdns-recursor-3.1.7.2/rec_channel.cc
-+++ pdns-recursor-3.1.7.2/rec_channel.cc
-@@ -100,7 +100,7 @@
-   strcpy(remote.sun_path,(path+"/"+fname).c_str());
-   if(::connect(d_fd, (sockaddr*), sizeof(remote)) < 0) {
- unlink(d_local.sun_path);
--throw AhuException("Unable to connect to remote '"+path+fname+"': 
"+string(strerror(errno)));
-+throw AhuException("Unable to connect to remote '"+path+"/"+fname+"': 
"+string(strerror(errno)));
-   }
- }
- 

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch 
b/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch
deleted file mode 100644
index 3b6e8e2..000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch
+++ /dev/null
@@ -1,67 +0,0 @@
 pdns-recursor-3.5.3/misc.cc
-+++ pdns-recursor-3.5.3/misc.cc
-@@ -22,6 +22,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #endif // WIN32
-@@ -697,3 +698,22 @@
-   } while(!strchr(buffer, '\n'));
-   return true;
- }
-+
-+unsigned int getFilenumLimit(bool hardOrSoft)
-+{
-+  struct rlimit rlim;
-+  if(getrlimit(RLIMIT_NOFILE, ) < 0)
-+unixDie("Requesting number of available file descriptors");
-+  return hardOrSoft ? rlim.rlim_max : rlim.rlim_cur;
-+}
-+
-+void setFilenumLimit(unsigned int lim)
-+{
-+  struct rlimit rlim;
-+
-+  if(getrlimit(RLIMIT_NOFILE, ) < 0)
-+unixDie("Requesting number of available file descriptors");
-+  rlim.rlim_cur=lim;
-+  if(setrlimit(RLIMIT_NOFILE, ) < 0)
-+unixDie("Setting number of available file descriptors");
-+}
 pdns-recursor-3.5.3/misc.hh
-+++ pdns-recursor-3.5.3/misc.hh
-@@ -445,4 +445,6 @@
-   regex_t d_preg;
- };
- 
-+unsigned int getFilenumLimit(bool hardOrSoft=0);
-+void setFilenumLimit(unsigned int lim);
- #endif
 pdns-recursor-3.5.3/pdns_recursor.cc
-+++ pdns-recursor-3.5.3/pdns_recursor.cc
-@@ -1740,7 +1740,21 @@
-   
-   g_tcpTimeout=::arg().asNum("client-tcp-timeout");
-   g_maxTCPPerClient=::arg().asNum("max-tcp-per-client");
--  g_maxMThreads=::arg().asNum("max-mthreads");
-+  g_maxMThreads=::arg().asNum("max-mthreads");
-+  unsigned int availFDs=getFilenumLimit();
-+  if(g_maxMThreads * g_numThreads > availFDs) {
-+if(getFilenumLimit(true) >= g_maxMThreads * g_numThreads) {
-+  setFilenumLimit(g_maxMThreads * g_numThreads);
-+  L<get() || !(*t_pdl)->preresolve(dc->d_remote, 
g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, 
QType(dc->d_mdp.d_qtype), ret, res, )) {
--  res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), 
dc->d_mdp.d_qclass, ret);
-+   try {
-+ res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), 
dc->d_mdp.d_qclass, ret);
-+   }
-+   catch(ImmediateServFailException ) {
-+ L<get()) {
- if(res == RCode::NoError) {
-diff --git a/syncres.cc b/syncres.cc
-index 4dc78b4..d09e44b 100644
 a/syncres.cc
-+++ b/syncres.cc
-@@ -923,6 +923,7 @@ int SyncRes::doResolveAt(set 
nameservers, string auth,
-   }
-   else {
-