* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/
@ 2016-05-30 20:36 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2016-05-30 20:36 UTC (permalink / raw
To: gentoo-commits
commit: e096fe12d1b45779ccf34388a1e6f99357aec7f7
Author: Gordon Pettey <petteyg359 <AT> gmail <DOT> com>
AuthorDate: Wed May 18 15:51:04 2016 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:36:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e096fe12
net-dns/pdns: Start database before pdns, bug #533162
net-dns/pdns/files/pdns | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 2894b34..8ff6753 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -18,6 +18,7 @@ fi
depend() {
need net
+ use mysql postgresql
}
start() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/
@ 2017-01-14 19:13 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2017-01-14 19:13 UTC (permalink / raw
To: gentoo-commits
commit: cd4bfb06dafd1742b0cf435130773d59e1d2f62c
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 19:12:06 2017 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 19:13:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd4bfb06
net-dns/pdns: Replace bashisms in init script, bug #605694
Package-Manager: Portage-2.3.0, Repoman-2.3.1
net-dns/pdns/files/pdns | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 8ff6753..4ffa062 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,13 +32,13 @@ start() {
stop() {
ebegin "Stopping PowerDNS (${PDNS_INSTANCE})"
- /usr/bin/pdns_control ${PDNS_CONFIG} quit &>/dev/null
+ /usr/bin/pdns_control ${PDNS_CONFIG} quit >/dev/null 2>&1
eend $?
}
reload() {
ebegin "Reloading PowerDNS (${PDNS_INSTANCE})"
- /usr/bin/pdns_control ${PDNS_CONFIG} cycle &>/dev/null
+ /usr/bin/pdns_control ${PDNS_CONFIG} cycle >/dev/null 2>&1
eend $?
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/
@ 2020-09-22 21:55 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2020-09-22 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 85a794ee3a6f0bb17a0d669d1f37b1fa4204fca3
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 21:21:17 2020 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 21:41:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a794ee
net-dns/pdns: Fix default pidfile location, bug #742962
Closes: https://bugs.gentoo.org/742962
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
net-dns/pdns/files/pdns-r1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-dns/pdns/files/pdns-r1 b/net-dns/pdns/files/pdns-r1
index 76c4a3f1bbf..4c5241e5155 100644
--- a/net-dns/pdns/files/pdns-r1
+++ b/net-dns/pdns/files/pdns-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
@@ -10,7 +10,7 @@ PDNS_STOP_TIMEOUT="${PDNS_STOP_TIMEOUT:-10}"
PDNS_CONFIG="${PDNS_CONFIGDIR}/pdns${PDNS_INSTANCE:+-${PDNS_INSTANCE}}.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"
+[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns"
name="PowerDNS Authoritative Server${PDNS_INSTANCE:+ (${PDNS_INSTANCE})}"
description="Authoritative name server"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/
@ 2021-02-17 18:22 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2021-02-17 18:22 UTC (permalink / raw
To: gentoo-commits
commit: b603bd0a0f70c242e12d6b8ab6fb0fe324dc399e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 17 16:14:20 2021 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 18:22:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b603bd0a
net-dns/pdns: 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>
.../pdns-4.3.0-boost-1.73-compatibility.patch | 57 ----------------------
1 file changed, 57 deletions(-)
diff --git a/net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.patch b/net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.patch
deleted file mode 100644
index 5975b09f099..00000000000
--- a/net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.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();
- }
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/
@ 2021-06-05 21:23 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2021-06-05 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 9977fe38611c4c7cae10ceac1eafbabf08fa6546
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 20:57:44 2021 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 21:20:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9977fe38
net-dns/pdns: Force writing pidfile
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
net-dns/pdns/files/pdns-r1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-dns/pdns/files/pdns-r1 b/net-dns/pdns/files/pdns-r1
index 4c5241e5155..ee8ef36640c 100644
--- a/net-dns/pdns/files/pdns-r1
+++ b/net-dns/pdns/files/pdns-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
@@ -22,7 +22,7 @@ description_ping="Ping the PowerDNS instance"
description_monitor="Starts in foreground with logging and console enabled"
command="/usr/sbin/pdns_server"
-command_args="--config-dir=${PDNS_CONFIGDIR}${PDNS_INSTANCE:+ --config-name=${PDNS_INSTANCE}}"
+command_args="--config-dir=${PDNS_CONFIGDIR}${PDNS_INSTANCE:+ --config-name=${PDNS_INSTANCE}} --write-pid=yes"
command_args_foreground="--daemon=no"
command_args_background="--daemon=yes"
yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/
@ 2021-06-05 21:23 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2021-06-05 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 4c61cba390f9b3b70436215ea7348d251cd31da1
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 20:57:45 2021 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 21:21:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c61cba3
net-dns/pdns: Create socket-dir with correct user
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
net-dns/pdns/files/pdns-r1 | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/net-dns/pdns/files/pdns-r1 b/net-dns/pdns/files/pdns-r1
index ee8ef36640c..eeff5a08f63 100644
--- a/net-dns/pdns/files/pdns-r1
+++ b/net-dns/pdns/files/pdns-r1
@@ -2,14 +2,20 @@
# 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_STOP_TIMEOUT="${PDNS_STOP_TIMEOUT:-10}"
[ "${RC_SVCNAME}" != "pdns" ] && PDNS_INSTANCE="${RC_SVCNAME#pdns[.-]}" || PDNS_INSTANCE=""
PDNS_CONFIG="${PDNS_CONFIGDIR}/pdns${PDNS_INSTANCE:+-${PDNS_INSTANCE}}.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"
name="PowerDNS Authoritative Server${PDNS_INSTANCE:+ (${PDNS_INSTANCE})}"
@@ -42,6 +48,10 @@ status() {
_ping || return 32
}
+start_pre() {
+ checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+}
+
stop() {
default_stop || return
_ping || return 0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-05 21:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-30 20:36 [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/files/ Sven Wegener
-- strict thread matches above, loose matches on Subject: below --
2017-01-14 19:13 Sven Wegener
2020-09-22 21:55 Sven Wegener
2021-02-17 18:22 Sven Wegener
2021-06-05 21:23 Sven Wegener
2021-06-05 21:23 Sven Wegener
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox