* bugs #106784 and #106974

(Portage version: 2.0.53_rc7)

8 files changed, 61 insertions, 18 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 0aac9bd4993a..ee19709ce082 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.97 2005/11/11 00:13:22 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.98 2005/11/12 00:11:09 voxus Exp $
+
+*bind-9.3.2_beta2-r2 (12 Nov 2005)
+*bind-9.3.1-r8 (12 Nov 2005)
+*bind-9.2.5-r10 (12 Nov 2005)
+
+  12 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> -bind-9.2.5-r9.ebuild,
+  -bind-9.3.1-r7.ebuild, -bind-9.3.2_beta2-r1.ebuild, +bind-9.2.5-r10.ebuild,
+  +bind-9.3.1-r8.ebuild, +bind-9.3.2_beta2-r2.ebuild:
+  Closing bugs #106784 and #106974.
 
 *bind-9.3.2_beta2-r1 (11 Nov 2005)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 97e6cabd900e..99f1ecd296e4 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,19 +1,19 @@
-MD5 b25f669cdd250ff0b51200e61b0dd58a ChangeLog 16254
+MD5 ac62509ef401820e7b8d24b8fcaf0b9a ChangeLog 16595
+MD5 ffcb9ef3c79b203e0c97e817c2a38bc7 bind-9.2.5-r10.ebuild 8944
 MD5 2c50194cee9e7484dc5ac78935fdf0d5 bind-9.2.5-r4.ebuild 8347
 MD5 109211a7fac00f530ce0d255763f24b2 bind-9.2.5-r6.ebuild 8376
-MD5 e1e5ea7060eedb1d883f5280b6758505 bind-9.2.5-r9.ebuild 8636
-MD5 75105df4c58ab96c51005ebc66ea71d3 bind-9.3.1-r7.ebuild 8423
-MD5 c17a3d3cd24b1063e5847ce2a083dd8d bind-9.3.2_beta2-r1.ebuild 8524
+MD5 bcca1ddee2fc1d346d99bec0cdaddc2a bind-9.3.1-r8.ebuild 8731
+MD5 98603e823ca18379230c9f8803368486 bind-9.3.2_beta2-r2.ebuild 8832
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
 MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
 MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
 MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r10 127
 MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r4 127
 MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r6 127
-MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r9 127
-MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r7 133
-MD5 addc10df4c379ce1a155b87c2d415e11 files/digest-bind-9.3.2_beta2-r1 136
+MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r8 133
+MD5 addc10df4c379ce1a155b87c2d415e11 files/digest-bind-9.3.2_beta2-r2 136
 MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
 MD5 2b6e7c10f43941cdd147d5de0c9c02d6 files/localhost.zone-r1 419
diff --git a/net-dns/bind/bind-9.2.5-r9.ebuild b/net-dns/bind/bind-9.2.5-r10.ebuild
index 07cb4162904b..0c647a190a30 100644
--- a/net-dns/bind/bind-9.2.5-r9.ebuild
+++ b/net-dns/bind/bind-9.2.5-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r9.ebuild,v 1.1 2005/11/09 09:25:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r10.ebuild,v 1.1 2005/11/12 00:11:09 voxus Exp $
 
 inherit eutils libtool
 
@@ -107,13 +107,15 @@ src_compile() {
 			ewarn "Because of this BIND MUST only run with a single thread when"
 			ewarn "using the MySQL driver."
 			echo
-			myconf="${myconf} --disable-threads"
+			myconf="${myconf} --disable-linux-caps --disable-threads"
 			einfo "Threading support disabled"
 			epause 10
 		else
 			myconf="${myconf} --enable-linux-caps --enable-threads"
 			einfo "Threading support enabled"
 		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
 	fi
 
 	econf \
@@ -196,7 +198,15 @@ src_install() {
 
 pkg_postinst() {
 	if [ ! -f '/etc/bind/rndc.key' ]; then
-		/usr/sbin/rndc-confgen -a -u named
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
 	fi
 
 	install -d -o named -g named ${ROOT}/var/run/named \
diff --git a/net-dns/bind/bind-9.3.1-r7.ebuild b/net-dns/bind/bind-9.3.1-r8.ebuild
index 5d7adc25ab0b..1dd5da486ad6 100644
--- a/net-dns/bind/bind-9.3.1-r7.ebuild
+++ b/net-dns/bind/bind-9.3.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1-r7.ebuild,v 1.1 2005/11/09 09:25:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1-r8.ebuild,v 1.1 2005/11/12 00:11:09 voxus Exp $
 
 inherit eutils libtool
 
@@ -99,13 +99,15 @@ src_compile() {
 			ewarn "Because of this BIND MUST only run with a single thread when"
 			ewarn "using the MySQL driver."
 			echo
-			myconf="${myconf} --disable-threads"
+			myconf="${myconf} --disable-linux-caps --disable-threads"
 			einfo "Threading support disabled"
 			epause 10
 		else
 			myconf="${myconf} --enable-linux-caps --enable-threads"
 			einfo "Threading support enabled"
 		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
 	fi
 
 	econf \
@@ -197,7 +199,15 @@ src_install() {
 
 pkg_postinst() {
 	if [ ! -f '/etc/bind/rndc.key' ]; then
-		/usr/sbin/rndc-confgen -a -u named
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
 	fi
 
 	install -d -o named -g named ${ROOT}/var/run/named \
diff --git a/net-dns/bind/bind-9.3.2_beta2-r1.ebuild b/net-dns/bind/bind-9.3.2_beta2-r2.ebuild
index b1d6f1de7205..8590823b21a4 100644
--- a/net-dns/bind/bind-9.3.2_beta2-r1.ebuild
+++ b/net-dns/bind/bind-9.3.2_beta2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2_beta2-r1.ebuild,v 1.1 2005/11/11 00:13:22 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2_beta2-r2.ebuild,v 1.1 2005/11/12 00:11:09 voxus Exp $
 
 inherit eutils libtool
 
@@ -103,13 +103,15 @@ src_compile() {
 			ewarn "Because of this BIND MUST only run with a single thread when"
 			ewarn "using the MySQL driver."
 			echo
-			myconf="${myconf} --disable-threads"
+			myconf="${myconf} --disable-linux-caps --disable-threads"
 			einfo "Threading support disabled"
 			epause 10
 		else
 			myconf="${myconf} --enable-linux-caps --enable-threads"
 			einfo "Threading support enabled"
 		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
 	fi
 
 	econf \
@@ -171,9 +173,13 @@ src_install() {
 	keepdir /var/bind/sec
 
 	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+
 	# ftp://ftp.rs.internic.net/domain/named.ca:
 	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost-r1}.zone
+
+	insinto /var/bind/pri
+	doins ${FILESDIR}/127.zone
+	newins ${FILESDIR}/localhost.zone-r1 localhost.zone
 
 	cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
 	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
@@ -201,7 +207,15 @@ src_install() {
 
 pkg_postinst() {
 	if [ ! -f '/etc/bind/rndc.key' ]; then
-		/usr/sbin/rndc-confgen -a -u named
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
 	fi
 
 	install -d -o named -g named ${ROOT}/var/run/named \
diff --git a/net-dns/bind/files/digest-bind-9.2.5-r9 b/net-dns/bind/files/digest-bind-9.2.5-r10
index 917f82e7d0d6..917f82e7d0d6 100644
--- a/net-dns/bind/files/digest-bind-9.2.5-r9
+++ b/net-dns/bind/files/digest-bind-9.2.5-r10
diff --git a/net-dns/bind/files/digest-bind-9.3.1-r7 b/net-dns/bind/files/digest-bind-9.3.1-r8
index 4307a2849697..4307a2849697 100644
--- a/net-dns/bind/files/digest-bind-9.3.1-r7
+++ b/net-dns/bind/files/digest-bind-9.3.1-r8
diff --git a/net-dns/bind/files/digest-bind-9.3.2_beta2-r1 b/net-dns/bind/files/digest-bind-9.3.2_beta2-r2
index bf2d44cec878..bf2d44cec878 100644
--- a/net-dns/bind/files/digest-bind-9.3.2_beta2-r1
+++ b/net-dns/bind/files/digest-bind-9.3.2_beta2-r2