Added patch to fix test46 in 7.15.1 (#111555), version bumped to 7.15.4, stripped LDFLAGS from curl-config and libcurl.pc.

Package-Manager: portage-2.1-r1

7 files changed, 184 insertions, 16 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 7ee127684f5e..466b7abd35d1 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.74 2006/06/01 22:03:44 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.75 2006/07/17 11:42:37 liquidx Exp $
+
+*curl-7.15.4 (17 Jul 2006)
+
+  17 Jul 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/curl-7.15.1-test46.patch, +files/curl-7.15-strip-ldflags.patch,
+  curl-7.15.1-r1.ebuild, +curl-7.15.4.ebuild:
+  Added patch to fix test46 in 7.15.1 (#111555), version bumped to 7.15.4,
+  stripped LDFLAGS from curl-config and libcurl.pc.
 
   01 Jun 2006; Daniel Black <dragonheart@gentoo.org>
   -files/curl-7.15.0-versionnumber.patch, -curl-7.15.1.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 82130845fce4..a17fe2e69750 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,20 +5,33 @@ AUX curl-7.15-libtftp.patch 651 RMD160 1138e01e5c898d669a11192845c1330d99eb5bc2
 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
 DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA1 2b94192557954bba396bfbb980feed17aadc6295 SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
 DIST curl-7.15.3.tar.bz2 1467043 RMD160 35172fe66d5e6cc1df05e6160ffdf086448730f3 SHA1 7e764126ce564429fe2f142428a27cbfc8fb69ee SHA256 77771db616dee02f21b94c409ed423a72fa7f2b2d65c27395137b0f920388440
-EBUILD curl-7.15.1-r1.ebuild 2419 RMD160 7070376804633db1ef7fe28b33fefa5b7545907a SHA1 baa0a8f5420d1139dad8180bc9a8db750bcc0351 SHA256 5af2c9dff92dc42cb47ee18cd0dc533e8ddbbaa57857174a0fcb296851af2300
-MD5 8b886d63d3f48d3d381c6b753f381460 curl-7.15.1-r1.ebuild 2419
-RMD160 7070376804633db1ef7fe28b33fefa5b7545907a curl-7.15.1-r1.ebuild 2419
-SHA256 5af2c9dff92dc42cb47ee18cd0dc533e8ddbbaa57857174a0fcb296851af2300 curl-7.15.1-r1.ebuild 2419
+DIST curl-7.15.4.tar.bz2 1519792 RMD160 bbef248926d3935272746f605d91e6f03badff6b SHA1 74d3ce2060754a2ccc7a7775712e22720f74a662 SHA256 11521127e175eb633c046a2c6ed11f97e81816d3aec9e8cac560763457a8e623
+EBUILD curl-7.15.1-r1.ebuild 2458 RMD160 aa1086ba5aee17b8c70e6e9d472978274de44e04 SHA1 43e176d015d8bc46031cd7829109e16a1b9069bc SHA256 fdb6c614da7905d281d321f7111baf16b29146c9ae5c8313ca6aca1211dd4656
+MD5 49b31ca5148d5044b9b638266317ef5a curl-7.15.1-r1.ebuild 2458
+RMD160 aa1086ba5aee17b8c70e6e9d472978274de44e04 curl-7.15.1-r1.ebuild 2458
+SHA256 fdb6c614da7905d281d321f7111baf16b29146c9ae5c8313ca6aca1211dd4656 curl-7.15.1-r1.ebuild 2458
 EBUILD curl-7.15.3.ebuild 2347 RMD160 e35dde51f8b6e685555bd68997de7716940bc851 SHA1 eadc3cd30738fedf42ca384add320b83c52b29e1 SHA256 82836bad783e9bc1c30f21ba899a61b87b939bb359c80ea8f34005f6e5c6a9a9
 MD5 8c38138de6a844b8288e68f4780ab7e8 curl-7.15.3.ebuild 2347
 RMD160 e35dde51f8b6e685555bd68997de7716940bc851 curl-7.15.3.ebuild 2347
 SHA256 82836bad783e9bc1c30f21ba899a61b87b939bb359c80ea8f34005f6e5c6a9a9 curl-7.15.3.ebuild 2347
-MISC ChangeLog 13790 RMD160 337f32b9620913b69fcefbcf88ae978919cbff07 SHA1 56dbae19261070695e9198ad1f98c170bd511a11 SHA256 5ac0180d99b02b0cbf8c78e99c0b1b819116f05b703365ba0e109f13e0069e15
-MD5 b356953e6df8ff4bcad241cb0779d00c ChangeLog 13790
-RMD160 337f32b9620913b69fcefbcf88ae978919cbff07 ChangeLog 13790
-SHA256 5ac0180d99b02b0cbf8c78e99c0b1b819116f05b703365ba0e109f13e0069e15 ChangeLog 13790
+EBUILD curl-7.15.4.ebuild 2402 RMD160 7f87196022282a08f853c21189d6388fab7e91ed SHA1 cc6ff0077399861e43d70e8d23eb03dca04b2f15 SHA256 1058bd9a3bc550f999d290e487dc8fc4302f05e3c4c8ffb38409588e93367403
+MD5 9152ddc29492fd5480610b5afa3af09a curl-7.15.4.ebuild 2402
+RMD160 7f87196022282a08f853c21189d6388fab7e91ed curl-7.15.4.ebuild 2402
+SHA256 1058bd9a3bc550f999d290e487dc8fc4302f05e3c4c8ffb38409588e93367403 curl-7.15.4.ebuild 2402
+MISC ChangeLog 14110 RMD160 f78d6a8c1e0aca273a0ea57e2eb39396d41b6554 SHA1 c2912d55a131b1948736313202f006609eeb40fc SHA256 9a0be757266b71d9f1fe62c662ec88c4ae38903d66b49e01964d65ab89469d66
+MD5 9cae526d538ea1643d869712179a5416 ChangeLog 14110
+RMD160 f78d6a8c1e0aca273a0ea57e2eb39396d41b6554 ChangeLog 14110
+SHA256 9a0be757266b71d9f1fe62c662ec88c4ae38903d66b49e01964d65ab89469d66 ChangeLog 14110
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -29,10 +42,13 @@ SHA256 0a9301fda2b9152303983b152f3e53f4c9900f6bc0fce5af99f472529c566994 files/di
 MD5 868d53492ffadba614d01f9185b1d399 files/digest-curl-7.15.3 241
 RMD160 4445d656f0911de97e3e4b7935e13325542881f2 files/digest-curl-7.15.3 241
 SHA256 ab906ddff402d28446f56eac44e39a688e01aaa4a2249b570658c1065a15cd71 files/digest-curl-7.15.3 241
+MD5 d480ea43353e4e714690ed2af172b4d7 files/digest-curl-7.15.4 241
+RMD160 a554cd3c37e16874934049ad57de676b72a9885b files/digest-curl-7.15.4 241
+SHA256 49f009cf0fa707d5a4938e068e2116e461bf59b4ef2c1a80b8c6222dfb0af893 files/digest-curl-7.15.4 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEf2TVmdTrptrqvGERAuFfAKCWwwAIHVXdg81PIyRBZNIFrxmeXgCfd72I
-PMmRyl5cRxe1FSAP1UMvXu8=
-=EL2S
+iD8DBQFEu3e+uB6ZT1m7QRERApDOAKCG0pkG8VfVkisVj9hAPuAVQ7XuFQCggeel
+yQjgUlEzRpF6peRGkd1ixb0=
+=hQT5
 -----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
index 97df2be473b5..e99156158cd9 100644
--- a/net-misc/curl/curl-7.15.1-r1.ebuild
+++ b/net-misc/curl/curl-7.15.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5 2006/04/27 22:29:03 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1-r1.ebuild,v 1.6 2006/07/17 11:42:37 liquidx Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -32,8 +32,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/curl-7.15-libtftp.patch
+	cd ${S}
+	epatch ${FILESDIR}/curl-7.15-libtftp.patch
+	epatch ${FILESDIR}/curl-7.15-test46.patch
 }
 
 src_compile() {
diff --git a/net-misc/curl/curl-7.15.4.ebuild b/net-misc/curl/curl-7.15.4.ebuild
new file mode 100644
index 000000000000..3c8e26563db0
--- /dev/null
+++ b/net-misc/curl/curl-7.15.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.4.ebuild,v 1.1 2006/07/17 11:42:37 liquidx Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit libtool 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 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 )
+	krb4? ( app-crypt/kth-krb )"
+
+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}/${PN}-7.15-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"
+
+	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 ipv6 && use krb4; then
+		ewarn "kerberos-4 support disabled because it is incompatible with ipv6."
+		myconf="${myconf} --disable-krb4"
+	else
+		myconf="${myconf} $(use_enable krb4)"
+	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="${myconfg} --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
+
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS docs/LIBCURL
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}
diff --git a/net-misc/curl/files/curl-7.15-strip-ldflags.patch b/net-misc/curl/files/curl-7.15-strip-ldflags.patch
new file mode 100644
index 000000000000..5c5999aee657
--- /dev/null
+++ b/net-misc/curl/files/curl-7.15-strip-ldflags.patch
@@ -0,0 +1,20 @@
+--- curl-7.15.4/curl-config.in	2006-05-02 23:48:22.000000000 +0100
++++ curl-7.15.4/curl-config.in	2006-07-17 12:32:59.000000000 +0100
+@@ -181,7 +181,7 @@
+        	;;
+ 
+     --libs)
+-       	echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@
++       	echo -L@libdir@ -lcurl @LIBS@
+        	;;
+ 
+     *)
+--- curl-7.15.4/libcurl.pc.in	2004-12-11 18:46:40.000000000 +0000
++++ curl-7.15.4/libcurl.pc.in	2006-07-17 12:33:10.000000000 +0100
+@@ -6,5 +6,5 @@
+ Name: libcurl
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
++Libs: -L${libdir} -lcurl @LIBS@
+ Cflags: -I${includedir}
diff --git a/net-misc/curl/files/curl-7.15.1-test46.patch b/net-misc/curl/files/curl-7.15.1-test46.patch
new file mode 100644
index 000000000000..ee443d956341
--- /dev/null
+++ b/net-misc/curl/files/curl-7.15.1-test46.patch
@@ -0,0 +1,25 @@
+===================================================================
+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.4 b/net-misc/curl/files/digest-curl-7.15.4
new file mode 100644
index 000000000000..1613a6544c7d
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.15.4
@@ -0,0 +1,3 @@
+MD5 d9345a55c8bc67eafcd37fa1b728e00e curl-7.15.4.tar.bz2 1519792
+RMD160 bbef248926d3935272746f605d91e6f03badff6b curl-7.15.4.tar.bz2 1519792
+SHA256 11521127e175eb633c046a2c6ed11f97e81816d3aec9e8cac560763457a8e623 curl-7.15.4.tar.bz2 1519792