Revision bump: utilize epatch_user instead of DJBDNS_PATCH_DIR wrt bug #413787, update rootservers patch, wrt bug #474512, thanks to Michael Orlitzky

Package-Manager: portage-2.2.0_alpha181/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 141 insertions, 15 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 5a629c6cd876..242b086ca0a0 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.139 2013/06/23 18:40:19 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.140 2013/06/23 18:53:24 pinkbyte Exp $
+
+*djbdns-1.05-r27 (23 Jun 2013)
+
+  23 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> +djbdns-1.05-r27.ebuild,
+  files/dnsroots.patch:
+  Revision bump: utilize epatch_user instead of DJBDNS_PATCH_DIR wrt bug
+  #413787, update rootservers patch, wrt bug #474512, thanks to Michael
+  Orlitzky
 
   23 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> -djbdns-1.05-r23.ebuild,
   -djbdns-1.05-r24.ebuild, -djbdns-1.05-r25.ebuild, -files/djbdns-setup-r17:
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index eee12e9c27c4..912f2e796cdd 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -9,7 +9,7 @@ AUX CVE2008-4392_0002-dnscache-cache-soa-records.patch 2944 SHA256 1cd7b84830564
 AUX CVE2009-0858_0001-check-response-domain-name-length.patch 366 SHA256 8ca8bd81fa6fb17576f11de9e97a582f0c30d7f5c6e797defa41a98d33770e33 SHA512 aa5fe75be9db07b25e313145a209a06a05693141c1dd850987e80062e22014056e3055efee4d219475c9a51f25c04a7a46b3d7a2fb3976226e66585cef076f83 WHIRLPOOL 53e607ed9023a16bb96c132b2c237bca542c0d78fdd36c109ba808ca8f3c24f872d8fac48d10c7b7992fc5fa40f7495f64fc96430898a19aacf2a1f0795eebe7
 AUX djbdns-setup 10881 SHA256 33c64d8341ea868e124e7fe0da6a8f9ba6fc799a79584e002a82c572921ed5e4 SHA512 119dd08a5cac0cd2d35ebeb0fd165eb68b3176eb670bbd4bccbb9034a128d74cf431bb3be4ddd648fb125d7d6db3e30911b46559fc1645a0ffd2d872288e2e63 WHIRLPOOL d3af75b2ec2c4fa8abaa5c08c06f1027d7d326ee11b09f712293966c44236c02eafb27774fe8d57180428bff5c7013c6cca119aa9e4bd5bb8e9cc6710ba8a2bf
 AUX dnscache-setup 6013 SHA256 dcf78d102db9b6407a7886f01b830a5509724ce4540068444ef4f0e5cf9ea6e2 SHA512 613a06da2a97d3d5dc43f9a57808752edd459bf3f9146a93b807f19cb1e84816b226ec1a4c5726334ba5a29c88702aac11f1d5832d833e2fb5f2dde1b10c5de5 WHIRLPOOL ea83edec3636ea5c8a29d3adc7c9e9f41abc820f577d65f54d64db5ac671d5601ffdc9e637fbde446519b4696106bfa8e4b7046cd267ae723bf751e31d84b348
-AUX dnsroots.patch 356 SHA256 94e3e8fe9fee39729ec8c8f314ab2adaf7d8e1f48957da888ab990411ba2a3bb SHA512 4f4784012a0be0e89d58245597d67ddc7621feb59146d8614c5625c5fadf63b5caf87664be39855ed0ecb13b0051b39e9920c8c5f6968cdcfa2fbee6fc6ff8f7 WHIRLPOOL 100a1a571f6f837bdab84c8575284222f3383fec4993472abd8b1c33de52dfa6488d50c468717aab19aeacbc935aeee1f8fe6f17820cea680f16962d23dc829e
+AUX dnsroots.patch 296 SHA256 9fe0552708f6cacd2ace4dca21e3f393acc01e73ac9e2b622aa4fe3a5874fe48 SHA512 2c745f2545d791ed6646406e749ef8e85c30b4546657ce241c413103e42cf3cfb5001c46481bd2966390563a9cc42e53e44519747350da2b8bb0fdf1d0f5c62e WHIRLPOOL 44ef58d43e35c33cf78439cefe9e5888f4f27f2151b36b7192aea0730eb3f0d5f7f9591dd6831c6aa286b23415f8e0cdc67a498d175a4583701f5f8ab795ac50
 AUX dnstracesort.patch 327 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf SHA512 ae9cd51f24041aed135b5ba88d1efd0310b8095bccd6fb60a986756b460a4f98a93e163c3ddae7c146d56a9d41778d17449f772b91fdc58d9e69523cf6c2a6e9 WHIRLPOOL 4006c47b039623c8bba8718716a442a3d2dc1705936f83cd1556e4b49cc3de0dc7c6e828e908130bc7584809f551fac68f12f466e21cefd666076db8e63d4399
 AUX headtail.patch 1780 SHA256 28ebe521132fe35559273b6542505ab4f0bb7b7ccb88585522e4cc2fe8376dd4 SHA512 0f2625d59f432983ea5c94952957bb08da42ad36dc4c50e0d33ccfe8059f5605650dbb8c22a058b9bd1d75e7032ea5f9ca319a0a2ce5496b1b2129bf9d3f4bdc WHIRLPOOL 400af928a07688b9569e0a71098bdbb18d788c26e8225f4f037ac87cde87f0deb0c8f4f5d9326f4777abca395e8434fc57466df46fe6e3911ba3402e0b5b3ce3
 AUX makefile-parallel.patch 2182 SHA256 cec0762d0f3a1469b854bcfc0af6bb42b5bf2d81b623dcfa7c7e9bf516f28fec SHA512 82dbddb67160e4bc38c223cfa6f5377dfa3b79aed24bf7c8a6e429766885b400c31c0ee2e0391ef1561a3d0dc935e999b291d792e10acc96c1f4d32ddc95ac74 WHIRLPOOL 55935e24af2fd5b3adcd43e7ae7fb13a9679984c28f652fa34356cbca10356584a065f299bd2c77f14f238ae50a93b8ff515711b493bf2d425c8a179b9417a5f
@@ -18,16 +18,17 @@ AUX tinydns-setup 3212 SHA256 2d4e144e5408793f1d5ffa23abc510a04e449a6306965c1a35
 DIST djbdns-1.05-test23.diff.bz2 18480 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 SHA512 a19e9af9096b97f7b73eca55bdb9bbd9df66bdef052da8323b1e7d5de5a83565f5e9f78b16552c837ad9e9edca899af9a0e6a1ab7f3f23a4ecb89400b87113c8 WHIRLPOOL d4863044e268f5a59f0c114caec4c3735497d49a13cd298e0447475db321141e868bbcd29b3004df12217f74421a026c720ec8615a233f505263752d5b759d65
 DIST djbdns-1.05.tar.gz 85648 SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 WHIRLPOOL 0fb67d19fcbf1cf21debcedfd3456d9cb9160079631ae1995e94aa9db3969ae02927f215ee8a5f03b34a6523cb9e3abebabf23e08e95eb1efdb626eb8b10312f
 EBUILD djbdns-1.05-r26.ebuild 3961 SHA256 80630b561baa77dbf96cc61b3f2eb1c027765e5d47c324434760adfc5f4cd572 SHA512 24e6e144537011324fbeacaafd27e2698d61bd6d68f0644cd56e6909b5297ee92f4f592c8e9cfd81198e7d7285b2de7dd188d2b376a6235b7dd8b45436b826b4 WHIRLPOOL 68afe576c37866e845d9febb38f38c12da6509a1252b9f8d34f4ead91068b0505160163987d7b3244aa5b7c11b25918191478bc9f652c452a8b40d2e774f8331
-MISC ChangeLog 22087 SHA256 e02a9755849190067557c9a3aedac7b8f2dbbc44cd18b93e2e73bb616658552f SHA512 9ececd9d7d87c51500ae9ea1bd7caf7f0be950cc933354d139911f298be18eeff8e0669d3d9b645f5809bad266a0768527f1435d469ac96237cbd3f0570f7cb2 WHIRLPOOL 8410d6fa2a8be45d5b2b2847e6f8973964d4fca2b0d45821513227276b115ef8ead1e1fcea7a757238d39875c66f281ced428684348c7b512a2f930ac16783c3
+EBUILD djbdns-1.05-r27.ebuild 3250 SHA256 fcb155fe18abe95182f7aad59ae418007c0d2907109da515f6437f239108987b SHA512 c2975d4d4aa505dcaae89c22dbcff2c0f6b5001f3d43ba1fa55e9b4966dce6be7806627061b64f5f76734fe1f7aa49c94c3da3774ae0aa4f1fa7ea4a89342d19 WHIRLPOOL 7d1640db149b5d416118d8c490ae82d7bc034ea0a1f18ecd96df003d1f596249df3987b6c57e5f522cba32faa88dc25104ce1ca0cbe1c5b310c322e3c8b6c050
+MISC ChangeLog 22375 SHA256 1446fbbae548c0734f45f692575ecd2abdba494c993c37992603825997ac2822 SHA512 662052e429f5f8742c5a0dcccdc2fd749738382cdb8192b7ded4a098ac930d91f0688312afd56ea2c5e3058f689b314b05f61c6a00b9f967b28395943af3ad30 WHIRLPOOL 09b9df421659a7e51a692b0cf719248eea39c7a762874edd2af1f947fa1f15be9583abff3a66d123c51b8e5d1a6fe52f02641a249ec0499d105e67064a1de0e8
 MISC metadata.xml 324 SHA256 cd10dc67d53c2ee12423ca358e6b04188c4ae85c1ed945fef040da26bc01dcad SHA512 d1ec3bdca7d807a1a762d75d78f004e9c147115cde7def97e25fc62710b246e894cdf9b09605a5cb64012ba3882bc86bb5c49a5304557dbf8ae96f2959fffa5a WHIRLPOOL 9bd29cca54cd3558b6de8c36bc1836ed583ef9a719d13f41b3c43dc2e1f84f0ac8896d0ad815ee22062478c3c57de48ade4d49dfddc1ef5b1b87367e0cf758ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRx0EVAAoJECo/aRed9267W20H/3XqjMTUxNb8hYBkEYGcBnzF
-LW3xVFU/GFPwpCrAFuLvYh+wezXe4zcZYd6JY5h8tmcXuG8jm9rZ950Qew09s0Ui
-Y7VkAkbL/L2idxS2OLs8zrofMupEI3AQr8YSY/nvvPxcDAjz34gEly+j74ryN8yE
-7EsvYrOh56dwReMvmKX/oV47m7CFTLlLBcBG5HbTKxkBv6SWrsNKzKfzLDxaeK2Q
-vxadgOOv0YnQ6I8A1oQwPlIP8TYLoLKTBGUVKWAudCTFs484jEJWsKHlnO+Z9ak6
-KNEi+97Lpw5gVkRCY4Gl/RisgRBjzKfliwNwNItZI4doS36eHrPD1L+731MTSmw=
-=43Yj
+iQEcBAEBCAAGBQJRx0QmAAoJECo/aRed92671R4H/jGbTx06j315v2JNn2tDT0gg
+v0h3bkAqXLboI4akbzWC73kvOAV9pR8GlHRKdN+8FvUzPmu+ShiVUmBiHUsDe+PV
+p9gHoep7X3P4xDNpDl6IqyFfLi/MimZiNns+/Q0I80Rt/W8Ej3UhAmNRzLid1bYf
+MWx8zAY/sECHEQKhme/Is9U/W746MnFUcIyWr3XgVpgYKMf4pN3YM0FlMetWwz1u
+UOF9fsnUN9kDGzRzycs9pJ9BWZXgM3DE2YXrZElJpx2J9l61o512Y38rvOCuZu57
+3G/T1n+GNXzmpyqJUBXM4+IJC/ag6XdUbHTbr9tQhQeDx5NEt8SMYGCQYURMS6M=
+=sAM5
 -----END PGP SIGNATURE-----
diff --git a/net-dns/djbdns/djbdns-1.05-r27.ebuild b/net-dns/djbdns/djbdns-1.05-r27.ebuild
new file mode 100644
index 000000000000..a596d9231a79
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r27.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r27.ebuild,v 1.1 2013/06/23 18:53:24 pinkbyte Exp $
+
+EAPI="2"
+inherit eutils flag-o-matic toolchain-funcs user
+
+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() {
+	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" \
+			"${FILESDIR}/makefile-parallel.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"
+
+	epatch_user
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+	emake || 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 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
+	dobin "${FILESDIR}/djbdns-setup" || die
+}
+
+pkg_preinst() {
+	# The nofiles group is no longer provided by baselayout.
+	# Share it with qmail if possible.
+	enewgroup nofiles 200
+
+	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/dnsroots.patch b/net-dns/djbdns/files/dnsroots.patch
index 274c6b7e6c97..d2524be5a870 100644
--- a/net-dns/djbdns/files/dnsroots.patch
+++ b/net-dns/djbdns/files/dnsroots.patch
@@ -1,13 +1,14 @@
---- a/dnsroots.global	2001-02-11 16:11:45.000000000 -0500
-+++ b/dnsroots.global	2011-04-04 11:10:58.005648634 -0400
-@@ -1,5 +1,5 @@
+--- a/dnsroots.global
++++ b/dnsroots.global
+@@ -1,13 +1,13 @@
  198.41.0.4
 -128.9.0.107
 +192.228.79.201
  192.33.4.12
- 128.8.10.90
+-128.8.10.90
++199.7.91.13
  192.203.230.10
-@@ -7,7 +7,7 @@
+ 192.5.5.241
  192.112.36.4
  128.63.2.53
  192.36.148.17