version bumped ipv6 patch and marked -r12 as stable

5 files changed, 181 insertions, 20 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 97981892c13c..db4722867f37 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.29 2004/06/09 21:02:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.30 2004/06/23 21:45:21 jhhudso Exp $
+
+*djbdns-1.05-r13 (23 Jun 2004)
+
+  23 Jun 2004; Jared Hudson <jhhudso@gentoo.org> djbdns-1.05-r12.ebuild,
+  +djbdns-1.05-r13.ebuild:
+  Bumped ipv6 patch which now included ipv6arpa support. I also marked -r12 as
+  stable now. Thanks goes to Georgi Georgiev <chutz@gg3.net> under bug #53948
+  for the bump.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> djbdns-1.05-r10.ebuild,
   djbdns-1.05-r11.ebuild, djbdns-1.05-r3.ebuild, djbdns-1.05-r7.ebuild,
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 50efd93c67cd..3297505b3c66 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,24 +1,26 @@
-MD5 bdb4e33c7f37dbbb7b0f612bec60370f ChangeLog 6749
-MD5 d8dc5e1909650f7aa3dca7fd4f1fa163 djbdns-1.05-r3.ebuild 1700
-MD5 51ea26ceb5a4f4266f20d7d66564065b djbdns-1.05-r7.ebuild 1934
-MD5 98dac777d23cf9d8d1c4c6df04431f48 djbdns-1.05-r8.ebuild 2037
-MD5 fd405a171705df95667eaf3bc34ff332 djbdns-1.05-r9.ebuild 2753
 MD5 2c3158204cfb4b9c36b8bc78e8421b16 metadata.xml 223
-MD5 f3f7cebc8be126a2b722c40bd88c2f3c djbdns-1.05-r10.ebuild 2803
+MD5 d8dc5e1909650f7aa3dca7fd4f1fa163 djbdns-1.05-r3.ebuild 1700
 MD5 653959099f6fb327ffcedf260b732b15 djbdns-1.05-r11.ebuild 3184
+MD5 bdb4e33c7f37dbbb7b0f612bec60370f ChangeLog 6749
+MD5 f3f7cebc8be126a2b722c40bd88c2f3c djbdns-1.05-r10.ebuild 2803
+MD5 9f562b3e143d1c3c0d36e0b78040ed6c djbdns-1.05-r13.ebuild 4743
+MD5 51ea26ceb5a4f4266f20d7d66564065b djbdns-1.05-r7.ebuild 1934
 MD5 c8e00e9949778176e74c5846942337c8 djbdns-1.05-r12.ebuild 4820
-MD5 3d85d57281612a4f73829a8efb9d6455 files/digest-djbdns-1.05-r3 133
-MD5 456c7b3cc5de829f4f03e627300e654f files/digest-djbdns-1.05-r7 266
-MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
-MD5 7c2a17103fedf0325d120a7d254432fa files/tinydns-setup 3209
-MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
-MD5 ba558b4a61ed71c23083aa1ec32c7cc9 files/digest-djbdns-1.05-r8 270
-MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
+MD5 fd405a171705df95667eaf3bc34ff332 djbdns-1.05-r9.ebuild 2753
+MD5 98dac777d23cf9d8d1c4c6df04431f48 djbdns-1.05-r8.ebuild 2037
+MD5 46e046747b9dd8a0a1300a52c142f423 files/fwdzone-fix.patch 438
 MD5 3340189be9a5a23877b1c8bbb9edf4a3 files/digest-djbdns-1.05-r9 261
+MD5 e978c483e32ec53b3eb8a2b703c89d6d files/djbdns-setup 11152
 MD5 3340189be9a5a23877b1c8bbb9edf4a3 files/digest-djbdns-1.05-r10 261
-MD5 81745534132c6cfa3596abd4a6660260 files/digest-djbdns-1.05-r11 397
-MD5 444830203a792b4a295ca8fee554b8d3 files/djbdns-1.05-ipv6arpa+BSDok-gentoo.diff 4127
 MD5 8a46595bab1183081b019c4406eaf9f1 files/digest-djbdns-1.05-r12 624
-MD5 e978c483e32ec53b3eb8a2b703c89d6d files/djbdns-setup 11152
+MD5 ba558b4a61ed71c23083aa1ec32c7cc9 files/digest-djbdns-1.05-r8 270
+MD5 456c7b3cc5de829f4f03e627300e654f files/digest-djbdns-1.05-r7 266
+MD5 7c2a17103fedf0325d120a7d254432fa files/tinydns-setup 3209
 MD5 97fad96e3ec9c603ba2957d9925683f1 files/dnsroots.patch 240
-MD5 46e046747b9dd8a0a1300a52c142f423 files/fwdzone-fix.patch 438
+MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r13 624
+MD5 444830203a792b4a295ca8fee554b8d3 files/djbdns-1.05-ipv6arpa+BSDok-gentoo.diff 4127
+MD5 81745534132c6cfa3596abd4a6660260 files/digest-djbdns-1.05-r11 397
+MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
+MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
+MD5 3d85d57281612a4f73829a8efb9d6455 files/digest-djbdns-1.05-r3 133
+MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
diff --git a/net-dns/djbdns/djbdns-1.05-r12.ebuild b/net-dns/djbdns/djbdns-1.05-r12.ebuild
index 7e31c68dd1da..b64e92f0e586 100644
--- a/net-dns/djbdns/djbdns-1.05-r12.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r12.ebuild,v 1.2 2004/06/06 14:28:21 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r12.ebuild,v 1.3 2004/06/23 21:45:21 jhhudso Exp $
 
 IUSE="ipv6 ipv6arpa static fwdzone roundrobin multipleip aliaschain semanticfix cnamefix doc"
 
@@ -22,7 +22,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 RDEPEND=">=sys-apps/daemontools-0.70
 	doc? ( app-doc/djbdns-man )
diff --git a/net-dns/djbdns/djbdns-1.05-r13.ebuild b/net-dns/djbdns/djbdns-1.05-r13.ebuild
new file mode 100644
index 000000000000..ee7ee4da81c3
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r13.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r13.ebuild,v 1.1 2004/06/23 21:45:21 jhhudso Exp $
+
+IUSE="ipv6 static fwdzone roundrobin multipleip aliaschain semanticfix cnamefix doc"
+
+inherit eutils
+
+DESCRIPTION="Excellent high-performance DNS services"
+HOMEPAGE="http://cr.yp.to/djbdns.html"
+URL1="http://www.skarnet.org/software/djbdns-fwdzone"
+URL2="http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns"
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+	fwdzone? ( ${URL1}/djbdns-1.04-fwdzone.patch )
+	roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch )
+	multipleip? ( http://danp.net/djbdns/dnscache-multiple-ip.patch
+	              http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff )
+	aliaschain? ( ${URL2}/tinydns-alias-chain-truncation.patch )
+	semanticfix? ( ${URL2}/tinydns-data-semantic-error.patch )
+	cnamefix? ( ${URL2}/dnscache-cname-handling.patch )
+	ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test21.diff.bz2 )"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86"
+
+RDEPEND=">=sys-apps/daemontools-0.70
+	doc? ( app-doc/djbdns-man )
+	sys-apps/ucspi-tcp"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	useq ipv6 && useq cnamefix && \
+	eerror "ipv6 cannot currently be used with the cnamefix patch" && \
+	exit -1
+
+	useq ipv6 && useq multipleip && \
+	eerror "ipv6 cannot currently be used with the multipleip patch" && \
+	exit -1
+
+	useq ipv6 && ( useq fwdzone || useq roundrobin ) && \
+	eerror "ipv6 cannot currently be used with the fwdzone or " && \
+	eerror "roundrobin patch." && \
+	eerror && \
+	eerror "If you would like to see ipv6 support along with one of " && \
+	eerror "those other patches please submit a working patch that " && \
+	eerror "combines ipv6 with either fwdzone or roundrobin but not " && \
+	eerror "both at the same time, since the latter 2 patches are " && \
+	eerror "mutually exclusive according to bug #31238." && exit -1
+
+	useq fwdzone && useq roundrobin && \
+	eerror "fwdzone and roundrobin do not work together according " && \
+	eerror "to bug #31238" && exit -1
+
+	useq cnamefix && \
+		sed s:'\r'::g < ${DISTDIR}/dnscache-cname-handling.patch \
+		> ${WORKDIR}/dnscache-cname-handling.patch && \
+		epatch ${WORKDIR}/dnscache-cname-handling.patch
+	useq aliaschain && \
+		epatch ${DISTDIR}/tinydns-alias-chain-truncation.patch
+	useq semanticfix && \
+		epatch ${DISTDIR}/tinydns-data-semantic-error.patch
+
+	useq fwdzone && epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
+	useq roundrobin && epatch ${DISTDIR}/round-robin.patch
+	useq multipleip && \
+		epatch ${DISTDIR}/dnscache-multiple-ip.patch && \
+		epatch ${DISTDIR}/djbdns-1.05-multiip.diff
+
+	epatch ${FILESDIR}/headtail.patch
+	epatch ${FILESDIR}/dnsroots.patch
+
+	useq ipv6 && {
+		einfo "At present dnstrace does NOT support IPv6. It will " \
+		      "be compiled without IPv6 support."
+		cp -a ${S} ${S}-noipv6
+		# Careful -- test21 of the ipv6 patch includes the errno patch
+		epatch ${WORKDIR}/djbdns-1.05-test21.diff
+		cd ${S}-noipv6
+		epatch ${FILESDIR}/${PV}-errno.patch
+	} || {
+		epatch ${FILESDIR}/${PV}-errno.patch
+	}
+}
+
+src_compile() {
+	LDFLAGS=
+	useq static && LDFLAGS="-static"
+	echo "gcc ${CFLAGS}" > conf-cc
+	echo "gcc ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+	MAKEOPTS="-j1" emake || die "emake failed"
+
+	# If djbdns is compiled with ipv6 support it breaks dnstrace
+	# therefore we must compile dnstrace separately without ipv6
+	# support.
+	if useq ipv6;
+	then
+		einfo "Compiling dnstrace without ipv6 support"
+		cd ${S}-noipv6
+		LDFLAGS=
+		useq static && LDFLAGS="-static"
+		echo "gcc ${CFLAGS}" > conf-cc
+		echo "gcc ${LDFLAGS}" > conf-ld
+		echo "/usr" > conf-home
+		MAKEOPTS="-j1" emake dnstrace || die "emake failed"
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins dnsroots.global
+	into /usr
+	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+	      *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+	      dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+	useq ipv6 && dobin dnsip6 dnsip6q ${S}-noipv6/dnstrace
+
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+
+	dobin ${FILESDIR}/dnscache-setup
+	useq fwdzone && cd ${D}${DESTTREE}/bin && \
+		epatch ${FILESDIR}/fwdzone-fix.patch
+	dobin ${FILESDIR}/tinydns-setup
+	dobin ${FILESDIR}/djbdns-setup
+}
+
+pkg_postinst() {
+	groupadd &>/dev/null nofiles
+	id &>/dev/null dnscache || \
+		useradd -g nofiles -d /nonexistent -s /bin/false dnscache
+	id &>/dev/null dnslog || \
+		useradd -g nofiles -d /nonexistent -s /bin/false dnslog
+	id &>/dev/null tinydns || \
+		useradd -g nofiles -d /nonexistent -s /bin/false tinydns
+
+	einfo "Use (dnscache-setup + tinydns-setup) or djbdns-setup" \
+	      "to configure djbdns."
+}
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r13 b/net-dns/djbdns/files/digest-djbdns-1.05-r13
new file mode 100644
index 000000000000..6bfd661faa78
--- /dev/null
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r13
@@ -0,0 +1,9 @@
+MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
+MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
+MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239
+MD5 9ff9c640a746331bcb0901d21a0c0e4f dnscache-multiple-ip.patch 7601
+MD5 d5c05ae75add84094d45a78a67ab925d djbdns-1.05-multiip.diff 5522
+MD5 ef1b5cfe7a6f90e4ed8b342e4f4f1ded tinydns-alias-chain-truncation.patch 1994
+MD5 219cb6b75878d7a7b9500a6e3ded154f tinydns-data-semantic-error.patch 5096
+MD5 847766cb1b2fd57eb0cd97ac44b763c7 dnscache-cname-handling.patch 7569
+MD5 672a27b988dce6e705c4bfce22b3f481 djbdns-1.05-test21.diff.bz2 18318