From 393659df4d7ee528efa246d674038918e551d3e4 Mon Sep 17 00:00:00 2001
From: Sven Wegener <swegener@gentoo.org>
Date: Wed, 11 Mar 2020 14:26:18 +0100
Subject: [PATCH] net-dns/pdns-recursor: Revision bump for new acct packages

This also uses the new users for dropping privileges.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sven Wegener <swegener@gentoo.org>
---
 net-dns/pdns-recursor/files/pdns-recursor-r2  | 41 +++++++++++++++++++
 ...0.ebuild => pdns-recursor-4.3.0-r1.ebuild} | 10 ++---
 2 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 net-dns/pdns-recursor/files/pdns-recursor-r2
 rename net-dns/pdns-recursor/{pdns-recursor-4.3.0.ebuild => pdns-recursor-4.3.0-r1.ebuild} (91%)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
new file mode 100644
index 000000000000..01ce79167bbc
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# 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/pdns-recursor"
+
+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} --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"
+
+pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
+
+control_command="/usr/bin/rec_control"
+control_command_args="${command_args}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+}
+
+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.3.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
similarity index 91%
rename from net-dns/pdns-recursor/pdns-recursor-4.3.0.ebuild
rename to net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
index d3ed153e567d..fa5437a3d388 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.0.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
@@ -27,7 +27,9 @@ DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
 	!libressl? ( dev-libs/openssl:= )
 	>=dev-libs/boost-1.35:="
 RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
@@ -54,14 +56,12 @@ src_install() {
 
 	# set defaults: setuid=nobody, setgid=nobody
 	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
 		-e 's/^# quiet=$/quiet=on/' \
 		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
 		"${D}"/etc/powerdns/recursor.conf
 
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
 }
 
 pkg_postinst() {
-- 
2.26.2