gentoo bug #260361 - CVE-2009-0037. thanks security team

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 118 insertions, 2 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index c9bb5dbfad2e..ff4bb74c355f 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.137 2009/02/17 17:12:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.138 2009/03/03 19:34:59 dragonheart Exp $
+
+*curl-7.19.4 (03 Mar 2009)
+
+  03 Mar 2009; Daniel Black <dragonheart@gentoo.org> +curl-7.19.4.ebuild:
+  gentoo bug #260361 - CVE-2009-0037. thanks security team
 
   17 Feb 2009; Raúl Porcel <armin76@gentoo.org> curl-7.19.3.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #258618
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 80b3d2100c7b..539a9a61ea5a 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,10 +10,12 @@ DIST curl-7.17.1.tar.bz2 1721551 RMD160 8ab8dc7a33a5265dfe25eb0725248c3cd6519510
 DIST curl-7.18.2.tar.bz2 1744472 RMD160 d82bcdcdbc18d44a833f8824555ded09b03cd859 SHA1 0a4d6878d6be22bb2d701a6cf9bf665f66fc8b87 SHA256 b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
 DIST curl-7.19.2.tar.bz2 2168458 RMD160 e1a609ee205818206008c4990399045f1e7c22e6 SHA1 ba6273faca36e8e81046578080174160212ad73a SHA256 60091fe65ad3aed9b5151cb4e8fcfaf56567c5ae705fdf4246854625eb91c272
 DIST curl-7.19.3.tar.bz2 2238923 RMD160 8f3074728776d6ad8e3c129eb63b41258a29552a SHA1 c2ee72537d422bac1b10d8bfaa0401c12a3b2407 SHA256 965608e49500fb548ab3308556462fdc950474ab7646daaed77051d791093222
+DIST curl-7.19.4.tar.bz2 2296879 RMD160 91f46c421e0f23f268640d39f45a74621e951245 SHA1 6b8cb206990cd68d8653cea16a47bd0febd5c50d SHA256 fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
 EBUILD curl-7.16.4.ebuild 3131 RMD160 0f59c206dbb61de7b778a76ab48205715545f042 SHA1 adda0afc7fe48fbae677f0c52ae24afc6019a1db SHA256 be3ff7d0776977ae7a2e4ac905b4d2f231a6395d92181e2215bb9678d0baf0c2
 EBUILD curl-7.17.1.ebuild 3862 RMD160 7ab7dab638a3789798941419fdf1b23935e73797 SHA1 83fd7d4f8b37215fe00cb0784ba676a0821c09ea SHA256 5659abb5f9a21e3f7014043bb7811f16a34e0d0394602c61e219f15313f1e0fc
 EBUILD curl-7.18.2.ebuild 3577 RMD160 94039dc537acf2cf5a2899801afd992425bc7ffb SHA1 00b61547ac9ce665aa9f5015e0b09048db88061f SHA256 3ad1c2f649345b90c13764280d3401cb410c6309f2aa404e7349dd7357e97713
 EBUILD curl-7.19.2.ebuild 3586 RMD160 b1af78d33d4ada640ee8dc9e8a46e8ab0cd6a2f2 SHA1 aded38b3c82ce56a3e4a0d9ae52a02edd53475ce SHA256 677ab472556f031d7bd559caf8f1dc03c8ded91b239cc961ee68b07dbb94b6c4
 EBUILD curl-7.19.3.ebuild 3574 RMD160 c158b862970416c6e88c54c240bdbf255f96c716 SHA1 410d0e18c56dd5e32f1f6ba9c2b06d9c8693a789 SHA256 dde9c16cc4f432615e9be2bedf3838c3e5cd2f3cebfbace1935194c024dcc555
-MISC ChangeLog 23735 RMD160 29ef46b4e5b3247f18656eb84a2fd7d4f1513def SHA1 350b04c3ad2a0c39398da09ae0a68310692c1abf SHA256 897c23fb41f69945c59ab3f9ad4648dee46fc0e95a123853bef78df312e116dc
+EBUILD curl-7.19.4.ebuild 3327 RMD160 2b9f3b9556df17201d6a248ab8b61fa442956fc8 SHA1 dedf7b1c89ddf1e09a3c8f03ff0daba1b335f7d1 SHA256 5c6498af00400df74b568a757444b3c4c4f070a4ffa1a838abe32f5e5acb4b43
+MISC ChangeLog 23901 RMD160 2ef5626831d2e540e53f866900e92a96690c7eff SHA1 fa6253d1563b7ca42f1e86bdb366a24640701a96 SHA256 a05c854342887bc3b8044e5f864d90088ba1cc0f04c8466aa2ccf31819ba22af
 MISC metadata.xml 436 RMD160 38b4e6412c390a8f0eeb8ec44ec28debb77845dc SHA1 5a633019278deea417f46857c3d81ae7c830acbf SHA256 319a564ca12822409b29c2e52d39d3f7e7a918d3d73cb6deb5139c6aea2cc33a
diff --git a/net-misc/curl/curl-7.19.4.ebuild b/net-misc/curl/curl-7.19.4.ebuild
new file mode 100644
index 000000000000..08bac46a1fcf
--- /dev/null
+++ b/net-misc/curl/curl-7.19.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.4.ebuild,v 1.1 2009/03/03 19:34:59 dragonheart Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit multilib eutils
+
+#MY_P=${P/_pre/-}
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
+#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
+#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+#IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
+IUSE="ssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
+
+# TODO - change to openssl USE flag in the not too distant future
+# https://bugs.gentoo.org/show_bug.cgi?id=207653#c3 (April 2008)
+
+RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+	nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+	ssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/libidn )
+	ares? ( >=net-dns/c-ares-1.4.0 )
+	kerberos? ( virtual/krb5 )
+	libssh2? ( >=net-libs/libssh2-0.16 )"
+
+# fbopenssl (not in gentoo) --with-spnego
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+#S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/curl-7.17.0-strip-ldflags.patch
+}
+
+src_compile() {
+
+	myconf="$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		$(use_with idn libidn)
+		$(use_with kerberos gssapi /usr)
+		$(use_with libssh2)
+		$(use_enable ipv6)
+		--enable-http
+		--enable-ftp
+		--enable-gopher
+		--enable-file
+		--enable-dict
+		--enable-manual
+		--enable-telnet
+		--enable-nonblocking
+		--enable-largefile
+		--enable-maintainer-mode
+		--disable-sspi
+		--without-krb4
+		--without-spnego"
+
+	if use ipv6 && use ares; then
+		elog "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 --without-nss"
+		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+	elif use nss; then
+		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
+		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+	elif use ssl; then
+		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
+		myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+	else
+		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
+	fi
+
+	econf ${myconf} || die 'configure failed'
+
+	emake || die "install failed for current version"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installed failed for current version"
+	rm -rf "${D}"/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
+
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}