* be more accuracy

Package-Manager: portage-2.0.52-r1

7 files changed, 28 insertions, 16 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 4e846149e4fd..28d016b26e8a 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.90 2005/09/30 18:47:17 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.91 2005/09/30 22:33:25 voxus Exp $
+
+*bind-9.2.5-r8 (01 Oct 2005)
+*bind-9.3.1-r6 (01 Oct 2005)
+
+  01 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +bind-9.2.5-r8.ebuild,
+  +bind-9.3.1-r6.ebuild, -bind-9.2.5-r7.ebuild, -bind-9.3.1-r5.ebuild,
+  -files/named.init-r1, +files/named.init-r2:
+  Be more accuracy when looking for pid-file. Thanks to Kerin Millar
+  <kerframil@gmail.com>. Updated named.conf.
 
 *bind-9.2.5-r7 (30 Sep 2005)
 *bind-9.3.1-r5 (30 Sep 2005)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2bc217488952..f98fd20f1a5c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,7 +1,7 @@
 MD5 ec4d3894133e0f89758ceb92e83f0b8d bind-9.2.5-r6.ebuild 8220
-MD5 116a44d4a6c9dd07b514af8d352ea1be bind-9.2.5-r7.ebuild 8235
-MD5 f211df30b2bd2cc71ecc9a1bf5634113 bind-9.3.1-r5.ebuild 8042
-MD5 35d84954e4368b8b3b32ac7397c16e44 ChangeLog 14405
+MD5 567da761355ebedae07a39ab212f5f85 bind-9.2.5-r8.ebuild 8235
+MD5 334afa45d7662c79de03b559e98c53f0 bind-9.3.1-r6.ebuild 8042
+MD5 6ec5b5ad581350245f7a4b077906a7e4 ChangeLog 14773
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 MD5 59dbb3246bd5abb0459f7b1c1bbc553b bind-9.2.5-r4.ebuild 8189
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
@@ -9,12 +9,12 @@ MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
 MD5 620cf3c88d615f841884ee25bc8f8397 files/named.init 1641
 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-r7 127
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r8 127
 MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488
-MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r5 133
+MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r6 133
 MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
 MD5 0eab8a4d5b98b79f76b136ab0dffabcf files/named.rc6-smart_pid_fix 1204
-MD5 6f925c22019510e35407dc7568d0c55d files/named.init-r1 1421
+MD5 79c3a341943b393cef4833480deace2d files/named.init-r2 1481
 MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
 MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
diff --git a/net-dns/bind/bind-9.2.5-r7.ebuild b/net-dns/bind/bind-9.2.5-r8.ebuild
index 70f250617823..834a9ccc6075 100644
--- a/net-dns/bind/bind-9.2.5-r7.ebuild
+++ b/net-dns/bind/bind-9.2.5-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.2.5-r7.ebuild,v 1.1 2005/09/30 18:47:17 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r8.ebuild,v 1.1 2005/09/30 22:33:25 voxus Exp $
 
 inherit eutils libtool
 
@@ -149,12 +149,12 @@ src_install() {
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
 
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r2 named.conf
+	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}.zone
 
-	cp ${FILESDIR}/named.init-r1 ${T}/named && doinitd ${T}/named
+	cp ${FILESDIR}/named.init-r2 ${T}/named && doinitd ${T}/named
 	cp ${FILESDIR}/named.confd ${T}/named && doconfd ${T}/named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
diff --git a/net-dns/bind/bind-9.3.1-r5.ebuild b/net-dns/bind/bind-9.3.1-r6.ebuild
index 23d16670332b..4176f4e54335 100644
--- a/net-dns/bind/bind-9.3.1-r5.ebuild
+++ b/net-dns/bind/bind-9.3.1-r6.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-r5.ebuild,v 1.1 2005/09/30 18:47:17 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1-r6.ebuild,v 1.1 2005/09/30 22:33:25 voxus Exp $
 
 inherit eutils libtool
 
@@ -150,12 +150,12 @@ src_install() {
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
 
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r2 named.conf
+	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}.zone
 
-	cp ${FILESDIR}/named.init-r1 ${T}/named && doinitd ${T}/named
+	cp ${FILESDIR}/named.init-r2 ${T}/named && doinitd ${T}/named
 	cp ${FILESDIR}/named.confd ${T}/named && doconfd ${T}/named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
diff --git a/net-dns/bind/files/digest-bind-9.2.5-r7 b/net-dns/bind/files/digest-bind-9.2.5-r8
index 917f82e7d0d6..917f82e7d0d6 100644
--- a/net-dns/bind/files/digest-bind-9.2.5-r7
+++ b/net-dns/bind/files/digest-bind-9.2.5-r8
diff --git a/net-dns/bind/files/digest-bind-9.3.1-r5 b/net-dns/bind/files/digest-bind-9.3.1-r6
index 4307a2849697..4307a2849697 100644
--- a/net-dns/bind/files/digest-bind-9.3.1-r5
+++ b/net-dns/bind/files/digest-bind-9.3.1-r6
diff --git a/net-dns/bind/files/named.init-r1 b/net-dns/bind/files/named.init-r2
index e57158257e3d..65804e112141 100755
--- a/net-dns/bind/files/named.init-r1
+++ b/net-dns/bind/files/named.init-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r1,v 1.1 2005/09/30 18:47:17 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r2,v 1.1 2005/09/30 22:33:25 voxus Exp $
 
 opts="start stop reload restart"
 
@@ -23,8 +23,11 @@ checkconfig() {
 
 	# as suggested in bug #107724
 	PIDFILE=$(\
-		grep -Eo -m1 "^[^#\"]*pid\-file +\".+\" *;" \
-		${CHROOT}/etc/bind/named.conf | cut -d\" -f2\
+		egrep -v \
+			"^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \
+			${CHROOT}/etc/bind/named.conf \
+				| egrep -o -m1 "pid\-file +\".+\" *;" \
+				| cut -d\" -f2
 	)
 
 	KEY="${CHROOT}/etc/bind/rndc.key"