X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=net-dns%2Fdjbdns%2Fdjbdns-1.05-r25.ebuild;h=e05f6ba5196da854e6deacd5583c7ff33b7fa2fc;hb=db7a6cedf89179abe26ff77b7e976d851e92db56;hp=8e8da1641e57a2b37ba66653c8e71d71493817cf;hpb=89145cefbd8d06d51583ba7e459e9e7058a7dfc8;p=mjo-overlay.git

diff --git a/net-dns/djbdns/djbdns-1.05-r25.ebuild b/net-dns/djbdns/djbdns-1.05-r25.ebuild
index 8e8da16..e05f6ba 100644
--- a/net-dns/djbdns/djbdns-1.05-r25.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.3 2011/04/04 18:58:49 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r25.ebuild,v 1.2 2012/03/24 09:26:17 hwoarang Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs
@@ -27,17 +27,18 @@ RDEPEND="${DEPEND}
 
 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 'Several patches have been dropped from this ebuild.'
+	elog 'Please place custom patches in,'
+	elog
+	elog '  /etc/portage/patches/net-dns/djbdns'
 	elog
 	elog 'Some of them can be found at http://tinydns.org/ or'
-	elog 'http://homepages.tesco.net/J.deBoynePollard/Softwares/djbdns/'
+	elog 'http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/djbdns/'
 	elog
 
 	epatch \
 		"${FILESDIR}/headtail.patch" \
-		"${FILESDIR}/dnsroots-r25.patch" \
+		"${FILESDIR}/dnsroots.patch" \
 		"${FILESDIR}/dnstracesort.patch" \
 		"${FILESDIR}/string_length_255.patch"
 
@@ -46,7 +47,7 @@ src_prepare() {
 
 	if use ipv6; then
 		elog "At present dnstrace does NOT support IPv6. It will"\
-		     "be compiled without IPv6 support."
+			 "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"
@@ -54,7 +55,8 @@ src_prepare() {
 		# 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}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
+			"${FILESDIR}/makefile-parallel.patch"
 
 		cd "${S}-noipv6"
 	fi
@@ -66,16 +68,8 @@ src_prepare() {
 
 	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
+	cd "${S}"
+	epatch_user
 }
 
 src_compile() {
@@ -117,11 +111,14 @@ src_install() {
 
 	dobin "${FILESDIR}/dnscache-setup" || die
 	dobin "${FILESDIR}/tinydns-setup" || die
-	newbin "${FILESDIR}/djbdns-setup-r17" djbdns-setup || die
+	dobin "${FILESDIR}/djbdns-setup" || die
 }
 
 pkg_preinst() {
-	# The nofiles group is provided by baselayout
+	# 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