purge vulnerable versions (sec bug #184934)

Package-Manager: portage-2.1.2.12

6 files changed, 10 insertions, 162 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index cfe0645b238f..7e46d89bb894 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.101 2007/08/10 12:42:13 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.102 2007/08/26 01:13:21 dragonheart Exp $
+
+  26 Aug 2007; Daniel Black <dragonheart@gentoo.org>
+  -files/curl-7.15.1-test46.patch, -files/curl-7.15-libtftp.patch,
+  -curl-7.15.1-r1.ebuild:
+  purge vulnerable versions (sec bug #184934)
 
   10 Aug 2007; Christoph Mende <angelos@gentoo.org> curl-7.16.4.ebuild:
   Stable on amd64 wrt bug #187731
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index c70561a82e4a..6cd2750c2a17 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX curl-7.15-libtftp.patch 651 RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2 SHA1 faefd6e0e7283c9ad57ff6d079d0891a29222930 SHA256 93a7f7ed54d04af4958cbc86b6c4845a667b3aaf90b455c6de8d5614a0781d79
-MD5 9359740309a1cbbeb6a7a5e065586ffd files/curl-7.15-libtftp.patch 651
-RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2 files/curl-7.15-libtftp.patch 651
-SHA256 93a7f7ed54d04af4958cbc86b6c4845a667b3aaf90b455c6de8d5614a0781d79 files/curl-7.15-libtftp.patch 651
 AUX curl-7.15-strip-ldflags.patch 636 RMD160 da2a9e8137eb71f0d077d66b9e1580235027f537 SHA1 b8ab23f437d09be49a8f368be8b1822432ab2a93 SHA256 b86804e3a9e3ba9d841e85b2832dc1323dd52895e1b533d0a5782ab668a9609f
 MD5 2ad44b988a7d9da3ea4b3a9926716eaa files/curl-7.15-strip-ldflags.patch 636
 RMD160 da2a9e8137eb71f0d077d66b9e1580235027f537 files/curl-7.15-strip-ldflags.patch 636
 SHA256 b86804e3a9e3ba9d841e85b2832dc1323dd52895e1b533d0a5782ab668a9609f files/curl-7.15-strip-ldflags.patch 636
-AUX curl-7.15.1-test46.patch 929 RMD160 30bff8e56226a5db2c034fd5883e9f1d386623a9 SHA1 cf11c4cdb865d0709de8beeeaa59437efb2cd933 SHA256 eb981acd24581ac8034a48a03d276a80fa59027fef0dde8736cab67813b10f9f
-MD5 fb8fd9ce337fa113e817a230adf4a8e6 files/curl-7.15.1-test46.patch 929
-RMD160 30bff8e56226a5db2c034fd5883e9f1d386623a9 files/curl-7.15.1-test46.patch 929
-SHA256 eb981acd24581ac8034a48a03d276a80fa59027fef0dde8736cab67813b10f9f files/curl-7.15.1-test46.patch 929
 AUX curl-7.15.1-test62.patch 673 RMD160 4f9bd6355cc2289755892ae4142f9853b870a50a SHA1 4c2a0312d9f07ef42493a7138954cab53e8a7d9d SHA256 907e23481083da32f2f85d586067d1f51e3eddc1dd11157c70a2573bea66eec1
 MD5 413a2f8480b1a8a0912ccb1cb7e154f7 files/curl-7.15.1-test62.patch 673
 RMD160 4f9bd6355cc2289755892ae4142f9853b870a50a files/curl-7.15.1-test62.patch 673
@@ -25,13 +14,8 @@ AUX libcurl-gnutlscert.patch 1498 RMD160 286859e0870c6e5aa21047b28b2c256f7b7bfff
 MD5 c92c1997f7cf421df077b1e176708f8c files/libcurl-gnutlscert.patch 1498
 RMD160 286859e0870c6e5aa21047b28b2c256f7b7bfffe files/libcurl-gnutlscert.patch 1498
 SHA256 4b0a9db99ddc698c39484a95cba1f52c0dc17ed34f2d7e1dd780f925bf21761b files/libcurl-gnutlscert.patch 1498
-DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA1 2b94192557954bba396bfbb980feed17aadc6295 SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
 DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0 SHA1 b79ee06d1da58c12c23a1b8aeccdb2b74a692cc7 SHA256 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
 DIST curl-7.16.4.tar.bz2 1668101 RMD160 ee59976f7ce9161be3d5ebdb44903dee597fbd68 SHA1 a26a8796f5fc851b23423bc419c80e27d3e09483 SHA256 45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b
-EBUILD curl-7.15.1-r1.ebuild 2259 RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c SHA1 a042998854a51d5d29396fa1e1352528d2c4558a SHA256 60e895f2f1d8152febd1495ef3f62a7363d4a67525e2e373fd96c6ba779af9d7
-MD5 a8d25b53972d71f84e5e035c5b248a1c curl-7.15.1-r1.ebuild 2259
-RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c curl-7.15.1-r1.ebuild 2259
-SHA256 60e895f2f1d8152febd1495ef3f62a7363d4a67525e2e373fd96c6ba779af9d7 curl-7.15.1-r1.ebuild 2259
 EBUILD curl-7.15.5-r1.ebuild 2236 RMD160 e52ae4d3420183ff90088e8f9391f4706982876b SHA1 610f71dff18426d9efac0cd7075acc5bc42b3730 SHA256 3f257480df0b9fe040d374740a9654688b484065c0cdd284787a0a6d314da04d
 MD5 8bd220034f660234d6a179ba4e7f896d curl-7.15.5-r1.ebuild 2236
 RMD160 e52ae4d3420183ff90088e8f9391f4706982876b curl-7.15.5-r1.ebuild 2236
@@ -40,27 +24,17 @@ EBUILD curl-7.16.4.ebuild 3125 RMD160 416421c8ca021c69680d964757bd004e4edcb907 S
 MD5 412f82d27a6043de8ac655383d27a106 curl-7.16.4.ebuild 3125
 RMD160 416421c8ca021c69680d964757bd004e4edcb907 curl-7.16.4.ebuild 3125
 SHA256 f7474a2750e0817ba5681fd1d3f1ad6f39d69ab3ee1afbe50fcfaba51cf92c1f curl-7.16.4.ebuild 3125
-MISC ChangeLog 18335 RMD160 2600e156e55dc2863bfaacaf82646d97824ed3f8 SHA1 34fe22640e0b6aef5b501ed176c306b69cdd9c51 SHA256 64bad83f019c4f720e0e2d141eb7d8dff11deea9f9ec59225e313c071bc17d32
-MD5 c8953825547ed82a9dcaaa4e2d8b0486 ChangeLog 18335
-RMD160 2600e156e55dc2863bfaacaf82646d97824ed3f8 ChangeLog 18335
-SHA256 64bad83f019c4f720e0e2d141eb7d8dff11deea9f9ec59225e313c071bc17d32 ChangeLog 18335
+MISC ChangeLog 18532 RMD160 e9217fbc3059df9929c3cb124820c8d6ae9510b1 SHA1 3a69ffe4a17323f12a289b35d091f37fad313f71 SHA256 a39dc2072fef1682588fa12424ee997cfb3eadbe49503a1b987bc0c061148ead
+MD5 884ff061840883cbdd98c1b32c9d7140 ChangeLog 18532
+RMD160 e9217fbc3059df9929c3cb124820c8d6ae9510b1 ChangeLog 18532
+SHA256 a39dc2072fef1682588fa12424ee997cfb3eadbe49503a1b987bc0c061148ead ChangeLog 18532
 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180
 MD5 2fca58a7644b7fd5e240d2054ab94fbe metadata.xml 223
 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 metadata.xml 223
 SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180 metadata.xml 223
-MD5 5da73178c73613470017f6ffe034605e files/digest-curl-7.15.1-r1 241
-RMD160 c18045697e94d5bbff88bdab7149ed6655666748 files/digest-curl-7.15.1-r1 241
-SHA256 0a9301fda2b9152303983b152f3e53f4c9900f6bc0fce5af99f472529c566994 files/digest-curl-7.15.1-r1 241
 MD5 923fb85d0dc3de18b01240d300aabb21 files/digest-curl-7.15.5-r1 241
 RMD160 9d700b90adbaf4ff83433206c6e63e5ba86c5637 files/digest-curl-7.15.5-r1 241
 SHA256 7421859a42befe5d3c3777b0e96e5fb1f3d55fc0f9616b039237eb9ecac5e1e0 files/digest-curl-7.15.5-r1 241
 MD5 06621c3d6c9655dd837b65cb9f745461 files/digest-curl-7.16.4 241
 RMD160 96b1e64f153d42cb172c731f826a0b6a4073828f files/digest-curl-7.16.4 241
 SHA256 2b765d39cc17a0f808332063befb10677953b486ab76e28df8f4057871d7701e files/digest-curl-7.16.4 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFG0D49p/wUKkr7RBoRAuHLAKDcUNWeD4Ho6vYTcYQWWjEQOhK4JACfUMnA
-XsAxp7irvFROFFDK+yXvivk=
-=HEhA
------END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.15.1-r1.ebuild b/net-misc/curl/curl-7.15.1-r1.ebuild
deleted file mode 100644
index 302020958951..000000000000
--- a/net-misc/curl/curl-7.15.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1-r1.ebuild,v 1.11 2007/04/14 00:35:26 dragonheart Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit eutils
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 ldap ares gnutls idn kerberos test"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/libidn )
-	ares? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/curl-7.15-libtftp.patch
-	epatch ${FILESDIR}/curl-7.15.1-test46.patch
-	epatch ${FILESDIR}/curl-7.15.1-test62.patch
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable ldap)
-		$(use_with idn libidn)
-		$(use_enable kerberos gssapi)
-		$(use_enable ipv6)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-nonblocking
-		--enable-largefile"
-
-	if use ipv6 && use ares; then
-		ewarn "c-ares support disabled because it is incompatible with ipv6."
-		myconf="${myconf} --disable-ares"
-	else
-		myconf="${myconf} $(use_enable ares)"
-	fi
-
-	if use gnutls; then
-		myconf="${myconf} --without-ssl --with-gnutls=/usr"
-	elif use ssl; then
-		myconf="${myconf} --without-gnutls --with-ssl=/usr"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl"
-	fi
-
-	if use kerberos; then
-	   myconf="${myconf} --with-gssapi=/usr"
-	fi
-
-	econf ${myconf} || die 'configure failed'
-	emake || die "install failed for current version"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "installed failed for current version"
-
-	insinto /usr/share/aclocal
-	doins docs/libcurl/libcurl.m4
-
-	#insinto /usr/lib/pkgconfig
-	#doins libcurl.pc
-
-	dodoc CHANGES README
-	dodoc docs/FEATURES docs/INTERNALS
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-misc/curl/files/curl-7.15-libtftp.patch b/net-misc/curl/files/curl-7.15-libtftp.patch
deleted file mode 100644
index c92c66417f2e..000000000000
--- a/net-misc/curl/files/curl-7.15-libtftp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup curl-7.15.1/lib/tftp.c curl-7.15.1/lib/tftp.c
---- curl-7.15.1/lib/tftp.c	2005-12-05 15:10:37.000000000 -0500
-+++ curl-7.15.1/lib/tftp.c	2006-03-18 20:16:02.000000000 -0500
-@@ -271,7 +271,7 @@ static void tftp_send_first(tftp_state_d
-       /* If we are downloading, send an RRQ */
-       state->spacket.event = htons(TFTP_EVENT_RRQ);
-     }
--    sprintf((char *)state->spacket.u.request.data, "%s%c%s%c",
-+    snprintf((char *)state->spacket.u.request.data, 512, "%s%c%s%c",
-             filename, '\0',  mode, '\0');
-     sbytes = 4 + (int)strlen(filename) + (int)strlen(mode);
-     sbytes = sendto(state->sockfd, (void *)&state->spacket,
diff --git a/net-misc/curl/files/curl-7.15.1-test46.patch b/net-misc/curl/files/curl-7.15.1-test46.patch
deleted file mode 100644
index ee443d956341..000000000000
--- a/net-misc/curl/files/curl-7.15.1-test46.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-===================================================================
-RCS file: /cvsroot/curl/curl/tests/data/test46,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -r1.13 -r1.14
---- curl/tests/data/test46	2005/05/24 10:03:13	1.13
-+++ curl/tests/data/test46	2006/02/06 20:02:14	1.14
-@@ -43,7 +43,7 @@
- 
- www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
- www.loser.com	FALSE	/	FALSE	1139150993	UID	99
--127.0.0.1	FALSE	/	FALSE	1139150993	mooo	indeed
-+127.0.0.1	FALSE	/	FALSE	1439150993	mooo	indeed
- 127.0.0.1	FALSE	/	FALSE	0	empty	
- </file>
- </client>
-@@ -67,7 +67,7 @@
- 
- www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
- www.loser.com	FALSE	/	FALSE	1139150993	UID	99
--127.0.0.1	FALSE	/	FALSE	1139150993	mooo	indeed
-+127.0.0.1	FALSE	/	FALSE	1439150993	mooo	indeed
- 127.0.0.1	FALSE	/	FALSE	0	empty	
- 127.0.0.1	FALSE	/	FALSE	1262322000	ckyPersistent	permanent
- 127.0.0.1	FALSE	/	FALSE	0	ckySession	temporary
diff --git a/net-misc/curl/files/digest-curl-7.15.1-r1 b/net-misc/curl/files/digest-curl-7.15.1-r1
deleted file mode 100644
index b801ba19eb94..000000000000
--- a/net-misc/curl/files/digest-curl-7.15.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d330d48580bfade58c82d4f295f171f0 curl-7.15.1.tar.bz2 1437950
-RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae curl-7.15.1.tar.bz2 1437950
-SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324 curl-7.15.1.tar.bz2 1437950