Move chroot location from /var/empty to /var/lib/powerdns, update init script and example configuration to reflect this. This should fix bug #181343 and enable full support for rec_control. Thanks to Jefferson Noxon.

Package-Manager: portage-2.1.2.9

7 files changed, 92 insertions, 23 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index 57a098977b9a..54577c3aab53 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.12 2007/03/18 11:27:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.13 2007/06/08 22:28:14 swegener Exp $
+
+  08 Jun 2007; Sven Wegener <swegener@gentoo.org>
+  +files/pdns-recursor-3.1.4-chdir.patch,
+  +files/pdns-recursor-3.1.4-statedir.patch, files/precursor,
+  files/recursor.conf, pdns-recursor-3.1.4.ebuild:
+  Move chroot location from /var/empty to /var/lib/powerdns, update init
+  script and example configuration to reflect this. This should fix bug
+  #181343 and enable full support for rec_control. Thanks to Jefferson Noxon.
 
   18 Mar 2007; Simon Stelling <blubb@gentoo.org> pdns-recursor-3.1.4.ebuild:
   stable on amd64; bug 169540
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 21fbb3cff8bb..95a698240ac4 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,20 +1,31 @@
-AUX precursor 501 RMD160 89beca9ada438592c409ad972d95eb264b934eff SHA1 f0cce888bc63d0bb53b55657eef8aae6f1753443 SHA256 a7e50ea28fd4453accdbe4f457ffe492585c8e8c5f84f330bf9a290aa6d000a1
-MD5 269ab7656f23317e2d4fb1015f855ed3 files/precursor 501
-RMD160 89beca9ada438592c409ad972d95eb264b934eff files/precursor 501
-SHA256 a7e50ea28fd4453accdbe4f457ffe492585c8e8c5f84f330bf9a290aa6d000a1 files/precursor 501
-AUX recursor.conf 445 RMD160 99d1e4ac4cda6cf0b71f57dbb042633c2668c448 SHA1 e16533d078b2733ad01ead6eb4fdd6f59e41b9db SHA256 2f1931be48c333ed088cb1e3c0ada0e751c3909cee4bc8f9f63ae89ac2edc12a
-MD5 67f0a128d86501d8b6a9b554c4dc1eca files/recursor.conf 445
-RMD160 99d1e4ac4cda6cf0b71f57dbb042633c2668c448 files/recursor.conf 445
-SHA256 2f1931be48c333ed088cb1e3c0ada0e751c3909cee4bc8f9f63ae89ac2edc12a files/recursor.conf 445
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pdns-recursor-3.1.4-chdir.patch 564 RMD160 c5bc904a0acb653c1606778188f10f93294970d9 SHA1 f0b6c1056ab922eae234e49fddd5d9f243c199b7 SHA256 3c0b38f7db7c776c71af0b2a0e65d06d17c652b383a074dd22b25fada8687934
+MD5 d8ecaa8b6db40006487d5fb81dbb4ce0 files/pdns-recursor-3.1.4-chdir.patch 564
+RMD160 c5bc904a0acb653c1606778188f10f93294970d9 files/pdns-recursor-3.1.4-chdir.patch 564
+SHA256 3c0b38f7db7c776c71af0b2a0e65d06d17c652b383a074dd22b25fada8687934 files/pdns-recursor-3.1.4-chdir.patch 564
+AUX pdns-recursor-3.1.4-statedir.patch 408 RMD160 add6387697e8b4bd7a1586073190466b65f69d92 SHA1 a866906a286c7554f55b3799a8e4b608442c0f5d SHA256 08f09089d0b3dd9fb8ddca5ceb0c198ce397cef42badc8c874308bf9cfcfea0b
+MD5 f43e9ca0d6f68093bde7eb57d8f22689 files/pdns-recursor-3.1.4-statedir.patch 408
+RMD160 add6387697e8b4bd7a1586073190466b65f69d92 files/pdns-recursor-3.1.4-statedir.patch 408
+SHA256 08f09089d0b3dd9fb8ddca5ceb0c198ce397cef42badc8c874308bf9cfcfea0b files/pdns-recursor-3.1.4-statedir.patch 408
+AUX precursor 580 RMD160 71be0984e72763e09173b81f7a76bb5df56667a6 SHA1 ea316b070e8eb123f02e24cd60c568b4dd5aefc6 SHA256 f17d76262bea558604fa01e9d661bbb54af387bd976b54a8a59f7ad4a5a56014
+MD5 54493342aadf0ef1708ac5b325b721fe files/precursor 580
+RMD160 71be0984e72763e09173b81f7a76bb5df56667a6 files/precursor 580
+SHA256 f17d76262bea558604fa01e9d661bbb54af387bd976b54a8a59f7ad4a5a56014 files/precursor 580
+AUX recursor.conf 452 RMD160 6708700e955dd29041e360d5f0a68c9d3293d665 SHA1 455cbbd4335dbd032b2274498044ba680693d306 SHA256 b36b3310a26785d5e8a38c03bce9afcf8a08e321a81ee385e9557dcaa3957255
+MD5 a3743478ef0877353bec730d4e0c11aa files/recursor.conf 452
+RMD160 6708700e955dd29041e360d5f0a68c9d3293d665 files/recursor.conf 452
+SHA256 b36b3310a26785d5e8a38c03bce9afcf8a08e321a81ee385e9557dcaa3957255 files/recursor.conf 452
 DIST pdns-recursor-3.1.4.tar.bz2 139191 RMD160 0c71b6817a274d85424164bfb88c482edff144b4 SHA1 d1fa344ec5f2feb12397361f92b011a0cb726d48 SHA256 9975ec73e311bda4c22f302f18f4ed4fe701d63bce3155f300ccc561d5b0cc39
-EBUILD pdns-recursor-3.1.4.ebuild 1017 RMD160 d93fa3fe7ab802f6fe6e7cf2c361207758f7a5fb SHA1 a690d0090642f99ca7a19477917465aafbe223cd SHA256 6415507329d35e8fc5acee31a07064b5b6e6f863e329cd1d53aa532894555952
-MD5 825a9611e42cc9400bf931fb73da7d6c pdns-recursor-3.1.4.ebuild 1017
-RMD160 d93fa3fe7ab802f6fe6e7cf2c361207758f7a5fb pdns-recursor-3.1.4.ebuild 1017
-SHA256 6415507329d35e8fc5acee31a07064b5b6e6f863e329cd1d53aa532894555952 pdns-recursor-3.1.4.ebuild 1017
-MISC ChangeLog 2002 RMD160 34e628360bebcdfc130b4891f7c7a50fb325611a SHA1 b7843d2653289843c6c364f7ff060f704541f546 SHA256 4f7ca5b06555a095f0777b9d5f13b7639e81a32701c0d0c24794335e562addc0
-MD5 c9de63f540d4246fd03e79d6027c71a4 ChangeLog 2002
-RMD160 34e628360bebcdfc130b4891f7c7a50fb325611a ChangeLog 2002
-SHA256 4f7ca5b06555a095f0777b9d5f13b7639e81a32701c0d0c24794335e562addc0 ChangeLog 2002
+EBUILD pdns-recursor-3.1.4.ebuild 1264 RMD160 846b2fba7582bb6d28a214cf36a63a62eff7bb77 SHA1 7fdbbccf6ab69ffb0ae0b3b568d49b171b1948ad SHA256 68e72563ba958900be3fe1283530ecc8a9f387de993a2cb12532fbea1a369865
+MD5 676e493ddcd384f76cfc170152b3cbb9 pdns-recursor-3.1.4.ebuild 1264
+RMD160 846b2fba7582bb6d28a214cf36a63a62eff7bb77 pdns-recursor-3.1.4.ebuild 1264
+SHA256 68e72563ba958900be3fe1283530ecc8a9f387de993a2cb12532fbea1a369865 pdns-recursor-3.1.4.ebuild 1264
+MISC ChangeLog 2434 RMD160 89db75a1a1c626090aeee9d822042aee3b46bd11 SHA1 f0c3cdd6105051c730ce478afe1a7f9edce4cbf7 SHA256 4a014a843d9125d738bcb2faeda0748e56cb889a6c46456e846388d9ea4c77db
+MD5 45972a3211f4a0d75efee5033feb4c47 ChangeLog 2434
+RMD160 89db75a1a1c626090aeee9d822042aee3b46bd11 ChangeLog 2434
+SHA256 4a014a843d9125d738bcb2faeda0748e56cb889a6c46456e846388d9ea4c77db ChangeLog 2434
 MISC metadata.xml 837 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 SHA1 4b574c68576b1c058956085df7a07e250361455c SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b
 MD5 5fd39b9552a8c80d492e32bba6cffda0 metadata.xml 837
 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 metadata.xml 837
@@ -22,3 +33,10 @@ SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b metadata
 MD5 e3a9d8066b97ed39d65c1d13b934316d files/digest-pdns-recursor-3.1.4 262
 RMD160 dbde2237f2e112f64d2113f7dbc4ee10464f4010 files/digest-pdns-recursor-3.1.4 262
 SHA256 d6e9cba91bea306d197feecbe88e5a4504a9aaa4d2e6275e49851d75eaf30f08 files/digest-pdns-recursor-3.1.4 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGadgJI1lqEGTUzyQRAkGoAJ0SwbQVSm1AsHulBJu9l9e07ajjxACgqSxS
+Gfs8Ui5bvhwxdBqHlJWpOB4=
+=75ZI
+-----END PGP SIGNATURE-----
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch
new file mode 100644
index 000000000000..25e1c6b73006
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch
@@ -0,0 +1,14 @@
+diff -Nur pdns-recursor-3.1.4.orig/pdns_recursor.cc pdns-recursor-3.1.4/pdns_recursor.cc
+--- pdns-recursor-3.1.4.orig/pdns_recursor.cc	2006-11-12 16:56:13.000000000 +0000
++++ pdns-recursor-3.1.4/pdns_recursor.cc	2007-06-08 22:05:35.551419115 +0000
+@@ -1565,6 +1565,10 @@
+     }
+   }
+   
++  // this is needed to really get into the chroot. and even without chroot
++  // enabled it's nice to not block the directory we're currently in.
++  chdir("/");
++  
+   Utility::dropPrivs(newuid, newgid);
+   g_fdm->addReadFD(s_rcc.d_fd, handleRCC); // control channel
+ #endif 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch
new file mode 100644
index 000000000000..db1a33c01780
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch
@@ -0,0 +1,10 @@
+diff -Nur pdns-recursor-3.1.4.orig/config.h pdns-recursor-3.1.4/config.h
+--- pdns-recursor-3.1.4.orig/config.h	2006-11-12 16:56:13.000000000 +0000
++++ pdns-recursor-3.1.4/config.h	2007-06-08 21:54:26.227713454 +0000
+@@ -1,5 +1,5 @@
+ #define SYSCONFDIR "/etc/powerdns/" 
+-#define LOCALSTATEDIR "/var/run/" 
++#define LOCALSTATEDIR "/var/run/powerdns" 
+ #define VERSION "3.1.4"
+ #define RECURSOR
+ #ifndef WIN32
diff --git a/net-dns/pdns-recursor/files/precursor b/net-dns/pdns-recursor/files/precursor
index 1b185ed81d2d..be4f20efc040 100644
--- a/net-dns/pdns-recursor/files/precursor
+++ b/net-dns/pdns-recursor/files/precursor
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/files/precursor,v 1.3 2006/10/27 16:40:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/files/precursor,v 1.4 2007/06/08 22:28:14 swegener Exp $
+
+opts="ping"
 
 depend() {
 	need net
@@ -15,6 +17,12 @@ start() {
 
 stop() {
 	ebegin "Stopping PowerDNS Recursor"
-	start-stop-daemon --stop --quiet --pidfile=/var/run/pdns_recursor.pid
+	/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
index b4bf3b6d6a78..df3cc2509dfb 100644
--- a/net-dns/pdns-recursor/files/recursor.conf
+++ b/net-dns/pdns-recursor/files/recursor.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/files/recursor.conf,v 1.1 2006/04/30 00:14:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/files/recursor.conf,v 1.2 2007/06/08 22:28:14 swegener Exp $
 
 # Drop uid
 setuid=nobody
@@ -18,4 +18,4 @@ local-address=127.0.0.1
 local-port=53
 
 # Change root for safety
-chroot=/var/empty
+chroot=/var/lib/powerdns
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
index 8edd3ccf5ff9..8c87d1b71125 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild,v 1.3 2007/03/18 11:27:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild,v 1.4 2007/06/08 22:28:14 swegener Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -17,6 +17,14 @@ DEPEND=">=dev-libs/boost-1.33.1"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-statedir.patch
+	epatch "${FILESDIR}"/${P}-chdir.patch
+}
+
 src_compile() {
 	filter-flags -ftree-vectorize
 
@@ -37,5 +45,8 @@ src_install() {
 
 	doinitd "${FILESDIR}"/precursor || die "doinitd failed"
 
-	keepdir /var/empty
+	# Pretty ugly, uh?
+	keepdir /var/lib/powerdns/var/run/powerdns
+	dodir /var/run
+	dosym /var/lib/powerdns/var/run/powerdns /var/run/powerdns
 }