Updated to patch test22 from fefe for IPv6 support, thanks to Kalin Kozhuharov in bug #96660.

(Portage version: 2.0.51.22-r1)

5 files changed, 178 insertions, 16 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 54161ffa2db6..4a8cd2b1f255 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.61 2005/06/18 23:17:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.62 2005/06/21 15:23:23 flameeyes Exp $
+
+*djbdns-1.05-r15 (21 Jun 2005)
+
+  21 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  +djbdns-1.05-r15.ebuild:
+  Updated to patch test22 from fefe for IPv6 support, thanks to Kalin
+  Kozhuharov in bug #96660.
 
   18 Jun 2005; Jason Wever <weeve@gentoo.org> djbdns-1.05-r14.ebuild:
   Stable on SPARC.
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index a50303ff1731..e89f4c436b62 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,28 +1,29 @@
 MD5 65da0b4685397b07565f800385550169 ChangeLog 11053
-MD5 977b1d879a78fadda53b40bbef0a7778 djbdns-1.05-r3.ebuild 1724
-MD5 41587a443cb11b372cf923bd90596784 djbdns-1.05-r7.ebuild 1976
-MD5 73bdc1e7df9176661af23ed1921a671e djbdns-1.05-r8.ebuild 2080
-MD5 881c8c3d748728f87bf7e6dc78cf233a djbdns-1.05-r9.ebuild 2795
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 2438f5b001fb08758e57ea432651b4b7 djbdns-1.05-r10.ebuild 2845
 MD5 2dace0dbc114d9c94fa60ed25aed683f djbdns-1.05-r11.ebuild 3226
 MD5 db19c3234b97960339bb1a2e99242f22 djbdns-1.05-r12.ebuild 4867
 MD5 29c572d1f122fae02fb13992247e67db djbdns-1.05-r13.ebuild 4798
-MD5 a554a766e4956ed6235f2d0cb386251b djbdns-1.05-r14.ebuild 4699
+MD5 977b1d879a78fadda53b40bbef0a7778 djbdns-1.05-r3.ebuild 1724
+MD5 41587a443cb11b372cf923bd90596784 djbdns-1.05-r7.ebuild 1976
+MD5 73bdc1e7df9176661af23ed1921a671e djbdns-1.05-r8.ebuild 2080
+MD5 881c8c3d748728f87bf7e6dc78cf233a djbdns-1.05-r9.ebuild 2795
+MD5 bd58f640fd646eb1b47ba694b33e7806 metadata.xml 230
+MD5 e6b53829d456fc3d8d443e324187a5cd djbdns-1.05-r15.ebuild 4699
 MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
+MD5 3340189be9a5a23877b1c8bbb9edf4a3 files/digest-djbdns-1.05-r10 261
+MD5 81745534132c6cfa3596abd4a6660260 files/digest-djbdns-1.05-r11 397
+MD5 8a46595bab1183081b019c4406eaf9f1 files/digest-djbdns-1.05-r12 624
+MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r13 624
+MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r14 624
 MD5 3d85d57281612a4f73829a8efb9d6455 files/digest-djbdns-1.05-r3 133
 MD5 456c7b3cc5de829f4f03e627300e654f files/digest-djbdns-1.05-r7 266
 MD5 ba558b4a61ed71c23083aa1ec32c7cc9 files/digest-djbdns-1.05-r8 270
-MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
-MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
-MD5 d1844f9853a9bb56738a6a0eb6e04de4 files/tinydns-setup 3206
 MD5 3340189be9a5a23877b1c8bbb9edf4a3 files/digest-djbdns-1.05-r9 261
-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 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
 MD5 dfd675b2775efcbb604413a84db8bf1a files/dnsroots.patch 349
 MD5 46e046747b9dd8a0a1300a52c142f423 files/fwdzone-fix.patch 438
-MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r13 624
-MD5 9127cff20924bbf9dfd84d3896a2510e files/digest-djbdns-1.05-r14 624
+MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
+MD5 d1844f9853a9bb56738a6a0eb6e04de4 files/tinydns-setup 3206
+MD5 865a37de3e223a3ca61e8c4eedc8e8e6 files/digest-djbdns-1.05-r15 624
diff --git a/net-dns/djbdns/djbdns-1.05-r15.ebuild b/net-dns/djbdns/djbdns-1.05-r15.ebuild
new file mode 100644
index 000000000000..d25eb76b4fae
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r15.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r15.ebuild,v 1.1 2005/06/21 15:23:23 flameeyes Exp $
+
+IUSE="aliaschain cnamefix doc fwdzone ipv6 multipleip roundrobin semanticfix static selinux"
+
+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"
+IPV6_PATCH="test22"
+
+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/${P}-${IPV6_PATCH}.diff.bz2 )"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-process/daemontools-0.70
+	doc? ( app-doc/djbdns-man )
+	sys-apps/ucspi-tcp
+	selinux? ( sec-policy/selinux-djbdns )"
+
+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 -pR ${S} ${S}-noipv6
+		# Careful -- >=test21 of the ipv6 patch includes the errno patch
+		epatch ${WORKDIR}/${P}-${IPV6_PATCH}.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() {
+	enewgroup nofiles
+	enewuser dnscache -1 -1 /nonexistent nofiles
+	enewuser dnslog -1 -1 /nonexistent nofiles
+	enewuser tinydns -1 -1 /nonexistent nofiles
+
+	einfo "Use (dnscache-setup + tinydns-setup) or djbdns-setup" \
+	      "to configure djbdns."
+}
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r15 b/net-dns/djbdns/files/digest-djbdns-1.05-r15
new file mode 100644
index 000000000000..788259b045f6
--- /dev/null
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r15
@@ -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 afab02b7e3afe58b93d15ddf4e5f90b4 djbdns-1.05-test22.diff.bz2 18277
diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
index 20ce219711a2..7e80c352c2da 100644
--- a/net-dns/djbdns/metadata.xml
+++ b/net-dns/djbdns/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<maintainer>
+<email>flameeyes@gentoo.org</email>
+<name>Diego Pettenò</name>
+</maintainer>
 </pkgmetadata>