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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 181 insertions, 4 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/Manifest b/net-dns/djbdns/Manifest
index 802ca01ac3fc..8587e4b7dd36 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.05-errno.patch 238 RMD160 b479d8c16dd8fe7206cba19125dd8866c2584301 SHA1 f23206f3ffc1a8aa6768fdb2ef588012c17eaa79 SHA256 40e01efac08e95bf87b46e2d86378b0a60c234c64080b7f42039178ac6de61af
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch 10049 RMD160 9154f495cfc5eebcb6617b8fa65ee0bea0cbbf80 SHA1 0461b199c048c6b94b659280d04a4f537cdb9c04 SHA256 56c7db6c5bed3200e1f6e4995018c96158085f2f7169c7b148c7c034ddff8111
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch 9914 RMD160 c416dd6575819cfd40ef0d306ccb14d34a5afc90 SHA1 8dd3ce7758d3a97cafbe6a60ea83f48e916f496d SHA256 b5e030e96ed98d96d36c39e3466e04d98d39c5f1c7e94254ea3da5e99381eed6
@@ -10,9 +13,28 @@ AUX dnscache-setup 6007 RMD160 d5a29943ac29d84a8c83308a497721010ab017bc SHA1 764
 AUX dnsroots.patch 349 RMD160 c3be22070645e27a8c16e9f1dd268963b749c5f7 SHA1 f09404a752062956319b4ebb6d381588df467eba SHA256 99e8ef90a20f66fedf903aa13e3f5360010cf11c27c59dc53b967f02ffe06114
 AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1 cf8b7825d826bfd3f3314c848a8843c2a5a70ae3 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf
 AUX headtail.patch 1780 RMD160 332af6647e08f3b792bd1b7821974f15041a6b58 SHA1 1b996c6cbe5df1c981f998d004d066ae344bfba8 SHA256 28ebe521132fe35559273b6542505ab4f0bb7b7ccb88585522e4cc2fe8376dd4
+AUX string_length_255.patch 299 RMD160 df613f1287f6581c963e969eec7fcaec638e2b58 SHA1 bb9e2f7aafed265887ac47d35cc022ef25d7b5f9 SHA256 c9b8d0065cfe6d4a9ad460c31c2a75bcce17bfb8001f4448e3464dea07524401
 AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222c22f924882a3b2d496f7d8fbdf61eb4eb0e8 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea
 DIST djbdns-1.05-test23.diff.bz2 18480 RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 SHA1 34251597d211ff00791cb6546e8ef60d75ce5477 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
 DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA1 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
 EBUILD djbdns-1.05-r23.ebuild 3684 RMD160 74a29155bc31f39a9b16d39c6711b585bef06601 SHA1 f5b2e17144d3c03a2845c9bc69eb6c1e5b8f830d SHA256 fe946870ccc68646c51783d040f5f985660764b53f71ab320df46f12a5c48cae
-MISC ChangeLog 19007 RMD160 b7c920db6183b8ccfc4682e63b8de6dff63a1516 SHA1 707954ec763701361798825514a098015d83e2a1 SHA256 36df2a604799554de616aa70b1e9a9e730f024b2b3681813836d21bc387d03be
-MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
+EBUILD djbdns-1.05-r24.ebuild 3784 RMD160 50f608c8dd65915ce612f7b9fc9f4103abd26d49 SHA1 83802f2661e34ceeafd6f522d13c064f39b9db22 SHA256 b4125123f77ba7e2534ff430dfadbdcc8a0b3c99f9b4021797e65b970ad4478a
+MISC ChangeLog 19272 RMD160 c150edecefee973e644092ae0e66b9047b1f7561 SHA1 25b278107fbdb6d792259e49a494453b613c6209 SHA256 8619f8ae272c4763b9d861e22ecc33315bea1c5623934cc60c7969cbaca8a8ad
+MISC metadata.xml 399 RMD160 e428c6bbe8fa476817cdc8f00bbcd5990a9d645d SHA1 2215e63ddcac55ff5f449ffd4fa5f0389befb9a3 SHA256 99568cce63f5dacde89fab8b8c4c4c06699844d885dfb00943fb2a8fa2b16adc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNmc9gAAoJEEsurZwMLhUxifcP+wYmY2MWjrMnXyHZBli28zBj
+LvmRnaeufEzarDasSKph70P+vVQAFiqFJTLMKvayK4mOuvje0IKukab09jRca5Up
+7qwYyFTkOhMD+EYl24Fi4F5mCAxazVfw0brYXj4rJ6OQgVC4kvulBk5gFM9ZqNsp
+cr12zU84swaUWzDj6CNE5kl+cVlbwQKKetUz4p1lEvVWs+ZHm8Ol06f7pij5w1Oe
+9tqr3SYyGFSRexuwcWG5QXTNrloRDC0wRtZumq0nDzD/N7Y0LqmnOfWRG87BL94H
+RMYE33tyK5Y960OWvBtzF8y0ugdJ48qZZLAayKuGdALBDP1ji1EteaY/RvlpwNU4
+2xd6joE/6feb9EoLPGZnJrgMXaTon4oPy00yiXVcpL+1DP92As6wuPgWPbGWHACj
+0mUkZjqD7kYv/wihu6pZm9HKXpTrdYfo7x3SpykpTTi4T0vw33nbPUzg18cO16K/
+KhF5jIHaSqKUnF4YF9zPQNcscf5gIRzmfohHHNiqILwYDL+LF7Xu1c6DYImFI7h6
+IETNzH2pTMcNbM4X51sklprsDZjRcXlp1iYo1FOwxs25rk3FEvIXTYbfV3Tj8Wbq
+idWGyS3oUxwEYI3w9KuxdfXiAql1Etl6yZ+ACKNhgC/GKMpyyI8dKTknN85LK0mA
++0aC+vQViG1gJg5xKosR
+=NBqO
+-----END PGP SIGNATURE-----
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>