Rephrase the chroot part of pkg_postinst and /etc/conf.d/named as suggested in bug 321457, thanks to Duncan <1i5t5.duncan@cox.net>.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 28 insertions, 24 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 2fca3ebd5675..96b101d67d8c 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.276 2010/06/03 16:57:17 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.277 2010/06/05 09:38:08 idl0r Exp $
+
+  05 Jun 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.6.2_p2.ebuild,
+  bind-9.7.0_p2-r1.ebuild, files/named.confd-r3:
+  Rephrase the chroot part of pkg_postinst and /etc/conf.d/named as
+  suggested in bug 321457, thanks to Duncan <1i5t5.duncan@cox.net>.
 
   03 Jun 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.6.2_p2.ebuild,
   bind-9.7.0_p2-r1.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 387790d36752..d9ee034b1585 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,7 +13,7 @@ AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b15754
 AUX named.conf-r3 1317 RMD160 dace9861fb15a7ad415b23f2452fca5eb3ef2604 SHA1 02385c388d4ca99f68354c83f9e4cae2c2bcb034 SHA256 f431592c2441a27205e1112dcff7b9b07655007c460a309b7968c97688c8e7f4
 AUX named.conf-r4 5254 RMD160 107e4c5dd5c6dbd1bcdf1c789bc24fd8d2cf5b57 SHA1 646ea61a897ceb32be99ddadb521f0a219b29fef SHA256 b652b156e7ba169c899e08523ea506c3987562c8278db0a8234b3e82f5fce1a6
 AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915
-AUX named.confd-r3 648 RMD160 bb184a1f4d7476e874df37dd0b60638d6da608cb SHA1 21987e0fd4419276efb2d9551d2bde18eece6fb8 SHA256 6daf6f9eddc822eb434dcc651627f3dd8bdfbfa270b1b089724a87dc5fcc559a
+AUX named.confd-r3 662 RMD160 18b9aeca24d72aef61664432b20122a2dd871964 SHA1 e819d037d53043c34925c500e9fd4e62141192ba SHA256 0f4b5445b4e2717bf50a8685ade77258d6d7d530ebed0bbe4c022f422e3a9b9a
 AUX named.init-r5 1620 RMD160 37279362e437241188a07e5f274730e68645827e SHA1 00a14819a322b391183084c79cc9a4dc04d0d484 SHA256 07fb9d653f086319680d04abde0218495ed09d3528087257788bf294252a0bad
 AUX named.init-r7 3467 RMD160 e72e8ffd6d983fe38a16334bfc45a6cc012a9a0e SHA1 af42e2d0f3ab1f23c4656bd761c8ce55588d668f SHA256 e44f6b20edfd0a56823fc954096c75f36830b4ab6c9bab3de2daa3816d5f14b5
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
@@ -24,14 +24,14 @@ DIST bind-geoip-1.3.patch 54070 RMD160 5d01a20104b572588507aea4b8f6cbf66f68a973
 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0 SHA1 8320223ec6b82e8988ca23f994457175c25caef0 SHA256 ae0e300cc78a666ef49c7f84432c14f4238b7017e7b579054e54397c28946e3e
-EBUILD bind-9.6.2_p2.ebuild 9746 RMD160 0870821cce663cd792f55d843b4bb6c002312d13 SHA1 119eb3bd0f742592e88f68ce9164a6f8821e8c88 SHA256 cda63fa1b2907323723e03736c87d1da7f7cfd2e1421ffe2710425521d4d1ecf
-EBUILD bind-9.7.0_p2-r1.ebuild 9771 RMD160 5b3fdf1a2b8bb52c8ebd56b1f58b03c9616d1916 SHA1 c9b0771df8199c606ad7320593e640be5a257e8f SHA256 3592591a9052f136775527f72598793cd913942be9057e94779fe2c5d103125f
-MISC ChangeLog 45437 RMD160 d49318a7f118b82192e0943e4ca34242f78f6304 SHA1 a9ae32157c76cdac9792228e018a13fd6b9baa58 SHA256 37e025aa26b90a89c870687f0f47a0b0c86af435b5f69e15eadec7418d139050
+EBUILD bind-9.6.2_p2.ebuild 9670 RMD160 e3049f07560eedbd98d71a032541c6731e751c20 SHA1 a474c5a85621d06ffe637c2be36d881279d8cdb5 SHA256 fe17a57c1bc7a0fe963bd7cc577660e36c5962bfd2ffb23445b86f3254a5f866
+EBUILD bind-9.7.0_p2-r1.ebuild 9695 RMD160 f4931d7b5bf0c0d30bff9daf037423ffbf7ae8b1 SHA1 e15152395bec376a2d335f1c553c8bd19aed1c9d SHA256 464029399b1b531efc0c5ceacf6ad581bf5a977a438f0a65a7073f98230ab6ab
+MISC ChangeLog 45697 RMD160 6084381ff64e3a3a18349cb862e2c8439fe237c8 SHA1 40381a2f84611ac4acb045f614d72984a5814687 SHA256 380d58765035e799e4973d9d84bcebbd17e4b448dc3dc08bd6e44fa33c7b2625
 MISC metadata.xml 737 RMD160 0cbffb033579ba6f469d170bb62ba69f0563cae5 SHA1 6e94367e2ae674bf79564ea9cf2e1ed0a3a6bd5b SHA256 3ab38734eb17c86f947d58737ec5d85031ac5d2a18fc489dd1f925b128e4c738
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwH3vcACgkQixe2jn+ufTjbQgCghw+61qhE+BY214BIxbol9Ooe
-UDUAnj5+nT8RGqFTLc/fHMmlvmHFQtIc
-=vJST
+iEYEARECAAYFAkwKGwYACgkQixe2jn+ufTi6XACfVoD93zI1p1tKmX3/gbHynRUv
+YEIAn2Cc9JaUii08UmR95rzIl9E3LF43
+=RqTo
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.6.2_p2.ebuild b/net-dns/bind/bind-9.6.2_p2.ebuild
index bfacc43c73d9..d3ec553e9ab5 100644
--- a/net-dns/bind/bind-9.6.2_p2.ebuild
+++ b/net-dns/bind/bind-9.6.2_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.2 2010/06/03 16:57:18 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.3 2010/06/05 09:38:08 idl0r Exp $
 
 EAPI="3"
 
@@ -262,11 +262,10 @@ pkg_postinst() {
 	einfo
 	einfo "You can edit /etc/conf.d/named to customize named settings"
 	einfo
-	einfo "If you like to run bind in chroot AND this is a new install OR"
-	einfo "your bind doesn't already run in chroot, simply run:"
-	einfo "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo "Before running the above command you might want to change the chroot"
-	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
 	einfo
 
 	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
diff --git a/net-dns/bind/bind-9.7.0_p2-r1.ebuild b/net-dns/bind/bind-9.7.0_p2-r1.ebuild
index 255760bf39aa..6cdd8029e497 100644
--- a/net-dns/bind/bind-9.7.0_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.7.0_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.2 2010/06/03 16:57:17 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.3 2010/06/05 09:38:08 idl0r Exp $
 
 EAPI="3"
 
@@ -262,11 +262,10 @@ pkg_postinst() {
 	einfo
 	einfo "You can edit /etc/conf.d/named to customize named settings"
 	einfo
-	einfo "If you like to run bind in chroot AND this is a new install OR"
-	einfo "your bind doesn't already run in chroot, simply run:"
-	einfo "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo "Before running the above command you might want to change the chroot"
-	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
 	einfo
 
 	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
diff --git a/net-dns/bind/files/named.confd-r3 b/net-dns/bind/files/named.confd-r3
index 3d1694b516ee..959514fd97f5 100644
--- a/net-dns/bind/files/named.confd-r3
+++ b/net-dns/bind/files/named.confd-r3
@@ -9,10 +9,11 @@ OPTIONS=""
 # RNDC needs to be told what server we're using sometimes.
 #SERVER="-s 127.0.0.1"
 
-# If you wish to run bind in a chroot, run:
-# emerge --config =<bind-version>
-# and un-comment the following line.
-# You can specify a different chroot directory but MAKE SURE it's empty.
+# If you wish to run bind in a chroot:
+# 1) un-comment the CHROOT= assignment, below. You may use
+#    a different chroot directory but MAKE SURE it's empty.
+# 2) run: emerge --config =<bind-version>
+#
 # CHROOT="/chroot/dns"
 
 # Default pid file location