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 | 90c1ca9ad69ac571a803d9661b180888b61c4966 (patch) | |
| tree | 0cde0e39f78bbc570b53874b81852d28f045fc33 /net-dns | |
| parent | Version bump (diff) | |
| download | historical-90c1ca9ad69ac571a803d9661b180888b61c4966.tar.gz historical-90c1ca9ad69ac571a803d9661b180888b61c4966.tar.bz2 historical-90c1ca9ad69ac571a803d9661b180888b61c4966.zip | |
Avoid applying CVE2009-0858 patch twice
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | net-dns/djbdns/djbdns-1.05-r23.ebuild | 11 |
3 files changed, 10 insertions, 10 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/Manifest b/net-dns/djbdns/Manifest index b84d1809db76..312f5e9bac44 100644 --- a/net-dns/djbdns/Manifest +++ b/net-dns/djbdns/Manifest @@ -28,6 +28,6 @@ EBUILD djbdns-1.05-r17.ebuild 5056 RMD160 ba3c7b670539f88b12c5c821908a7960057f5a EBUILD djbdns-1.05-r19.ebuild 5591 RMD160 2ff41c6ab18c2bed511e55ef14580ba833aaa946 SHA1 4e307120389b1f925579ae1ae11a0b20471fded7 SHA256 d827b404a5bf0ac7c794ad9cbbd836faa4a92e3a8fdf3d4f50d3b1abd419c6ee EBUILD djbdns-1.05-r21.ebuild 3219 RMD160 8ed5402131bf61b6c42a5315dff16c12867e83ba SHA1 c62e395457c34f70eba38bd4672edaacf7ed67d6 SHA256 feb1a2e6183ffdcc2768bbff345f673fdc39cee12becbe0199891b39febc79ca EBUILD djbdns-1.05-r22.ebuild 3399 RMD160 c507763f581f209dcbfcac6540bd8eb40329769d SHA1 f2fd53e364d859b2f5dbec273f87f6d78137e314 SHA256 e80ca1c2e2c52e9b355eb8864a9d7ff854ef9d9e03d4e26012e6b919d958a213 -EBUILD djbdns-1.05-r23.ebuild 3804 RMD160 4f41bb7b4572c5edff6bfab17876e588c7b312ea SHA1 efdb2edf00b83ebe08e73b4c1dee96244e585e28 SHA256 aa2475d3e4a899f85cf3744a26ba19204fc95a11126e5bd540181d95d52778e0 -MISC ChangeLog 17949 RMD160 3d9ca62bc4e58f471ee7bcdde28b55aef8abf8ac SHA1 6e518f6466f5a96954f1e447a804af387d0cc5ce SHA256 17a27f2973e7784e7ce5f1d46950bbac67c8f5dcc221296df70f313271445dfd +EBUILD djbdns-1.05-r23.ebuild 3701 RMD160 ec65d49301a47a7d17a1cd73b10d8309be4839a1 SHA1 81e251ce8725ecafe186330044258b93a4381a8b SHA256 7bed6cc1f19152b71f02334ca2e35f0704ef7ba0ce8d5d0cc3195f15134994ea +MISC ChangeLog 18064 RMD160 3edd554b07a9fadc97cd8b06c9b4d26d9f31e057 SHA1 8bd25224865ede462b48cb6aa24ef4d01c8c8fdb SHA256 208947d65963ee4619fd314747d0d21ce1091d08ebbd3db709b3ef14e25c2ed8 MISC metadata.xml 927 RMD160 869063a5348898678380f8ee4ed1ac5e0977deca SHA1 938d47ae4f6dc0c5dfe47a8188fbbf1b25a1ebc2 SHA256 324393413cb202a412ed5778927daa7b536c3a9b26ceb86edac69b4790c85c98 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}" ]] |