* closing bugs #99878 and #99597

(Portage version: 2.0.51.22-r2)

8 files changed, 179 insertions, 23 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index f6d4eda00d0c..7f2fe0091345 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.81 2005/07/02 09:49:20 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.82 2005/08/03 16:54:38 voxus Exp $
+
+
+*bind-9.2.5-r5 (03 Aug 2005)
+*bind-9.3.1-r3 (03 Aug 2005)
+
+  03 Aug 2005; Konstantin Arkhipov <voxus@gentoo.org> +bind-9.2.5-r5.ebuild,
+  +bind-9.3.1-r3.ebuild, -bind-9.3.1-r1.ebuild, -bind-9.3.1-r2.ebuild,
+  +files/named.rc:
+  Closing bug #99597 by adding enew{user,group}. Closing bug #99878 by new
+  init script. Cleanups also.
 
   02 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> -bind-9.2.2-r3.ebuild,
   -bind-9.2.5.ebuild, -files/bind-9.2.2-mysql.patch:
@@ -19,7 +29,7 @@
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> bind-9.2.5-r4.ebuild:
   Stable on ppc.
 
-  12 Jun 2005; Bryan ц≤stergaard <kloeri@gentoo.org> bind-9.2.5-r4.ebuild:
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> bind-9.2.5-r4.ebuild:
   Stable on alpha.
 
   06 Jun 2005; Markus Rothe <corsair@gentoo.org> bind-9.2.5-r4.ebuild:
@@ -75,7 +85,7 @@
   10 Apr 2005; Joshua Kinard <kumba@gentoo.org> bind-9.2.5.ebuild:
   Added ~mips to keywords.
 
-  06 Apr 2005; Bryan ц≤stergaard <kloeri@gentoo.org> bind-9.2.5.ebuild:
+  06 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> bind-9.2.5.ebuild:
   Stable on alpha, bug 87902.
 
   04 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> bind-9.2.5.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 8311b6169d21..24fa00a38fb0 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,15 +1,15 @@
-MD5 b72b91e6dd59755d11e31513ef1b8ff1 bind-9.3.1-r2.ebuild 7927
-MD5 64fc49b753eba3d48561cc05d9d284a5 bind-9.3.1-r1.ebuild 6236
-MD5 ab96154fb6d9a46490b517738374af34 ChangeLog 12967
+MD5 6e7b8905ba21bf4b2546a4f9d95fb017 bind-9.2.5-r5.ebuild 8234
+MD5 283e559bc90dd2e7432d935a85714679 bind-9.3.1-r3.ebuild 8040
+MD5 62e8b3753de0529f06026a3f1c8bcd9f ChangeLog 13294
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 MD5 59dbb3246bd5abb0459f7b1c1bbc553b bind-9.2.5-r4.ebuild 8189
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
 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-r5 127
 MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488
-MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-9.3.1-r1 63
-MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r2 133
+MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r3 133
 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
@@ -24,3 +24,4 @@ MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
 MD5 412d666c947769b6015a65a42bb8ea00 files/named.rc6 1434
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
+MD5 50c7054c70fe6d79c2cb3c531811f5d3 files/named.rc 1646
diff --git a/net-dns/bind/bind-9.3.1-r1.ebuild b/net-dns/bind/bind-9.2.5-r5.ebuild
index 5e1e81341312..bcf946504012 100644
--- a/net-dns/bind/bind-9.3.1-r1.ebuild
+++ b/net-dns/bind/bind-9.2.5-r5.ebuild
@@ -1,21 +1,26 @@
 # 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-r1.ebuild,v 1.2 2005/04/24 09:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r5.ebuild,v 1.1 2005/08/03 16:54:38 voxus Exp $
 
 inherit eutils libtool
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${PV}.patch.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl ipv6 doc selinux idn threads"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
 
 DEPEND="sys-apps/groff
 	sys-devel/autoconf
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=dev-db/mysql-4 )
+	bind-mysql? ( >=dev-db/mysql-4 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
 
@@ -30,13 +35,37 @@ src_unpack() {
 		       ${i}
 	done
 
+	if use dlz; then
+		epatch ${DISTDIR}/dlz-${PV}.patch.bz2
+		epatch ${FILESDIR}/${P}-berkdb_fix.patch
+	fi
+
+	if use bind-mysql; then
+		if use dlz; then
+			MP=${P}-dlz-mysql.patch
+		else
+			MP=${P}-mysql.patch
+		fi
+
+		ebegin "Fixing mysql patch"
+		eindent
+
+		cp ${FILESDIR}/${MP} ${T}/${MP}
+
+		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
+			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
+			-i ${T}/${MP}
+
+		epatch ${T}/${MP}
+
+		eoutdent
+		eend $?
+	fi
+
 	if use idn; then
 		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
 	fi
 
-	cp ${FILESDIR}/named.rc6 ${T}
-	cd ${T} && epatch ${FILESDIR}/named.rc6-smart_pid_fix
-
 	# it should be installed by bind-tools
 	sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
 	mv ${T}/Makefile ${S}/bin/Makefile.in
@@ -49,14 +78,42 @@ src_compile() {
 	local myconf=""
 
 	use ssl && myconf="${myconf} --with-openssl"
+	use dlz && {
+		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
+		use postgres && myconf="${myconf} --with-dlz-postgres"
+		use mysql && myconf="${myconf} --with-dlz-mysql"
+		use berkdb && myconf="${myconf} --with-dlz-bdb"
+		use ldap  && myconf="${myconf} --with-dlz-ldap"
+		use odbc  && myconf="${myconf} --with-dlz-odbc"
+	}
 
-	use threads && myconf="${myconf} --enable-linux-caps --enable-threads"
+	if use threads; then
+		if use dlz && use mysql; then
+			echo
+			ewarn ""
+			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
+			einfo "requires that each thread of an application execute a MySQL"
+			einfo "\"thread initialization\" to setup the thread local storage."
+			einfo "This is impossible to do safely while staying within the DLZ"
+			einfo "driver API. This is a limitation caused by MySQL, and not the"
+			einfo "DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			echo
+			myconf="${myconf} --disable-threads"
+			einfo "Threading support disabled"
+			epause 10
+		else
+			myconf="${myconf} --enable-linux-caps --enable-threads"
+			einfo "Threading support enabled"
+		fi
+	fi
 
 	econf \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
-		--with-libtool \
 		`use_enable ipv6` \
+		--with-libtool \
 		${myconf} || die "econf failed"
 
 	emake -j1 || die "failed to compile bind"
@@ -97,7 +154,7 @@ src_install() {
 	insinto /var/bind ; doins ${FILESDIR}/named.ca
 	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
 
-	exeinto /etc/init.d ; newexe ${T}/named.rc6 named
+	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc named
 	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
@@ -114,6 +171,11 @@ src_install() {
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
 	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
 	rm -f ${D}/usr/bin/{dig,host,nslookup}
+
+	ebegin "Creating named group and user"
+	enewgroup named
+	enewuser named -1 /bin/false /etc/bind named
+	eend ${?}
 }
 
 pkg_postinst() {
@@ -150,10 +212,15 @@ pkg_postinst() {
 	echo
 	einfo "	zone "com" IN { type delegation-only; };"
 	einfo "	zone "net" IN { type delegation-only; };"
+
+	echo
+	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
+	ewarn "when it was previously optional.  If the priority is missing, BIND"
+	ewarn "won't load the zone file at all."
+	echo
 }
 
 pkg_config() {
-
 	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
 	EXISTS="no"
 
diff --git a/net-dns/bind/bind-9.3.1-r2.ebuild b/net-dns/bind/bind-9.3.1-r3.ebuild
index ff110fcf2e8c..94b255e1b5f1 100644
--- a/net-dns/bind/bind-9.3.1-r2.ebuild
+++ b/net-dns/bind/bind-9.3.1-r3.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-r2.ebuild,v 1.1 2005/06/23 17:37:44 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1-r3.ebuild,v 1.1 2005/08/03 16:54:38 voxus Exp $
 
 inherit eutils libtool
 
@@ -155,7 +155,7 @@ src_install() {
 	insinto /var/bind ; doins ${FILESDIR}/named.ca
 	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/named.init named
+	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc named
 	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
@@ -172,6 +172,11 @@ src_install() {
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
 	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
 	rm -f ${D}/usr/bin/{dig,host,nslookup}
+
+	ebegin "Creating named group and user"
+	enewgroup named
+	enewuser named -1 /bin/false /etc/bind named
+	eend ${?}
 }
 
 pkg_postinst() {
diff --git a/net-dns/bind/files/digest-bind-9.2.5-r5 b/net-dns/bind/files/digest-bind-9.2.5-r5
new file mode 100644
index 000000000000..917f82e7d0d6
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.5-r5
@@ -0,0 +1,2 @@
+MD5 35a265fb97a068c066e22306ea32fd1f bind-9.2.5.tar.gz 4504389
+MD5 3bb820ced02fa2db7ae37e5288a73706 dlz-9.2.5.patch.bz2 135932
diff --git a/net-dns/bind/files/digest-bind-9.3.1-r1 b/net-dns/bind/files/digest-bind-9.3.1-r1
deleted file mode 100644
index 027fffee4bd7..000000000000
--- a/net-dns/bind/files/digest-bind-9.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ff3204eea27184ea0722f37e43fc95d bind-9.3.1.tar.gz 4673603
diff --git a/net-dns/bind/files/digest-bind-9.3.1-r2 b/net-dns/bind/files/digest-bind-9.3.1-r3
index 4307a2849697..4307a2849697 100644
--- a/net-dns/bind/files/digest-bind-9.3.1-r2
+++ b/net-dns/bind/files/digest-bind-9.3.1-r3
diff --git a/net-dns/bind/files/named.rc b/net-dns/bind/files/named.rc
new file mode 100755
index 000000000000..22fa5eca4bfe
--- /dev/null
+++ b/net-dns/bind/files/named.rc
@@ -0,0 +1,72 @@
+#!/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.rc,v 1.1 2005/08/03 16:54:38 voxus Exp $
+
+opts="start stop reload restart"
+
+depend() {
+	need net
+	use logger
+	provide dns
+}
+
+checkconfig() {
+	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
+		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
+	fi
+	
+	# In case someone doesn't have $CPU set from /etc/conf.d/named
+	if [ ! ${CPU} ] ; then
+		CPU="1"
+	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\(.*\)\"\(.*\)\";:\2: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 --pidfile ${PIDFILE} \
+		--exec /usr/sbin/named \
+		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CHROOT:+chrooted }named"
+	checkconfig || return 2
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+		--exec /usr/sbin/named -- stop
+	eend $?
+}
+
+reload() {
+	checkconfig || return 3
+	if [ ! -f $PIDFILE ] ; then
+		/etc/init.d/named start &>/dev/null
+		exit
+	fi
+
+	if [ -f $KEY ] ; then
+		ebegin "Reloading named.conf and zone files"
+		rndc -k $KEY reload &>/dev/null
+		eend $?
+	else /etc/init.d/named restart &>/dev/null
+	fi
+}
+
+restart() {
+	svc_stop
+	svc_start
+}