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

["Sven Wegener" <swegener@gentoo.org>]

commit:     ff3fb60e40daf53c31d241107e8ffb3497d11583
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 21:08:11 2016 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 22:02:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3fb60e

net-dns/pdns-recursor: Switch src_install() to upstream automake

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

 net-dns/pdns-recursor/files/pdns-recursor        |  4 ++--
 net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor b/net-dns/pdns-recursor/files/pdns-recursor
index 151176b..f114d5b 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor
+++ b/net-dns/pdns-recursor/files/pdns-recursor
@@ -17,12 +17,12 @@ start() {
 
 stop() {
 	ebegin "Stopping PowerDNS Recursor"
-	/usr/sbin/rec_control quit &>/dev/null
+	/usr/bin/rec_control quit &>/dev/null
 	eend $?
 }
 
 ping() {
 	ebegin "Pinging PowerDNS Recursor"
-	/usr/sbin/rec_control ping &>/dev/null
+	/usr/bin/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 4fd1a47..3927726 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
@@ -44,11 +44,16 @@ src_configure() {
 }
 
 src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
+	default
 
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=/quiet=on/' \
+		-e 's/^# chroot=/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
 
 	doinitd "${FILESDIR}"/pdns-recursor