version bump as per bug #291469

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

5 files changed, 133 insertions, 3 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index ddbe2e2de223..d4f1c8909824 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.150 2009/09/13 12:36:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.151 2009/11/05 04:39:55 dragonheart Exp $
+
+*curl-7.19.7 (05 Nov 2009)
+
+  05 Nov 2009; Daniel Black <dragonheart@gentoo.org> +curl-7.19.7.ebuild,
+  +files/curl-7.19.7-test241.patch, metadata.xml:
+  version bump as per bug #291469 thanks Gabriel
 
   13 Sep 2009; Brent Baude <ranger@gentoo.org> curl-7.19.6.ebuild:
   Marking curl-7.19.6 ppc64 for bug 281515
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 0239d7ac747b..e99446a8641d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,7 +1,10 @@
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
+AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
 DIST curl-7.19.4.tar.bz2 2296879 RMD160 91f46c421e0f23f268640d39f45a74621e951245 SHA1 6b8cb206990cd68d8653cea16a47bd0febd5c50d SHA256 fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
 DIST curl-7.19.6.tar.bz2 2347791 RMD160 7627d78ec681a513972be0cb5473b26805f44d83 SHA1 b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e SHA256 ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
+DIST curl-7.19.7.tar.bz2 2355121 RMD160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4 SHA1 c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c SHA256 1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70
 EBUILD curl-7.19.4.ebuild 3315 RMD160 f2753cdecfc1494ec2c83a994921b32cfdf90538 SHA1 b5920f7e09a7b797ce6fdaac17063aec6a9aad78 SHA256 24fcbde1edacb233bff9b3feabef780b91109a963df35f3cdb0d53fc8e7e82ec
 EBUILD curl-7.19.6.ebuild 3311 RMD160 3296abb65dfb432cf83cab0e05ba3a9de53770fc SHA1 e3df88a4254d6ae53d6df6eaf60a9e86dac2566b SHA256 f0dbb7f9c3113b5108713bef6365e8094471242f1a5cd37fd7da5679a0bfe586
-MISC ChangeLog 25578 RMD160 ebdc3f843d860fa9df41e56f13b309c8fac81f99 SHA1 291950e1591b2d7ff7801a4e66b685545d1ba25b SHA256 4f364a86a5dafe263cf53cc342f5af20fb5222a241bf42371d90d57b6ff7327c
-MISC metadata.xml 436 RMD160 38b4e6412c390a8f0eeb8ec44ec28debb77845dc SHA1 5a633019278deea417f46857c3d81ae7c830acbf SHA256 319a564ca12822409b29c2e52d39d3f7e7a918d3d73cb6deb5139c6aea2cc33a
+EBUILD curl-7.19.7.ebuild 3007 RMD160 5b9f314068a0846e203aafcd9a45cc04963e17b8 SHA1 246aaaedb5a49362b1a21ab28693faf220c3fd41 SHA256 8e9d224cc0f13f5061fb92e6f0aec4863b25aae37954178238266940cf6c12c3
+MISC ChangeLog 25785 RMD160 5ba25e56e44e864747b3824dac3799561c3fb8ca SHA1 d380ae520b9ef8afc1c15ed1b331597a2cbe9482 SHA256 79c4d3ee32c78ef12f156ebc3d637b6760a37f67b0237b2d00d0b2a1f7738da2
+MISC metadata.xml 565 RMD160 0e65c7c5adbd1f2599abddb744d8ab89af9453e8 SHA1 10c1597b64c7e4f0bae05f8a6e3396770bdea45a SHA256 ac9c8639f544eba3bfccfd63388baecb98f211a27c3547d17c5c6d01e8271ef6
diff --git a/net-misc/curl/curl-7.19.7.ebuild b/net-misc/curl/curl-7.19.7.ebuild
new file mode 100644
index 000000000000..dc5976635be9
--- /dev/null
+++ b/net-misc/curl/curl-7.19.7.ebuild
@@ -0,0 +1,99 @@
+# 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.7.ebuild,v 1.1 2009/11/05 04:39:55 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 ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="openssl 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 ) )
+	openssl? ( !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
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/curl-7.17.0-strip-ldflags.patch
+	epatch "${FILESDIR}"/curl-7.19.7-test241.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)
+		$(use_enable ares)
+		--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 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 openssl; 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
+}
diff --git a/net-misc/curl/files/curl-7.19.7-test241.patch b/net-misc/curl/files/curl-7.19.7-test241.patch
new file mode 100644
index 000000000000..7297c1b5b13e
--- /dev/null
+++ b/net-misc/curl/files/curl-7.19.7-test241.patch
@@ -0,0 +1,20 @@
+--- tests/data/test241.orig	2008-11-20 08:12:35.000000000 +1100
++++ tests/data/test241	2009-11-05 14:22:07.000000000 +1100
+@@ -33,7 +33,7 @@
+ HTTP-IPv6 GET (using ip6-localhost)
+  </name>
+  <command>
+--g "http://ip6-localhost:%HTTP6PORT/241"
++-g "http://::1:%HTTP6PORT/241"
+ </command>
+ <precheck>
+ ./server/resolve --ipv6 ip6-localhost
+@@ -48,7 +48,7 @@
+ </strip>
+ <protocol>
+ GET /241 HTTP/1.1

+-Host: ip6-localhost:%HTTP6PORT

++Host: ::1:%HTTP6PORT

+ Accept: */*

+ 

+ </protocol>
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 92bead64c4cc..39e8fc8cd11b 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -8,6 +8,8 @@
   <use>
     <flag name="ares">Enabled c-ares dns support</flag>
     <flag name="libssh2">Enabled SSH urls in curl using libssh2</flag>
+    <flag name="openssl">Use openssl as the crypto engine</flag>
+    <flag name="openssl">Use gnutls as the crypto engine</flag>
     <flag name="nss">Use NSS as the crypto engine</flag>
   </use>
 </pkgmetadata>