* PIDFILE is in conf.d/named now

Package-Manager: portage-2.0.53_rc7

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 12b4a144ebe52c210fa2eafcbabe7048894ca220..f2a3e36d271bf928d2a9094289722e81da31cb3e 100644 (file)
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,17 @@
 # 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.95 2005/11/02 10:26:31 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.96 2005/11/09 09:25:52 voxus Exp $
+
+*bind-9.3.2_beta2 (09 Nov 2005)
+*bind-9.3.1-r7 (09 Nov 2005)
+*bind-9.2.5-r9 (09 Nov 2005)
+
+  09 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> -bind-9.2.5-r8.ebuild,
+  -bind-9.3.1-r6.ebuild, -bind-9.3.2_beta1.ebuild, -files/named.init-r3,
+  -files/named.confd-r1, +bind-9.3.2_beta2.ebuild, +bind-9.3.1-r7.ebuild,
+  +bind-9.2.5-r9.ebuild, +files/named.init-r3, +files/named.confd-r1:
+  Once again closing #107724. Also parallel build is now disabled only for
+  distcc-systems.
 
   02 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> bind-9.3.1-r6.ebuild:
   Dropped all stable keywords due to compile races and bug #107724.

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2df26f838a07ede91b18e06ac2ce1e299c252375..9f02f3297dbc110d5f4d0d4c74ff4ed7542b49d8 100644 (file)
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,9 +1,9 @@
-MD5 762b59806397ccc3aa0d43bfcbc409ee ChangeLog 15476
+MD5 08b8727a7fdd1a915968cf43028ffc67 ChangeLog 15955
 MD5 2c50194cee9e7484dc5ac78935fdf0d5 bind-9.2.5-r4.ebuild 8347
 MD5 109211a7fac00f530ce0d255763f24b2 bind-9.2.5-r6.ebuild 8376
-MD5 6ad2c841946c076210ea2139c6f68e1f bind-9.2.5-r8.ebuild 8413
-MD5 109cc6e5a870461101fb1b8e6b11b267 bind-9.3.1-r6.ebuild 8200
-MD5 caf3fd1902e1428769c5f71eb37d8580 bind-9.3.2_beta1.ebuild 8259
+MD5 e1e5ea7060eedb1d883f5280b6758505 bind-9.2.5-r9.ebuild 8636
+MD5 75105df4c58ab96c51005ebc66ea71d3 bind-9.3.1-r7.ebuild 8423
+MD5 3d7609e35ca96acd75b4f3b777b9727a bind-9.3.2_beta2.ebuild 8518
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
@@ -12,9 +12,9 @@ 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-r4 127
 MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r6 127
-MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r8 127
-MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r6 133
-MD5 84357fc49d9bc6f4eb8e3396057fefde files/digest-bind-9.3.2_beta1 136
+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 136
 MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost 412
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
@@ -22,9 +22,11 @@ MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
 MD5 b3af799ce2505e78a14bb16868cf0593 files/named.conf-r1 758
 MD5 e9bb1e01cf0b7597e739e889499ddd7a files/named.conf-r2 768
 MD5 be5fd752bdbd59385f2a559d603098d5 files/named.conf-r3 1314
-MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
+MD5 d9bda421173f2a6e536f9b4f33ceca9a files/named.confd 319
+MD5 668f9697d07bbf60b2040ed0c835d7f3 files/named.confd-r1 392
 MD5 620cf3c88d615f841884ee25bc8f8397 files/named.init 1641
 MD5 79c3a341943b393cef4833480deace2d files/named.init-r2 1481
+MD5 4677f8a49c240d3ba58b98ddc9655e88 files/named.init-r3 1513
 MD5 33e3834bbd0adf80e570fc73aa5a7147 files/named.rc 1644
 MD5 412d666c947769b6015a65a42bb8ea00 files/named.rc6 1434
 MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488

diff --git a/net-dns/bind/bind-9.2.5-r8.ebuild b/net-dns/bind/bind-9.2.5-r9.ebuild
similarity index 94%
rename from net-dns/bind/bind-9.2.5-r8.ebuild
rename to net-dns/bind/bind-9.2.5-r9.ebuild
index 4f769f8477f6b5a677b2fadb4cf194b35f256c27..07cb4162904b830a0dd7865107807dc04feab65a 100644 (file)
--- a/net-dns/bind/bind-9.2.5-r8.ebuild
+++ b/net-dns/bind/bind-9.2.5-r9.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-r8.ebuild,v 1.2 2005/10/30 01:36:11 voxus Exp $
+# $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 $
 
 inherit eutils libtool
 
@@ -123,7 +123,16 @@ src_compile() {
                --with-libtool \
                ${myconf} || die "econf failed"
 
-       emake -j1 || die "failed to compile bind"
+       # idea from dev-libs/cyrus-sasl
+       if has distcc ${FEATURES}; then
+               einfo "You have \"distcc\" enabled"
+               einfo "build with MAKEOPTS=\"-j1\""
+               MAKEOPTS="-j1"
+       else
+               einfo "build with MAKEOPTS=${MAKEOPTS}"
+       fi
+
+       emake ${MAKEOPTS} || die "failed to compile bind"
 
        if use idn; then
                cd ${S}/contrib/idn/idnkit-1.0-src
@@ -161,8 +170,8 @@ src_install() {
        insinto /var/bind ; doins ${FILESDIR}/named.ca
        insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
 
-       cp ${FILESDIR}/named.init-r2 ${T}/named && doinitd ${T}/named
-       cp ${FILESDIR}/named.confd ${T}/named && doconfd ${T}/named
+       cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
+       cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
 
        dosym ../../var/bind/named.ca /var/bind/root.cache
        dosym ../../var/bind/pri /etc/bind/pri

diff --git a/net-dns/bind/bind-9.3.1-r6.ebuild b/net-dns/bind/bind-9.3.1-r7.ebuild
similarity index 94%
rename from net-dns/bind/bind-9.3.1-r6.ebuild
rename to net-dns/bind/bind-9.3.1-r7.ebuild
index 6d5d97d7524ae7e9c15bf2ca9c08abac2c83b09e..5d7adc25ab0b62c63d86088fa307132bca5de6d6 100644 (file)
--- a/net-dns/bind/bind-9.3.1-r6.ebuild
+++ b/net-dns/bind/bind-9.3.1-r7.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-r6.ebuild,v 1.4 2005/11/02 10:26:31 voxus Exp $
+# $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 $
 
 inherit eutils libtool
 
@@ -115,7 +115,16 @@ src_compile() {
                `use_enable ipv6` \
                ${myconf} || die "econf failed"
 
-       emake -j1 || die "failed to compile bind"
+       # idea from dev-libs/cyrus-sasl
+       if has distcc ${FEATURES}; then
+               einfo "You have \"distcc\" enabled"
+               einfo "build with MAKEOPTS=\"-j1\""
+               MAKEOPTS="-j1"
+       else
+               einfo "build with MAKEOPTS=${MAKEOPTS}"
+       fi
+
+       emake ${MAKEOPTS} || die "failed to compile bind"
 
        use idn && {
                cd ${S}/contrib/idn/idnkit-1.0-src
@@ -162,8 +171,8 @@ src_install() {
        insinto /var/bind ; doins ${FILESDIR}/named.ca
        insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
 
-       cp ${FILESDIR}/named.init-r2 ${T}/named && doinitd ${T}/named
-       cp ${FILESDIR}/named.confd ${T}/named && doconfd ${T}/named
+       cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
+       cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
 
        dosym ../../var/bind/named.ca /var/bind/root.cache
        dosym ../../var/bind/pri /etc/bind/pri

diff --git a/net-dns/bind/bind-9.3.2_beta1.ebuild b/net-dns/bind/bind-9.3.2_beta2.ebuild
similarity index 89%
rename from net-dns/bind/bind-9.3.2_beta1.ebuild
rename to net-dns/bind/bind-9.3.2_beta2.ebuild
index 40720688287caceb9d38a21c641fbfa69c82720a..7cba1ffdd0b3e3757dac713ffd949f83e44ef1fa 100644 (file)
--- a/net-dns/bind/bind-9.3.2_beta1.ebuild
+++ b/net-dns/bind/bind-9.3.2_beta2.ebuild
@@ -1,16 +1,16 @@
 # 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_beta1.ebuild,v 1.2 2005/10/30 01:36:11 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2_beta2.ebuild,v 1.1 2005/11/09 09:25:52 voxus Exp $
 
 inherit eutils libtool
 
-BETA_VERSION="${PV/_beta/b}"
+BETA="${PV/_beta/b}"
 
 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/${BETA_VERSION}/${PN}-${BETA_VERSION}.tar.gz
-       dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${BETA_VERSION}.patch.bz2 )"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${BETA}/${PN}-${BETA}.tar.gz
+       dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${BETA/b2/b1}.patch.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -27,7 +27,7 @@ DEPEND="sys-apps/groff
 RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-bind )"
 
-S="${WORKDIR}/${PN}-${BETA_VERSION}"
+S="${WORKDIR}/${PN}-${BETA}"
 
 pkg_setup() {
        use threads && {
@@ -59,11 +59,14 @@ src_unpack() {
        done
 
        use dlz && {
-               epatch ${DISTDIR}/ctrix_dlz_${BETA_VERSION}.patch.bz2 || \
+               epatch ${DISTDIR}/ctrix_dlz_${BETA/b2/b1}.patch.bz2 || \
                        die "dlz patch failed"
        }
 
-       use idn && die "idn patch is broken for this beta"
+       use idn && {
+               epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${PN}-${BETA/b2}-patch \
+                       || die "idn patch failed"
+       }
 
        # it should be installed by bind-tools
        sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
@@ -116,7 +119,16 @@ src_compile() {
                `use_enable ipv6` \
                ${myconf} || die "econf failed"
 
-       emake -j1 || die "failed to compile bind"
+       # idea from dev-libs/cyrus-sasl
+       if has distcc ${FEATURES}; then
+               einfo "You have \"distcc\" enabled"
+               einfo "build with MAKEOPTS=\"-j1\""
+               MAKEOPTS="-j1"
+       else
+               einfo "build with MAKEOPTS=${MAKEOPTS}"
+       fi
+
+       emake ${MAKEOPTS} || die "failed to compile bind"
 
        use idn && {
                cd ${S}/contrib/idn/idnkit-1.0-src
@@ -163,8 +175,8 @@ src_install() {
        insinto /var/bind ; doins ${FILESDIR}/named.ca
        insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
 
-       cp ${FILESDIR}/named.init-r2 ${T}/named && doinitd ${T}/named
-       cp ${FILESDIR}/named.confd ${T}/named && doconfd ${T}/named
+       cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
+       cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
 
        dosym ../../var/bind/named.ca /var/bind/root.cache
        dosym ../../var/bind/pri /etc/bind/pri

diff --git a/net-dns/bind/files/digest-bind-9.2.5-r8 b/net-dns/bind/files/digest-bind-9.2.5-r9
similarity index 100%
rename from net-dns/bind/files/digest-bind-9.2.5-r8
rename to net-dns/bind/files/digest-bind-9.2.5-r9

diff --git a/net-dns/bind/files/digest-bind-9.3.1-r6 b/net-dns/bind/files/digest-bind-9.3.1-r7
similarity index 100%
rename from net-dns/bind/files/digest-bind-9.3.1-r6
rename to net-dns/bind/files/digest-bind-9.3.1-r7

diff --git a/net-dns/bind/files/digest-bind-9.3.2_beta1 b/net-dns/bind/files/digest-bind-9.3.2_beta2
similarity index 52%
rename from net-dns/bind/files/digest-bind-9.3.2_beta1
rename to net-dns/bind/files/digest-bind-9.3.2_beta2
index 8a0ad067334467f75a8ba00fc1456b4f9dfe9753..bf2d44cec8782d6720bf04b7b528e39625b3316f 100644 (file)
--- a/net-dns/bind/files/digest-bind-9.3.2_beta1
+++ b/net-dns/bind/files/digest-bind-9.3.2_beta2
@@ -1,2 +1,2 @@
-MD5 2e6a2e42a62112fd9e84c54508715823 bind-9.3.2b1.tar.gz 5297411
+MD5 a8815c39f9ed6df3b96856520e36a3bc bind-9.3.2b2.tar.gz 5299880
 MD5 a70b386bf85c26b1c797e0936be28b79 ctrix_dlz_9.3.2b1.patch.bz2 60982

diff --git a/net-dns/bind/files/named.confd b/net-dns/bind/files/named.confd
index 163e108f0adc663ed924f4dc7b3654bbda10afeb..c59ed25fa905e0b63ada48144be4ecf15508b313 100644 (file)
--- a/net-dns/bind/files/named.confd
+++ b/net-dns/bind/files/named.confd
@@ -7,7 +7,7 @@ OPTIONS=""
 CPU="1"
 
 # If you wish to run bind in a chroot, run:
-# ebuild /var/db/pkg/net-dns/<bind version>/<bind-version> config
+# emerge --config =<bind-version>
 # and un-comment the following line.
 # You can specify a different chroot directory but MAKE SURE it's empty.
 # CHROOT="/chroot/dns"

diff --git a/net-dns/bind/files/named.confd-r1 b/net-dns/bind/files/named.confd-r1
new file mode 100644 (file)
index 0000000..62f4c16
--- /dev/null
+++ b/net-dns/bind/files/named.confd-r1
@@ -0,0 +1,16 @@
+# Set various named options here.
+#
+OPTIONS=""
+
+# Set this to the number of processors you have.
+#
+CPU="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.
+# CHROOT="/chroot/dns"
+
+# Default pid file location
+PIDFILE="${CHROOT}/var/run/named/named.pid"

diff --git a/net-dns/bind/files/named.init-r3 b/net-dns/bind/files/named.init-r3
new file mode 100755 (executable)
index 0000000..576b51d
--- /dev/null
+++ b/net-dns/bind/files/named.init-r3
@@ -0,0 +1,66 @@
+#!/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-r3,v 1.1 2005/11/09 09:25:53 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 suggested in bug #107724
+       [ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
+               egrep -v \
+                       "^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \
+                       ${CHROOT}/etc/bind/named.conf \
+                               | egrep -o -m1 "pid\-file +\".+\" *;" \
+                               | cut -d\" -f2
+       )
+
+       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
+}