gentoo resync : 04.05.2019

3 files changed, 2 insertions, 158 deletions

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 70736b03d009..f4288f5b6676 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -14,9 +14,7 @@ AUX makefile-parallel-test25.patch 2828 BLAKE2B f450c46bf2702e787a410400a3d44824
 AUX srv_record_support.patch 5423 BLAKE2B 28167fbf8b404b926e484a4cf93ddf4b1ff450be23dad032e91d286497d7eee06793d6161d9a242fbe315ff969398cc532df816b2ae4462108d67593d2b90bcc SHA512 2efedc7c7aaa209bb4a9d65ef1b28934d68c216fd428a27a099ba4801e8be04e1417bdbbf0077088264cd8bc3eb2441855c96890189d8d73804243e6ca4d0851
 AUX string_length_255.patch 299 BLAKE2B 083d963d8d67baec402321c7fb8be2e485985ce03daea1d198912204dda6a90b794d5df3519b4177de8720122b46600cc9fe669f265cf9b81c75e4335ae081d6 SHA512 b451d23e1a45636dfae7cf69c64e3edde6b655bc0c7407586429e0d8282f17ef6215c6c33a6d238115c39d34fa57fa7699a7a10f146344c677fde10c0e207ac3
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
-DIST djbdns-1.05-test27.diff.bz2 20695 BLAKE2B 5eb2b5deeb81ec802bec4787b844f8b072e46a06ea28cf28a2702f8d545c3248256357669471f78b61f30c656b6f325bb8c0710dbdfa3ad2c2b00d5fb02bfc66 SHA512 e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
-EBUILD djbdns-1.05-r32.ebuild 4351 BLAKE2B ef4774774e33fc267e4a4f9f94c82c5d0e909cf32a8edbcec301991325e83c9d48a5ddc96f01a0f7fb5fc8e0f775133410fc97f61da861753f83bc774d8d6ea4 SHA512 03311e521344f266b46fa0e72e319363c22f344d330422343f6f4fb7474017ca97b6361decb7956a5e396b067a00aa11c82769945bec34ae285302a99804fd95
-EBUILD djbdns-1.05-r33.ebuild 3669 BLAKE2B cd377c17efade7cf27320b12a63dd5af23689c9049551803fc0afc78ffc4a1a618784a243557d3269e21b92dffa91905404a79d88134c437bf3be316492b8237 SHA512 327373b911ba458b7410c25a7be52dca868ced6c59aa3e24b74998e65bd433d927a7c1e2f2bd8463ea113fb2a682e3771efd15742f304837f2b658fd3609e0a7
+EBUILD djbdns-1.05-r33.ebuild 3668 BLAKE2B 88326348e308236be5cbd7cce6e1e08655df4560c76ac01cd696e3020f40242e68488b7d244cd40892bea1497abe88641298380a10a084b4483f72bdadbd6003 SHA512 474d4912e297b348cbfa8876e2f3dacc62f589e25d24ebbaa922584487b33a3a28a5933c80b36547846123a96e65776da441ef896ec5c0f02767cf28a144f916
 MISC metadata.xml 244 BLAKE2B c21c7a6cd7f859220baee98b22912e06955a7d63b4fc954a40507126ef6cb30659a3b7e89e798bb7d074814810f9625d3979ed2ac8877e213dc378da841bc786 SHA512 125b00b9e85650a6dcc365871f9f8be44d85cde4b938a66f7d96b6dc0237a1cae68b30be1ee16d7850998fc31be35eaf459df1bb7d9ea169904854b532f37bab
diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild b/net-dns/djbdns/djbdns-1.05-r32.ebuild
deleted file mode 100644
index acfed9c3992d..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-IPV6_PATCH="test27"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-	http://smarden.org/pape/djb/manpages/${P}-man.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="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="sys-apps/ucspi-tcp
-	virtual/daemontools
-	selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack(){
-	# Unpack both djbdns and its man pages to separate directories.
-	default
-
-	# Now move the man pages under ${S} so that user patches can be
-	# applied to them as well in src_prepare().
-	mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/headtail-r1.patch" \
-		"${FILESDIR}/dnsroots.patch" \
-		"${FILESDIR}/dnstracesort.patch" \
-		"${FILESDIR}/string_length_255.patch" \
-		"${FILESDIR}/srv_record_support.patch" \
-		"${FILESDIR}/increase-cname-recustion-depth.patch"
-
-	# Fix CVE2009-0858
-	eapply "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-
-	# Fix CVE2012-1191
-	eapply "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
-
-	if use ipv6; then
-		elog 'At present dnstrace does NOT support IPv6. It will'\
-			 'be compiled without IPv6 support.'
-
-		# Create a separate copy of the source tree for dnstrace.
-		cp -pR "${S}" "${S}-noipv6" || die
-
-		# The big ipv6 patch.
-		eapply "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-
-		# Fix CVE2008-4392 (ipv6)
-		eapply \
-			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch" \
-			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
-			"${FILESDIR}/makefile-parallel-test25.patch"
-
-		cd "${S}-noipv6" || die
-	fi
-
-	# Fix CVE2008-4392 (no ipv6)
-	eapply \
-		"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch" \
-		"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
-	# Later versions of the ipv6 patch include this, but even if
-	# USE=ipv6, we're in the ${S}-noipv6 directory at this point.
-	eapply "${FILESDIR}/${PV}-errno-r1.patch"
-
-	eapply_user
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo "/usr" > conf-home || die
-	emake
-
-	# 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'
-		cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
-		cd "${S}-noipv6" || die
-		emake dnstrace
-	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
-
-	if use ipv6; then
-		dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
-	fi
-
-	dodoc CHANGES README
-
-	doman man/*.[158]
-
-	readme.gentoo_create_doc
-}
-
-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
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS='
-To configure djbdns, please follow the instructions at,
-
-	http://cr.yp.to/djbdns.html
-
-Of particular interest are,
-
-	axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
-	dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
-	tinydns : http://cr.yp.to/djbdns/run-server.html
-
-Portage has created users for axfrdns, dnscache, and tinydns; the
-commands to configure these programs are,
-
-	1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
-	2. dnscache-conf dnscache dnslog /var/dnscache $ip
-	3. tinydns-conf tinydns dnslog /var/tinydns $ip
-
-(replace $ip with the ip address on which the server will run).
-
-If you wish to configure rbldns or walldns, you will need to create
-those users yourself (although you should still use the "dnslog"
-user for the logs):
-
-	4. rbldns-conf $username dnslog /var/rbldns $ip $base
-	5. walldns-conf $username dnslog /var/walldns $ip
-'
diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index 7f53b8fb3fcd..ef0a8724cc1e 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""