diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-03-20 10:36:21 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-03-20 10:36:21 +0000 |
| commit | ea265700a88a50d3f5cb60aabc63625cd075fc46 (patch) | |
| tree | 31bfce840435f16f61871003eac1c08aa9d96960 /net-dns | |
| parent | Version bump (diff) | |
| download | gentoo-2-ea265700a88a50d3f5cb60aabc63625cd075fc46.tar.gz gentoo-2-ea265700a88a50d3f5cb60aabc63625cd075fc46.tar.bz2 gentoo-2-ea265700a88a50d3f5cb60aabc63625cd075fc46.zip | |
Avoid applying CVE2009-0858 patch twice
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/djbdns/ChangeLog | 5 | ||||
| -rw-r--r-- | net-dns/djbdns/djbdns-1.05-r23.ebuild | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog index fa3621846ae3..d5f8bbb894cf 100644 --- a/net-dns/djbdns/ChangeLog +++ b/net-dns/djbdns/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dns/djbdns # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.111 2009/03/19 19:25:17 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.112 2009/03/20 10:36:21 gengor Exp $ + + 20 Mar 2009; Gordon Malm <gengor@gentoo.org> djbdns-1.05-r23.ebuild: + Avoid applying CVE2009-0858 patch twice. *djbdns-1.05-r23 (19 Mar 2009) diff --git a/net-dns/djbdns/djbdns-1.05-r23.ebuild b/net-dns/djbdns/djbdns-1.05-r23.ebuild index 956223db7b9c..07bc3a51be11 100644 --- a/net-dns/djbdns/djbdns-1.05-r23.ebuild +++ b/net-dns/djbdns/djbdns-1.05-r23.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r23.ebuild,v 1.1 2009/03/19 19:25:17 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r23.ebuild,v 1.2 2009/03/20 10:36:21 gengor Exp $ IUSE="doc ipv6 selinux static" @@ -44,6 +44,9 @@ src_unpack() { "${FILESDIR}/dnsroots.patch" \ "${FILESDIR}/dnstracesort.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." @@ -56,9 +59,6 @@ src_unpack() { "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch" \ "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" - # Fix CVE2009-0858 - epatch "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch" - cd "${S}-noipv6" fi @@ -67,9 +67,6 @@ src_unpack() { "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \ "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch" - # Fix CVE2009-0858 - epatch "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch" - epatch "${FILESDIR}/${PV}-errno.patch" if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]] |