net-dns/djbdns: Rev bump wrt bug 241158. Update maintainer info.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 157 insertions, 2 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 115cc054181f..3d921f510da3 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.120 2011/03/01 20:24:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.121 2011/04/04 14:05:00 c1pher Exp $
+
+*djbdns-1.05-r24 (04 Apr 2011)
+
+  04 Apr 2011; Dane Smith <c1pher@gentoo.org>
+  +files/string_length_255.patch, +djbdns-1.05-r24.ebuild, metadata.xml:
+  Add Michael Orlitzky as proxy maintainer with me as proxy.
+  Revbump to -24 wrt bug 241158.
+  Ebuild cleanup.
 
   01 Mar 2011; Christian Ruppert <idl0r@gentoo.org> -files/fwdzone-fix.patch:
   Remove unused patch
diff --git a/net-dns/djbdns/djbdns-1.05-r24.ebuild b/net-dns/djbdns/djbdns-1.05-r24.ebuild
new file mode 100644
index 000000000000..31d1589c3193
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r24.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.1 2011/04/04 14:05:00 c1pher Exp $
+
+EAPI="2"
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Excellent high-performance DNS services"
+HOMEPAGE="http://cr.yp.to/djbdns.html"
+IPV6_PATCH="test23"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 selinux static"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	virtual/daemontools
+	sys-apps/ucspi-tcp
+	doc? ( app-doc/djbdns-man )
+	selinux? ( sec-policy/selinux-djbdns )
+"
+
+src_prepare() {
+	echo
+	elog 'Several patches have been dropped from this djbdns ebuild revision.'
+	elog 'Please use the DJBDNS_PATCH_DIR variable to specify a directory'
+	elog 'of custom patches.'
+	elog
+	elog 'Some of them can be found at http://tinydns.org/ or'
+	elog 'http://homepages.tesco.net/J.deBoynePollard/Softwares/djbdns/'
+	elog
+
+	epatch \
+		"${FILESDIR}/headtail.patch" \
+		"${FILESDIR}/dnsroots.patch" \
+		"${FILESDIR}/dnstracesort.patch" \
+		"${FILESDIR}/string_length_255.patch"
+
+	# Fix CVE2009-0858
+	epatch "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+
+	if use ipv6; then
+		elog "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 "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
+
+		# Fix CVE2008-4392
+		epatch \
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch" \
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+
+		cd "${S}-noipv6"
+	fi
+
+	# Fix CVE2008-4392
+	epatch \
+		"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
+		"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+
+	epatch "${FILESDIR}/${PV}-errno.patch"
+
+	if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]
+	then
+		echo
+		ewarn "You enabled custom patches from ${DJBDNS_PATCH_DIR}."
+		ewarn "Be warned that you won't get any support when using "
+		ewarn "this feature. You're on your own from now!"
+		echo
+		ebeep
+		cd "${S}" && epatch "${DJBDNS_PATCH_DIR}/"*
+	fi
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+	emake -j1 || die "emake failed"
+
+	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
+	# Therefore we must compile dnstrace separately without IPv6
+	# support.
+	if use ipv6; then
+		elog "Compiling dnstrace without ipv6 support"
+		cd "${S}-noipv6"
+		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+		echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+		echo "/usr" > conf-home
+		emake -j1 dnstrace || die "emake failed"
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins dnsroots.global || die
+
+	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 || die
+
+	if use ipv6; then
+		dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace" || die
+	fi
+
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION || die
+
+	dobin "${FILESDIR}/dnscache-setup" || die
+	dobin "${FILESDIR}/tinydns-setup" || die
+	newbin "${FILESDIR}/djbdns-setup-r17" djbdns-setup || die
+}
+
+pkg_setup() {
+	# The nofiles group is provided by baselayout
+	enewuser dnscache -1 -1 -1 nofiles
+	enewuser dnslog -1 -1 -1 nofiles
+	enewuser tinydns -1 -1 -1 nofiles
+}
+
+pkg_postinst() {
+	elog "Use dnscache-setup & tinydns-setup or djbdns-setup to configure djbdns."
+}
diff --git a/net-dns/djbdns/files/string_length_255.patch b/net-dns/djbdns/files/string_length_255.patch
new file mode 100644
index 000000000000..ad383b756bf9
--- /dev/null
+++ b/net-dns/djbdns/files/string_length_255.patch
@@ -0,0 +1,11 @@
+--- a/tinydns-data.c	2001-02-11 16:11:45.000000000 -0500
++++ b/tinydns-data.c	2011-04-02 10:41:34.356302891 -0400
+@@ -399,7 +399,7 @@
+ 	i = 0;
+ 	while (i < f[1].len) {
+ 	  k = f[1].len - i;
+-	  if (k > 127) k = 127;
++	  if (k > 255) k = 255;
+ 	  ch = k;
+ 	  rr_add(&ch,1);
+ 	  rr_add(f[1].s + i,k);
diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
index 616f0488f72e..040dd3ab07d1 100644
--- a/net-dns/djbdns/metadata.xml
+++ b/net-dns/djbdns/metadata.xml
@@ -3,6 +3,12 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>c1pher@gentoo.org</email>
+	<name>Dane Smith</name>
+</maintainer>
+<maintainer>
+	<email>michael@orlitzky.com</email>
+	<name>Michael Orlitzky</name>
+	<description>Proxy maintainer. CC on bugs.</description>
 </maintainer>
 </pkgmetadata>