added 7.18.1 which fixes bugs #210295, #204130, #209421, #206566 and part of bug #207653. 7.17.1 has fixes from bug #206566. Thanks to Daniel Stenberg, Micha Kiedrowicz, Olivier Dole, and Fabrice Bacchella. Cleaned out some old versions too

Package-Manager: portage-2.1.4.4

6 files changed, 64 insertions, 141 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 487700d77631..c2d1c037b7d6 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.114 2008/02/10 09:12:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.115 2008/04/01 13:46:49 dragonheart Exp $
+
+*curl-7.18.1 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@gentoo.org> -curl-7.17.0.ebuild,
+  -curl-7.17.1_pre20071013.ebuild, curl-7.17.1.ebuild, +curl-7.18.1.ebuild:
+  added 7.18.1 which fixes bugs #210295, #204130, #209421, #206566 and part of
+  bug #207653. 7.17.1 has fixes from bug #206566. Thanks to Daniel Stenberg,
+  Micha Kiedrowicz, Olivier Dole, and Fabrice Bacchella. Cleaned out some old
+  versions too
 
   10 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> curl-7.17.1.ebuild:
   ppc stable, bug #202891
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 6ec1fef1b663..d441e430fae2 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,13 +6,11 @@ AUX curl-7.17.1-null-handler-segfault.patch 2560 RMD160 3f1ce2cab67588b132fa6ad3
 AUX libcurl-gnutlscert.patch 1498 RMD160 286859e0870c6e5aa21047b28b2c256f7b7bfffe SHA1 6ef8e0887431e62328cc020cad5fb10673336ad3 SHA256 4b0a9db99ddc698c39484a95cba1f52c0dc17ed34f2d7e1dd780f925bf21761b
 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
-DIST curl-7.17.0.tar.bz2 1698728 RMD160 12141ad0f5de32e9d496f3d499bf6fda80a4308e SHA1 78e08bac74952e2af612f20759a330f580c122b3 SHA256 3aabf85ef56afeddd66c7180971fbd6412133d85311a76b7a274f80982301cc3
-DIST curl-7.17.1-20071013.tar.bz2 1766588 RMD160 1cf52a1ed6d187bdcaea7de0331b54a11260c38d SHA1 8e361895f2e99eabf4cc5eac188f7975e5186945 SHA256 5e702c0bc1e9c51f3b19e1e9f6e013310836f60f831bc50debc599192e792537
 DIST curl-7.17.1.tar.bz2 1721551 RMD160 8ab8dc7a33a5265dfe25eb0725248c3cd6519510 SHA1 ad34b9386e7fd1c8f2a8025e2716a8047b194970 SHA256 7f668ec49506ffc968a54fde9404183212bb40b226626e9417d941594e06e57b
+DIST curl-7.18.1.tar.bz2 1700966 RMD160 f7dac868b2a449aa92a3466b24fe2bb3309ff1e0 SHA1 685b9388ee9e646158a83cd435f7be664816ad78 SHA256 ccf0ecc8be56b30eebcc39e4787dc86f8f0b1d95313f6d85118f36bd48beae6c
 EBUILD curl-7.15.5-r1.ebuild 2236 RMD160 e52ae4d3420183ff90088e8f9391f4706982876b SHA1 610f71dff18426d9efac0cd7075acc5bc42b3730 SHA256 3f257480df0b9fe040d374740a9654688b484065c0cdd284787a0a6d314da04d
-EBUILD curl-7.16.4.ebuild 3125 RMD160 416421c8ca021c69680d964757bd004e4edcb907 SHA1 f2f7ec17203e78d2750650c6cba8847acca8f22b SHA256 f7474a2750e0817ba5681fd1d3f1ad6f39d69ab3ee1afbe50fcfaba51cf92c1f
-EBUILD curl-7.17.0.ebuild 3332 RMD160 cc28091be032c3223ea7b16c75166bb9a8192865 SHA1 a6b8631bd2865113d44a829b93482ec31ff68d09 SHA256 5b1cbb50236ceeac5f614bc1e4750f5f386e2120cb92e95538d1d68763324f89
-EBUILD curl-7.17.1.ebuild 3382 RMD160 9fce3b7801864a0660af625b077844eb0ee61ef0 SHA1 2095d377c45a2cb7a2e73f50212f4117b352c7d9 SHA256 975151090ca3c9c73b90d317f517809a7079e685bf221eb6fb48a6bc8f453db5
-EBUILD curl-7.17.1_pre20071013.ebuild 3346 RMD160 b40029445b74b29e5e041d279abfb58a162dd60b SHA1 44e2f98f747e2244b7cd54c2aca039b7c78548cd SHA256 056e8060c9aa346c0c00441fd95f7cc6d35ed9d451c5eed98a2d9d9ca8f0c249
-MISC ChangeLog 20395 RMD160 90db0ba005af3f14f037a99f1aa75e80d0b854ee SHA1 785a8ec55a301ffdd7b98b3700dfc00189478782 SHA256 7bd544dfb3ee5d9e90974930e04d4f162776a2883d16d78c9ae255b93ae88622
+EBUILD curl-7.16.4.ebuild 3131 RMD160 0f59c206dbb61de7b778a76ab48205715545f042 SHA1 adda0afc7fe48fbae677f0c52ae24afc6019a1db SHA256 be3ff7d0776977ae7a2e4ac905b4d2f231a6395d92181e2215bb9678d0baf0c2
+EBUILD curl-7.17.1.ebuild 3865 RMD160 e6cb136c2411a4f611d9dc523037ef887a981c4a SHA1 cce5b3b40769ca84c9338be5c56e69b7be1e254d SHA256 a037c479a7c8f4b9d0423f3a8d5ce0f8b18d771adf731fbbe9f615253804f25c
+EBUILD curl-7.18.1.ebuild 3817 RMD160 3f8beb596bf0e38e94a4b998532b5afbc96a2da3 SHA1 88d288e84b4f9585c79000bc1c2207be6dd9e0c6 SHA256 0225b027b5f160a326a11072e352b65e206f45d93ad5b415ec7c610204dc742a
+MISC ChangeLog 20824 RMD160 58195ac891d83839004ae1fcc47c7214917d8413 SHA1 7e3ae44aedb56f2fb191224d76a4e8f285c495d2 SHA256 0ba448971a8a3542fbe89ce387825454495b4258f86394e4a19ae693dff4adf8
 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180
diff --git a/net-misc/curl/curl-7.16.4.ebuild b/net-misc/curl/curl-7.16.4.ebuild
index ba36507b9879..c1198a466059 100644
--- a/net-misc/curl/curl-7.16.4.ebuild
+++ b/net-misc/curl/curl-7.16.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild,v 1.11 2007/08/25 14:34:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild,v 1.12 2008/04/01 13:46:49 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -14,7 +14,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
 
 RDEPEND="gnutls? ( net-libs/gnutls )
diff --git a/net-misc/curl/curl-7.17.1.ebuild b/net-misc/curl/curl-7.17.1.ebuild
index 257d07738bbd..697e7391cc24 100644
--- a/net-misc/curl/curl-7.17.1.ebuild
+++ b/net-misc/curl/curl-7.17.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild,v 1.6 2008/02/10 09:12:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild,v 1.7 2008/04/01 13:46:49 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -51,8 +51,9 @@ src_unpack() {
 src_compile() {
 
 	myconf="$(use_enable ldap)
+		$(use_enable ldap ldaps)
 		$(use_with idn libidn)
-		$(use_enable kerberos gssapi)
+		$(use_with kerberos gssapi)
 		$(use_enable ipv6)
 		--enable-http
 		--enable-ftp
@@ -71,6 +72,10 @@ src_compile() {
 		--without-spnego"
 #		$(use_with libssh2)
 
+	if use ldap && use kerberos; then
+		die 'ldap and kerberos (gssapi) not playing nicely try version >=7.18.1'
+	fi
+
 	if use ipv6 && use ares; then
 		elog "c-ares support disabled because it is incompatible with ipv6."
 		myconf="${myconf} --disable-ares"
@@ -92,6 +97,18 @@ src_compile() {
 	emake || die "install failed for current version"
 }
 
+src_test() {
+	if use gnutls; then
+		elog 'disabling test 405 ftps as gnutls does differing return codes'
+		elog 'that the test case does not allow for. '
+		elog 'https://bugs.gentoo.org/show_bug.cgi?id=204130 refers'
+		cd "${S}"/tests
+		./runtests.pl -a -s '!405' || die 'self test failed'
+	else
+		make check || die 'self test failed'
+	fi
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "installed failed for current version"
 	rm -rf "${D}"/etc/
diff --git a/net-misc/curl/curl-7.17.1_pre20071013.ebuild b/net-misc/curl/curl-7.17.1_pre20071013.ebuild
deleted file mode 100644
index dbdd41e2ddaa..000000000000
--- a/net-misc/curl/curl-7.17.1_pre20071013.ebuild
+++ /dev/null
@@ -1,113 +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.17.1_pre20071013.ebuild,v 1.3 2007/10/17 20:32:13 dragonheart Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit libtool 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"
-
-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"
-
-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 )"
-
-# net-libs/libssh2 (masked) --with-libssh2
-# 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}"/${P}-strip-ldflags.patch
-	epatch "${FILESDIR}"/curl-7.16.2-strip-ldflags.patch
-	elibtoolize
-}
-
-src_compile() {
-
-	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
-		--enable-maintainer-mode
-		--disable-sspi
-		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-		--without-krb4
-		--without-libssh2
-		--without-spnego"
-#		$(use_with libssh2)
-
-	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"
-	elif use nss; then
-		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
-	elif use ssl; then
-		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-	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
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then
-		elog "You must re-compile all packages that are linked against"
-		elog "curl-7.15.* by using revdep-rebuild from gentoolkit:"
-		elog "# revdep-rebuild --library libcurl.so.3"
-	fi
-}
diff --git a/net-misc/curl/curl-7.17.0.ebuild b/net-misc/curl/curl-7.18.1.ebuild
index db3118c57169..99f55404a70c 100644
--- a/net-misc/curl/curl-7.17.0.ebuild
+++ b/net-misc/curl/curl-7.18.1.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.0.ebuild,v 1.4 2007/10/17 20:32:13 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.18.1.ebuild,v 1.1 2008/04/01 13:46:49 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
-inherit libtool eutils
+inherit libtool autotools
 
 #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.haxx.se/download/${P}.tar.bz2"
-#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
+SRC_URI="http://curl.planetmirror.com/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 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 ) )
@@ -24,10 +27,9 @@ RDEPEND="gnutls? ( net-libs/gnutls 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 )"
+	kerberos? ( virtual/krb5 )
+	libssh2? ( >=net-libs/libssh2-0.16 )"
 
-# net-libs/libssh2 (masked) --with-libssh2
 # fbopenssl (not in gentoo) --with-spnego
 # krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
 
@@ -42,17 +44,26 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-strip-ldflags.patch
-#	epatch "${FILESDIR}"/curl-7.16.2-strip-ldflags.patch
+##	epatch "${FILESDIR}"/${P}-strip-ldflags.patch
+	epatch "${FILESDIR}"/curl-7.17.0-strip-ldflags.patch
+#	epatch	"${FILESDIR}"/${P}-null-handler-segfault.patch
+#	elibtoolize
 	elibtoolize
+	eaclocal
+	/usr/bin/perl -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4
+	eautoheader
+	cp lib/config.h.in src/config.h.in
+	eautoconf
+	eautomake
 }
 
 src_compile() {
 
 	myconf="$(use_enable ldap)
-	    $(use_enable ldap ldaps)
+		$(use_enable ldap ldaps)
 		$(use_with idn libidn)
-		$(use_enable kerberos gssapi)
+		$(use_with kerberos gssapi /usr)
+		$(use_with libssh2)
 		$(use_enable ipv6)
 		--enable-http
 		--enable-ftp
@@ -65,9 +76,7 @@ src_compile() {
 		--enable-largefile
 		--enable-maintainer-mode
 		--disable-sspi
-		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
 		--without-krb4
-		--without-libssh2
 		--without-spnego"
 
 	if use ipv6 && use ares; then
@@ -79,10 +88,13 @@ src_compile() {
 
 	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