Remove vulnerable version, bug #497092

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 18 insertions, 219 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 37244c5821c2..b8988838bdc2 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.327 2014/01/18 05:35:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.328 2014/01/20 13:11:06 blueness Exp $
+
+  20 Jan 2014; Anthony G. Basile <blueness@gentoo.org> -curl-7.33.0.ebuild:
+  Remove vulnerable version, bug #497092
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> curl-7.34.0-r1.ebuild:
   Add arm64 love.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index a54160a87724..ede8cf0c3cc4 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,26 +5,24 @@ AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e
 AUX curl-7.34.0-fix-ipv6-failover.patch 960 SHA256 8907994a7fbae7e652f33a4c6a04a1dbc73cf992d8495e21b79e7dd224191e99 SHA512 be345aaa8d9cc044957c0aadcb1b5348911055227593f9df53bca3e8a6dad16abe73f4b7a1c161c3bb3b2f1196691e14b6e69115ad78aa8c61d71d77aa6b66ed WHIRLPOOL fc6c2d66933e066ea4e0921fc4dd4d2e8a8bf83324976effc7913d8dfeced75263d4980d90bc2e52ce0111c26462fff2cdb464ff7ea45b71fcf9a955e4ed39cd
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
-DIST curl-7.33.0.tar.bz2 2747507 SHA256 0afde4cd949e2658eddc3cda675b19b165eea1af48ac5f3e1ec160792255d1b3 SHA512 13f61e8255859f3d1138bf7cc935bda90af5f51103f1660b9e9cc6dd63d37b7672752900f3a76f8c80d47a7c02061077c6417d53617576f4030e180552b75076 WHIRLPOOL 54a2533cb8cefe72a497cc1f45050967a26d0b438b5ef9bafc1e291d8d4af2f15c899d4b9664b0dc32dc0ecd2833da1bb093a64b41ada995b3395fc067afae12
 DIST curl-7.34.0.tar.bz2 2770438 SHA256 10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b SHA512 7158521e5d75f3f7e0373bed7a4e71351699239f7109ef43363d6f09c7bf6d65b64c3b54b62e65c709761cba2e08e35b728ac7458fbd68fe249b8471cce86971 WHIRLPOOL 7fd24acacb86f3739252d855dfe312aa880c454c356084265b0766d7ee9b9af6a36863f9cb4aea49c87aa64173cfbe19db431cfa7e3cac9deb594adfcc3b8936
-EBUILD curl-7.33.0.ebuild 6362 SHA256 ebec98f7eb09ee7ed2838c9d999b91803f872f917386a7381d3437bd2f10de08 SHA512 3f2714bf66addca0b17cf10afcc4261d4e3d3e2c5a0399806e5d291c207a2af44ee2b76f62b81533164561cee2949ac924656e22802b32ccbb2a3a9efbea647c WHIRLPOOL 97f8239d69754f33d3b03a1ef046871a61be74a15d828a75cdaf1dfb048a41ed15f9b0216b52d974faa7a2cc6be37a707c026af4986d9a4cce9c4085b7056a78
 EBUILD curl-7.34.0-r1.ebuild 6431 SHA256 5bb3467424a5f23033e58254756512f558a3b1ac7e436617f4d05b2506af9427 SHA512 32775f7e7e1996357b41ab091e9acac07afb2db2cb34b92455eb622065f0b46b922a73aaf4b65b3a129c7a7bc76bea6872606bc2d906ae4ee32f69c0967092c5 WHIRLPOOL 68ef27cb78da1941501cd2c3bfea981f24650b29d8a0919c69333be759aca7738494ace290c736f381390182ce4638cfeb2989d9802c9d45c1eab0b25c064015
-MISC ChangeLog 50049 SHA256 00612fcb8821ae3265aeab7d051d62fa935f27fdc3907562f60c0e366dbacb17 SHA512 7214aee4414ad6e3a55d84488ff9baa8bf4f9fa3f21ad075763b374407e73fecb0d878275d6112cc2ee1f4375656f0ef87e3f6b3c888b755530f4ecfc6709b7f WHIRLPOOL ced8d5717f4e3e50fb2d2406bfcac2ce8b913486816461554cff2957020fb04f68dfa187092208666a016c987175f56050a6f9bde40733e9a2c88c539d3018ea
+MISC ChangeLog 50169 SHA256 1b6fc499ab79ee8cf6d7b371fa09cf44dd16e5a8e5d9862e4cb9d922327bad87 SHA512 d328146a3182952c11c7fa31227ab106f7ae45823a7ea10924658cf63cdec6e2e452f0df75f0cec7a3bb3ac54f85bdf4bd3ffd848a95bc1c1953e8f8bcd2a682 WHIRLPOOL 2f8ee4f1704b5f50bf1ed733b581976ceefe69e2340cc97804698f32a046d16027617a7649121435a271116969132618ed559b9a5e1a90a3fd4937b2dbc95b1a
 MISC metadata.xml 880 SHA256 ef53f90725d173d6bdd004a59b05674abefedd0c83995c9c5d1bb85cc8146a0c SHA512 21a7128cf5753efba069da79931d179e58f5005354429dd8b2dd3adfd7e0d46f6f8231e531d6475750c46d2c0d1c099292ca2b04891cb5d3c282a90b5033ff86 WHIRLPOOL e5dd2cfd7ad52032b273274c8a82f53b0fded0acd3f377969bca4d7e190e1b6e8a0ce611fa0029ae200e1dba2929eb97e68f0f33eb4932a5df2eab0405677063
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2hKjAAoJEPGu1DbS6WIAT/QP/iHVsRunyi2F0El+PjqZTyi7
-fG0JuG6krucUSLt4XfXWdacM65GBxShpmdU5ltmE7+tkVQh+f3ehJjADPnZg217U
-lMEADQyPKk+nuh9S5uUDTWespcG64gI+BBvBR8RAQbBP4jfjnda/Ugug+3531sc0
-VysajgUHmNLa8dqcnEhwWO+M4G4IDCXtJ0hBOrzs3IN+8OqimpJQRRhtIcb+UbMS
-goVgRHObCeq4j8+bmpxGVwns5Rr4JvGvIKUGjiNXzcLNNJ5xgHoXXHTJ6TF2CHYb
-izDDAeU7llcU0Pzp7ELERZCEHV/TyO7f0nWrzDOQ0dq9RiLg5ttOfsVL3s/qMHVm
-R/RzjIURmdzM9Iw4H+qLWajY1L7J/rO9J/ooaYeVSwi6bw//eTpwmyk5v6MOrLK/
-PBLDPjWrhs7jukLxF03PTQJzML7OTfafaNsLBPChWTQ+qhnLDhMEiLAfEs3wzVvo
-JenE4RXqySSmDp1QHwoNp1c9zc0ycCwzEj7ZeQerLfqGqZQB3ElDDY9L/JczfSM4
-L6rijBXorOkCJcrEx4h/mlVBDCEEm9l1OE73kb7HLE3qMFqH+Y1RBZPSlVadnzF5
-4CuDSgVTHL24wnsfNatE2AZACvJ9zrAdewjJFtHi0mLlfZkb14YZ5nAkSFt3bLhv
-Y/7AvC1gJP/g5dYb5Iaq
-=rfra
+iQIcBAEBCAAGBQJS3SCkAAoJEJOE+m71LUu6BYEP/A0bxGGariNXnGh8IygEpps0
+irK0JnAcq4X2bPj053cmnsiI/sPOt5ehgoc0q2xmnK1NkzrQu4LtI+tnCqiIfe3K
+tWRa5P3LAb8oi50Ukc8NnEj7hbibbNU8QWKabltEXmdjSs83nSu0DOYl5RZ57xaR
+WItxmiDoZCApPSTJOJVtxwjvPqQ1rSskv7kMiVRXoHdT20scr7+NkcugYRfm5GeM
+jqbXf3M5k5g2+UqEXd1+seF3vk+XXeZv4x25PsjplRQ+CcdsHUHkMFRUX3pSSrvP
+9ceBj9+UD9nKxW6eZu4iV1RXrfgP6jWKaqvXQBlZ9pg1SyTWindKDilT92Uq6uW3
+eRU1hbf/7JsTTOV22XroL6B8jHkVWC+KB3NKpy1dbgdWbkpKVF6sDd2BHf/HvZcA
+EBHRJ3bQjHHhUWWUU+q6gLKlCsAxJU/CDh7lcpmYq7BttvC21O90yBGqJtXreZpi
+WXoSee1LHRxfAP/XvZxiO+VwNkCR3gAUC3TfNitD9kYB4QFVMMJw8tx7dQU4w6Mi
+B8SpT+bdvpTOQaoedcUOOLRhmeX2wuAR7A+ARb3eyWyLS6xJk+aectwH/ihqK1tx
+qgg7lmEiZRX1SjqhOb6esNpC3bIB3ou2dOeVBjmrbGvhkwXrkEmR7AJwVL7Nc2gw
+tuXxyWmdLB9NhvB5aM9Y
+=1ev/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.33.0.ebuild b/net-misc/curl/curl-7.33.0.ebuild
deleted file mode 100644
index 0aad8c80dbd1..000000000000
--- a/net-misc/curl/curl-7.33.0.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.33.0.ebuild,v 1.11 2014/01/16 06:27:47 vapier Exp $
-
-EAPI="5"
-
-inherit autotools eutils prefix
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		curl_ssl_axtls?  ( net-libs/axtls  app-misc/ca-certificates )
-		curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
-		curl_ssl_gnutls? (
-			|| (
-				( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
-				( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
-				( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
-			)
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
-		curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
-		curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates )
-	)
-	idn? ( net-dns/libidn[static-libs?] )
-	adns? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )
-	metalink? ( >=media-libs/libmetalink-0.1.0 )
-	rtmp? ( media-video/rtmpdump )
-	ssh? ( net-libs/libssh2[static-libs?] )
-	sys-libs/zlib"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_cyassl
-			curl_ssl_gnutls
-			curl_ssl_openssl
-			curl_ssl_nss
-			curl_ssl_polarssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	einfo "\033[1;32m**************************************************\033[00m"
-
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	local myconf=()
-	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl )
-	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			einfo "NOTE: axtls is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-axtls )
-		fi
-		if use curl_ssl_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		fi
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
-				einfo "gnutls compiled with dev-libs/nettle"
-				myconf+=( --with-gnutls --with-nettle )
-			else
-				einfo "gnutls compiled with dev-libs/libgcrypt"
-				myconf+=( --with-gnutls --without-nettle )
-			fi
-		fi
-		if use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use curl_ssl_polarssl; then
-			einfo "SSL provided by polarssl"
-			einfo "NOTE: polarssl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-polarssl )
-		fi
-		if use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-	einfo "\033[1;32m**************************************************\033[00m"
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	econf \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--enable-pop3 \
-		--enable-rtsp \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-proxy \
-		--disable-soname-bump \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		--disable-versioned-symbols \
-		--without-darwinssl \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		$(use_with metalink libmetalink) \
-		--without-nghttp2 \
-		$(use_with rtmp librtmp) \
-		--without-spnego \
-		--without-winidn \
-		--without-winssl \
-		--with-zlib \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-	rm -rf "${ED}"/etc/
-
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
-	insinto /usr/share/aclocal
-	doins docs/libcurl/libcurl.m4
-}