Updated djbdns to include the 2nd root server ip change ICANN made since 1.05 was originally released.

5 files changed, 171 insertions, 15 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index a5d199b4facc..f3cefe0b9993 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.39 2004/10/06 03:33:36 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.40 2004/10/08 00:55:03 jhhudso Exp $
 
+  07 Oct 2004; Jared Hudson <jhhudso@gentoo.org> : In reponse to bug #66645,
+  I have updated the patch for dnsroots to include the 2nd root server IP
+  change that ICANN has made since djbdns-1.05's original release.
+	
   05 Oct 2004; Jason Wever <weeve@gentoo.org> djbdns-1.05-r13.ebuild:
   Added ~sparc keyword.
 
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 0ff549cd617a..b7fc6f9e105c 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,26 +1,28 @@
-MD5 25e2e456030909f42a4505c414d30fe1 ChangeLog 8050
+MD5 d9808d3fecd355fff3c19444243c7f5a ChangeLog 8272
+MD5 b7abbb525fda4ee9cb0be743c6708b8f djbdns-1.05-r10.ebuild 2795
+MD5 d21ff37c46e1d07e72044980ccabf257 djbdns-1.05-r11.ebuild 3176
+MD5 57b489656dd0d3d4d8368b5fc3f6da0c djbdns-1.05-r12.ebuild 4797
+MD5 62c2e17957d67157bb67103460a21522 djbdns-1.05-r14.ebuild 4739
 MD5 6cc3ce8124b77cbddac8de092b2f006c djbdns-1.05-r3.ebuild 1670
 MD5 948dcd32140f7bd301b6ecc28634fb1b djbdns-1.05-r7.ebuild 1926
 MD5 4c15ec493cc99c15649320a997816857 djbdns-1.05-r8.ebuild 2030
 MD5 50c592c75ecd77c94452bcc000c83e92 djbdns-1.05-r9.ebuild 2745
 MD5 2c3158204cfb4b9c36b8bc78e8421b16 metadata.xml 223
-MD5 b7abbb525fda4ee9cb0be743c6708b8f djbdns-1.05-r10.ebuild 2795
-MD5 d21ff37c46e1d07e72044980ccabf257 djbdns-1.05-r11.ebuild 3176
-MD5 57b489656dd0d3d4d8368b5fc3f6da0c djbdns-1.05-r12.ebuild 4797
 MD5 c3d59dc557be72c2e08f32c578444c75 djbdns-1.05-r13.ebuild 4737
 MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
+MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r10 62
+MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r11 62
+MD5 8a46595bab1183081b019c4406eaf9f1 files/digest-djbdns-1.05-r12 624
+MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r13 624
 MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r3 62
 MD5 e1f4ba3f29c6a7310e0c1152348356ef files/digest-djbdns-1.05-r7 190
 MD5 e1f4ba3f29c6a7310e0c1152348356ef files/digest-djbdns-1.05-r8 190
-MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
-MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
-MD5 d1844f9853a9bb56738a6a0eb6e04de4 files/tinydns-setup 3206
 MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r9 62
-MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r10 62
-MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r11 62
 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 97fad96e3ec9c603ba2957d9925683f1 files/dnsroots.patch 240
+MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
+MD5 c98a86d2e86da7217c84d4db4daa9369 files/dnsroots.patch 331
 MD5 46e046747b9dd8a0a1300a52c142f423 files/fwdzone-fix.patch 438
-MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r13 624
+MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
+MD5 d1844f9853a9bb56738a6a0eb6e04de4 files/tinydns-setup 3206
+MD5 e614c2df75cde50f99167def0cd249d9 files/digest-djbdns-1.05-r14 62
diff --git a/net-dns/djbdns/djbdns-1.05-r14.ebuild b/net-dns/djbdns/djbdns-1.05-r14.ebuild
new file mode 100644
index 000000000000..2bc5292b5eb5
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r14.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r14.ebuild,v 1.1 2004/10/08 00:55:03 jhhudso Exp $
+
+IUSE="aliaschain cnamefix doc fwdzone ipv6 multipleip roundrobin semanticfix"
+
+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 ~amd64 ppc64 ~sparc"
+
+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-r14 b/net-dns/djbdns/files/digest-djbdns-1.05-r14
new file mode 100644
index 000000000000..7f303eca6ac3
--- /dev/null
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r14
@@ -0,0 +1 @@
+MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
diff --git a/net-dns/djbdns/files/dnsroots.patch b/net-dns/djbdns/files/dnsroots.patch
index 1da7c6f28b5a..e411d5de3068 100644
--- a/net-dns/djbdns/files/dnsroots.patch
+++ b/net-dns/djbdns/files/dnsroots.patch
@@ -1,5 +1,12 @@
---- dnsroots.global	2003-05-12 23:32:55.000000000 +0200
-+++ dnsroots.global	2003-05-12 23:32:35.000000000 +0200
+--- /etc/dnsroots.global.old	Fri May 31 19:42:37 2002
++++ /etc/dnsroots.global	Thu Jan 29 21:41:56 2004
+@@ -1,5 +1,5 @@
+ 198.41.0.4
+-128.9.0.107
++192.228.79.201
+ 192.33.4.12
+ 128.8.10.90
+ 192.203.230.10
 @@ -7,7 +7,7 @@
  192.112.36.4
  128.63.2.53