From 5059ff77e8bd6e9910a06690a6396f7f3fc99844 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 4 Mar 2012 19:51:17 -0500 Subject: [PATCH] Switch back to -r25 from portage. --- ...1.05-r27.ebuild => djbdns-1.05-r25.ebuild} | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) rename net-dns/djbdns/{djbdns-1.05-r27.ebuild => djbdns-1.05-r25.ebuild} (82%) diff --git a/net-dns/djbdns/djbdns-1.05-r27.ebuild b/net-dns/djbdns/djbdns-1.05-r25.ebuild similarity index 82% rename from net-dns/djbdns/djbdns-1.05-r27.ebuild rename to net-dns/djbdns/djbdns-1.05-r25.ebuild index 9b19cdb..69d8def 100644 --- a/net-dns/djbdns/djbdns-1.05-r27.ebuild +++ b/net-dns/djbdns/djbdns-1.05-r25.ebuild @@ -1,14 +1,16 @@ -# 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.1 2012/03/02 22:57:00 hwoarang 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" +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" @@ -35,38 +37,34 @@ src_prepare() { epatch \ "${FILESDIR}/headtail.patch" \ - "${FILESDIR}/dnsroots-r25.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" - # Fix CVE2008-4392 - epatch \ - "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \ - "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch" - 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 "${FILESDIR}/ipv6-mjo.patch" - - # The ipv6 patch is a little sloppy in the Makefile. - # Anything depending on socket.h should depend on uint32.h as well. - epatch "${FILESDIR}/makefile-uint32-fix.patch" + epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2" - # Parts of the ipv6 patch fail due to the CVE2008-4392 fix above. - # The following two patches fix those hunks. + # Fix CVE2008-4392 epatch \ - "${FILESDIR}/query.h-mjo.patch" \ - "${FILESDIR}/query.c-mjo.patch" + "${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" if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]] @@ -124,7 +122,10 @@ src_install() { } 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 -- 2.44.2