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

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

[Sven Wegener]

commit:     9e700900862901ad291b1bb7af8ad09ff07f1ed2
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 15:43:45 2022 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 15:49:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e700900

net-dns/pdns-recursor: Update patch for warning message

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

 net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 0d29a24f160f..594fc8eca609 100644
--- 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
@@ -7,7 +7,7 @@ index 1700a9fde..ed09f2680 100644
    auto allowFrom = parseACL("allow-from-file", "allow-from");
  
 -  if(allowFrom->size() == 0) {
-+  if(allowFrom != nullptr && allowFrom->size() == 0) {
++  if(allowFrom == nullptr || allowFrom->size() == 0) {
      if(::arg()["local-address"]!="127.0.0.1" && ::arg().asNum("local-port")==53)
        g_log<<Logger::Warning<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl;
      allowFrom = nullptr;

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

[Sven Wegener]

commit:     e93b43433306a40fa13304ab365472df313bca67
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  5 20:57:47 2021 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jun  5 21:21:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93b4343

net-dns/pdns-recursor: Create socket-dir with correct user

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Closes: https://bugs.gentoo.org/793854
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns-recursor/files/pdns-recursor-r2 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
index 01ce79167bb..0ca3dfc1878 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor-r2
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -1,12 +1,18 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+get_config_option() {
+	awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}"
+}
+
 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}" )"
+PDNS_CHROOTDIR="$( get_config_option chroot )"
+PDNS_SOCKETDIR="$( get_config_option socket-dir )"
+PDNS_SETUID="$( get_config_option setuid )"
+PDNS_SETGID="$( get_config_option setgid )"
 [ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor"
 
 name="PowerDNS Recursor"
@@ -31,7 +37,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+	checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
 }
 
 ping() {

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

[Sven Wegener]

commit:     1b3bf150a750ef5b2adeb70e66d0477822e39158
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 17 16:14:42 2021 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 18:22:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3bf150

net-dns/pdns-recursor: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19503
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../files/pdns-recursor-4.3.5-boost-1.73.0.patch   | 47 ----------------------
 1 file changed, 47 deletions(-)

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
deleted file mode 100644
index 40a6ae56584..00000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
-From: Remi Gacogne <remi.gacogne@powerdns.com>
-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(&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);
- }
- 

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

[Sven Wegener]

commit:     ded639753190a409a10b2038b8f3b1f9e7a1d79d
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 19:11:32 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 19:13:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded63975

net-dns/pdns-recursor: Replace bashisms in init script, bug #605694

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 net-dns/pdns-recursor/files/pdns-recursor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor b/net-dns/pdns-recursor/files/pdns-recursor
index f114d5b..8300b70 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor
+++ b/net-dns/pdns-recursor/files/pdns-recursor
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,18 +11,18 @@ depend() {
 
 start() {
 	ebegin "Starting PowerDNS Recursor"
-	/usr/sbin/pdns_recursor --daemon=yes &>/dev/null
+	/usr/sbin/pdns_recursor --daemon=yes >/dev/null 2>&1
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping PowerDNS Recursor"
-	/usr/bin/rec_control quit &>/dev/null
+	/usr/bin/rec_control quit >/dev/null 2>&1
 	eend $?
 }
 
 ping() {
 	ebegin "Pinging PowerDNS Recursor"
-	/usr/bin/rec_control ping &>/dev/null
+	/usr/bin/rec_control ping >/dev/null 2>&1
 	eend $?
 }