closing bugs #89358, #65335 and #79875.

(Portage version: 2.0.51.19)

7 files changed, 69 insertions, 16 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 42f812076b96..7dccb04b2e92 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,16 @@
 # 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.68 2005/04/13 12:15:38 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.69 2005/04/17 12:32:57 voxus Exp $
+
+*bind-9.2.5-r2 (15 Apr 2005)
+
+  15 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -bind-9.2.5-r1.ebuild,
+  +bind-9.2.5-r2.ebuild, -bind-9.3.1.ebuild, +bind-9.3.1-r1.ebuild,
+  +files/named.rc6-smart_pid_fix:
+  Dropped "caps" use flag. Capabilities now automatically enabled by ebuild,
+  if "threads" is used. Closes bug #89358.
+  Yet again fixed init-script, closes bug #65335 and bug #79875.
+  Patch provided by Jacob Joseph <jmjoseph@andrew.cmu.edu>.
 
   13 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> bind-9.2.5.ebuild,
   bind-9.2.5-r1.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index b1c170f93554..0f7d25cb7b49 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,18 +1,19 @@
-MD5 9f7dea33e1132bbae02875052bd9cd6b bind-9.3.1.ebuild 6269
 MD5 23c809afe06852c286f137645287abb4 bind-9.2.2-r3.ebuild 5708
-MD5 41eebc8973c7c87461ef99c2886cfdea bind-9.2.5-r1.ebuild 7772
 MD5 3f909526d2f9c2fe800ae4d69c6757d6 bind-9.2.5.ebuild 7473
-MD5 a624f16d816a7a7905f793bf0f28e640 ChangeLog 10921
+MD5 017cc8f9c8570b9e543e264d076349f5 bind-9.3.1-r1.ebuild 6265
+MD5 186ca304f292db46e0d871a9c0399e44 bind-9.2.5-r2.ebuild 7768
+MD5 bb25ca8a944b67b3b35ae48ced74a385 ChangeLog 11376
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
 MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
 MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r3 121
-MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r1 127
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r2 127
 MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488
+MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-9.3.1-r1 63
 MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
+MD5 0eab8a4d5b98b79f76b136ab0dffabcf files/named.rc6-smart_pid_fix 1204
 MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
 MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5 127
-MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-9.3.1 63
 MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost 412
diff --git a/net-dns/bind/bind-9.2.5-r1.ebuild b/net-dns/bind/bind-9.2.5-r2.ebuild
index 89c1ed998de1..22b779ee2af0 100644
--- a/net-dns/bind/bind-9.2.5-r1.ebuild
+++ b/net-dns/bind/bind-9.2.5-r2.ebuild
@@ -1,11 +1,11 @@
 # 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-r1.ebuild,v 1.2 2005/04/13 12:15:38 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r2.ebuild,v 1.1 2005/04/17 12:32:57 voxus Exp $
 
 inherit eutils gnuconfig libtool
 
 IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux \
-	idn caps threads"
+	idn threads"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
@@ -56,7 +56,7 @@ src_unpack() {
 	fi
 
 	cp ${FILESDIR}/named.rc6 ${T}
-	cd ${T} && epatch ${FILESDIR}/named.rc6-pid_fix
+	cd ${T} && epatch ${FILESDIR}/named.rc6-smart_pid_fix
 
 	gnuconfig_update
 
@@ -80,12 +80,12 @@ src_compile() {
 		use ldap  && myconf="${myconf} --with-dlz-ldap"
 		use odbc  && myconf="${myconf} --with-dlz-odbc"
 	}
-	use caps || myconf="${myconf} --disable-linux-caps"
+
+	use threads && myconf="${myconf} --enable-linux-caps --enable-threads"
 
 	econf \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
-		`use_enable threads` \
 		`use_enable ipv6` \
 		--with-libtool \
 		${myconf} || die "econf failed"
diff --git a/net-dns/bind/bind-9.3.1.ebuild b/net-dns/bind/bind-9.3.1-r1.ebuild
index 12dc1a5ea2f9..131070c92608 100644
--- a/net-dns/bind/bind-9.3.1.ebuild
+++ b/net-dns/bind/bind-9.3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.2 2005/04/12 11:01:19 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1-r1.ebuild,v 1.1 2005/04/17 12:32:57 voxus Exp $
 
 inherit eutils gnuconfig libtool
 
-IUSE="ssl ipv6 doc selinux idn caps threads"
+IUSE="ssl ipv6 doc selinux idn threads"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
@@ -39,7 +39,7 @@ src_unpack() {
 	fi
 
 	cp ${FILESDIR}/named.rc6 ${T}
-	cd ${T} && epatch ${FILESDIR}/named.rc6-pid_fix
+	cd ${T} && epatch ${FILESDIR}/named.rc6-smart_pid_fix
 
 	gnuconfig_update
 
@@ -55,13 +55,13 @@ src_compile() {
 	local myconf=""
 
 	use ssl && myconf="${myconf} --with-openssl"
-	use caps || myconf="${myconf} --disable-linux-caps"
+
+	use threads && myconf="${myconf} --enable-linux-caps --enable-threads"
 
 	econf \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
 		--with-libtool \
-		`use_enable threads` \
 		`use_enable ipv6` \
 		${myconf} || die "econf failed"
 
diff --git a/net-dns/bind/files/digest-bind-9.2.5-r1 b/net-dns/bind/files/digest-bind-9.2.5-r2
index 917f82e7d0d6..917f82e7d0d6 100644
--- a/net-dns/bind/files/digest-bind-9.2.5-r1
+++ b/net-dns/bind/files/digest-bind-9.2.5-r2
diff --git a/net-dns/bind/files/digest-bind-9.3.1 b/net-dns/bind/files/digest-bind-9.3.1-r1
index 027fffee4bd7..027fffee4bd7 100644
--- a/net-dns/bind/files/digest-bind-9.3.1
+++ b/net-dns/bind/files/digest-bind-9.3.1-r1
diff --git a/net-dns/bind/files/named.rc6-smart_pid_fix b/net-dns/bind/files/named.rc6-smart_pid_fix
new file mode 100644
index 000000000000..3af7c0401f02
--- /dev/null
+++ b/net-dns/bind/files/named.rc6-smart_pid_fix
@@ -0,0 +1,42 @@
+--- named.orig	2005-04-17 16:14:08.000000000 +0400
++++ named.rc6	2005-04-17 16:18:00.000000000 +0400
+@@ -17,23 +17,29 @@
+ 	fi
+ 	
+ 	# In case someone doesn't have $CPU set from /etc/conf.d/named
+-	if [ ! $CPU ] ; then
+-		CPU=1
++	if [ ! ${CPU} ] ; then
++		CPU="1"
+ 	fi
+ 
+-	if [ $CHROOT -a -d $CHROOT ] ; then
+-		PIDFILE="${CHROOT}/var/run/named/named.pid"
+-		KEY="${CHROOT}/etc/bind/rndc.key"
+-	else
+-		PIDFILE="/var/run/named/named.pid"
+-		KEY="/etc/bind/rndc.key"
+-	fi
++	# As with the named.conf test, above, there's no need
++	# for chroot and non-chroot cases here
++	PIDFILE=$(grep "pid-file" ${CHROOT}/etc/bind/named.conf | \
++		egrep -v ".*[#,//].*pid-file" | \
++		head -n 1 | \
++		sed -ne 's:.*pid-file \"\(.*\)\";:\1:p')
++	[ -n "$PIDFILE" ] || PIDFILE=/var/run/named.pid
++
++	PIDFILE="${CHROOT}$PIDFILE"
++
++	KEY="${CHROOT}/etc/bind/rndc.key"
+ }
+ 
+ start() {
+ 	ebegin "Starting ${CHROOT:+chrooted }named"
+ 	checkconfig || return 1
+-	start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
++	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
++		--exec /usr/sbin/named \
++		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
+ 	eend $?
+ }
+