Patch to fix git/curl over http/https with auth, bug #438718

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 242 insertions, 5 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 55c8b7573475..1a3b781bc027 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.252 2012/10/18 17:20:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.253 2012/10/18 18:16:20 blueness Exp $
+
+*curl-7.28.0-r1 (18 Oct 2012)
+
+  18 Oct 2012; Anthony G. Basile <blueness@gentoo.org> +curl-7.28.0-r1.ebuild,
+  +files/curl-7.28.0-fix-http-auth.patch:
+  Patch to fix git/curl over http/https with auth, bug #438718
 
   18 Oct 2012; Anthony G. Basile <blueness@gentoo.org> curl-7.27.0-r3.ebuild,
   curl-7.28.0.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index c1f4316f133b..0ed5af96b2ec 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -8,6 +8,7 @@ AUX curl-7.27.0-curl-config.patch 579 SHA256 68c06920cf8d2ab4e0e3b539fde2eda9f2f
 AUX curl-7.27.0-fix-metalink-gnutls.patch 3949 SHA256 1de86351216a0d6ac31fbf6b2e2b012d01e39437ee434d9113d241da972deee0 SHA512 bcc7a6f6fca0554d6d5b37a0a67e20fdce5acc520d41c82d564986f12d3a7e4ee188d90129ecf4fce88571cc5b33dd871ee3ff2ee2c789c86b5567a23fe6a825 WHIRLPOOL c23cff02e7985ecbff4e77c9aed1fa238c8d729ebda1771922430c0a9e18450fa1b69c415ff7d43df66f8c4fd74f5464f64eb816071d1113d89efb8c606fb406
 AUX curl-7.27.0-fix-nettle-include.patch 718 SHA256 7630b255984142caf26985a4272697cf72530d083574a9087663ba1f19db3f10 SHA512 a2adb6f02aa041ee4a0b1fe627a0e8b38cd89c75f2845f821bab612af8365dcd2ddb3238d5dd98f5e8a3faeba58c809cb31011fdc3cb103c6b7daf28bd871571 WHIRLPOOL 28fce1acbcdaecf8338186817d1586580d626fd18c5cde0d352e6a668fe5e51d44b834322d9cd1f5ee5a649342ea7d417aa47d667877ebde10273d1a0f02f07b
 AUX curl-7.27.0-prefix.patch 842 SHA256 c0ba42416ac1f75bd63c180494c0510dc4ab47d8501fcbd77e75ebe6b136bd19 SHA512 60fef029c8ae9a9458bfee6b19ae7d9dae6317f26e0f1df78e9be83a78e9a81175db77efd1c22f5c09fa5b7b581a76b74457b1e3176f9d42d111f7cd00146244 WHIRLPOOL 5de6922f59e6c16c0abc7d66f361b9c344261172a0388fc6a3090bbb7caa11b8cfdcfe23c83bf6b17d7836dd516c59401302caf504fb3fa4beaa72fb62eed373
+AUX curl-7.28.0-fix-http-auth.patch 744 SHA256 dbd2f399e2425aaae51d05a7c9ca3af2649c7e901245fbc5f9483ac3038a56bb SHA512 16a3f5627782c2ab4b2e721a9346f2e10cd86c6cdf6b9e765d627b5e9f6a056ee72c34531bfd1e3e6d45fc5b0a0d535a475ecadacce58002881c934b77cd35d4 WHIRLPOOL 0a8ef5811e020ddf5697d6537fcfc48b3cf62cde6d4daedb8a67d64a4b1be5608ddd0e36b6488ff5c94159b836da461e29636b121fc4a8008e1edc7a82278eb3
 AUX curl-7.28.0-prefix.patch 845 SHA256 eaff1dd29bb735b1f18362db055be73789d9ad972316f4c21a2949f2ef02a6b3 SHA512 b2e6d87a18866544d4e94bc9f646f59bd36d549b686614c31c6021dac3f987ec804908055d5664011bf379b64fd47c9e780b8b27046f27ae5839ec4a6f180430 WHIRLPOOL c3c2ed9d958c05359c7632aa8db4d5452ab830fa0b634c169ad2c54be04cc171f318ac3986496b474988c2c87166da40c8627086e13affc4b7fd4780aeb3ee0c
 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
@@ -21,13 +22,14 @@ EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee1
 EBUILD curl-7.25.0-r1.ebuild 5834 SHA256 c14d3185b39d5ef166215b13d4e353f24945d2c8888ce99da8845e5ddfaad48d SHA512 868b5b3dcc038d124aa6a1dca8ff8957d9c76c5ec37ea2ea647c6ed15272066de53d439db99208ee20d146a5c505eb3b1044660e9e75c285ebc9c8353a3a6b11 WHIRLPOOL a35bd0a5d79f149ff9046c6ffb47a526e8569d06b72601fcf627df5805173ca2a27f4223ea9a78e181588383d2789a1ded8e37b9c20cb34561d7927930f4946b
 EBUILD curl-7.26.0.ebuild 6086 SHA256 785de5565ed98c5e46bb1d526936047c6b44fe087a3269c3932037b32b6597f9 SHA512 b6007e66f7ecf15f7ac152c4d4f747376476e710ab47fec1c9c58bc05cc4a4d0e4e8095f0e35348896267b3ef792e9299ce48ba36da5aac112ddc75c47f38b67 WHIRLPOOL 3cfc5497af90423b2bd20cf77ae9c94d8f4d8f82cc74e6d93eccb503c19fb930a9e121e748c0e19cb6ffd876bab7b50830405069a40e2ed24651fc51a624c246
 EBUILD curl-7.27.0-r3.ebuild 6686 SHA256 23e48300e8685b31046b945391f1178898236b8ba1aeb3ce0da14fa31671d767 SHA512 1afe830b04e07c5103a91cb177645436eba84600e26d5ba37d6185936e31eec108b465db4ea3011effbeb65c4ad4792ec49dda40bc9400f9cc5b908aafe1225e WHIRLPOOL f785f56cf239ed456c21fe29d30d7a01f8d3c987fd0cf482f00d773679a446025c265c3caaca78e16e9e44519ab29ee1787af3439513a31066a7d2a1fa4b1598
+EBUILD curl-7.28.0-r1.ebuild 6585 SHA256 a2423a4606c282c00e827dacb92d4bee7b5524fd43e518a597cc20da28aed535 SHA512 2d8e404cd2f0782ce27b88c60c4d26dde07487ce399570a42eae971e60dac85aacc81d478c74e608511596c0657ab6f4794d05c727c244fc3c56b9825c8a8c26 WHIRLPOOL 1e1e11eeaacdb1580d9e2f6cd5a95ab0365ad628a0b7ae8c74bdbfe3af8aef0707ca09c0f00aeb2dfda62c59c07e834aa2e0e8a0357f4e9c77094a491013d1d5
 EBUILD curl-7.28.0.ebuild 6539 SHA256 a8c853136677b19abc6645d30a747848c60ea5caa243777ac44c66f74267a4c1 SHA512 d8b9e39a822dbf1bd24f11e8f82c90c9ae4a946ea7b71edd7d02b11c6005dd0a67669a01884646dab34aa5696348c4b9760e168d4786bb841fdfe183a00bb57a WHIRLPOOL c73a6e87d140f20fe4511c90bfa48e1a4813a04c061f563331d90f18278dff926cdfc6d6d244b08cee470f9ce89379a40e99b0e3cda03c2cd920452ca46b37eb
-MISC ChangeLog 40781 SHA256 0efc37b922f660fe59fdbfad0b5a656cf3345a159757f5672dcd6f8f5961f0e5 SHA512 4955c6fb3b8aecce74b8421b5ba12dd1eb83b288dc6146be728d3d9802a8f552f02f7091882642edc4cb392e18570862ba2ffe609dfd479989c35163bf463418 WHIRLPOOL 7e790d1ea3d5fc676472bbfb18f026d390857f5fc23a91ab3c8def620bfab7605d79350c6620d0391e82a39a3eee0fe065c7e05abb9dfb6649ea01cd980cb194
+MISC ChangeLog 40997 SHA256 98d2b946e7b753d68160cce000a54ab665ad52c889777f5c1dc25108efc81739 SHA512 038ecbdf442848de0bc1f2391a034b1742b13700e77739c326173a399d5519b883e2d7ce5b17acdba9858a67f804550c7e7b761294209dd99c468ae7314a508e WHIRLPOOL f773b4e25dab0b1b24a7c07a4926a3084f4433874c041d708f35c32eea7523871ee9cbe0d9f25baff695453eda47b586443a1bf26d8cd2d9e3c68f521e193d46
 MISC metadata.xml 914 SHA256 5ef1a7aa505389d5251c676a19babf3da6cd327391a731c51142d98c6a592f5f SHA512 1a8dbd0b7ae28fb8a91c566ff1766d166c188c382f050a2738551ca691305154cf387464df4090aeb2b3b7c38cf54895754407e6865adf88ebd030429a9a55f3 WHIRLPOOL 376247a5eeaa313864f6abe1860976a3bdac08f438c9eac8a92ebb58811f1bf3893023314cf931023a96db093c49edf9a972ca367b118c9d7d5f006bf7c5912d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCAOi8ACgkQl5yvQNBFVTWBrgCaAw8tvxo5p6HwzRejPfemEPDJ
-arAAniYKe/AuQ9KZyGjasH305BVDtCqM
-=Dg80
+iEYEAREIAAYFAlCARzgACgkQl5yvQNBFVTX5WQCfRfEFi27XrHUD8LegxxLumsNN
+O7oAn13mdlumaxCwYEdZDh6CvMLKZk8L
+=b1Eh
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.28.0-r1.ebuild b/net-misc/curl/curl-7.28.0-r1.ebuild
new file mode 100644
index 000000000000..2596a15f5b10
--- /dev/null
+++ b/net-misc/curl/curl-7.28.0-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.28.0-r1.ebuild,v 1.1 2012/10/18 18:16:20 blueness Exp $
+
+EAPI="4"
+
+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 ~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 ~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 +nonblocking 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_polarssl? ( media-video/rtmpdump[polarssl] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,-polarssl,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	sys-apps/ed
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# metalink cannot use nss for its backend #433822
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	threads? ( !adns )
+	metalink? ( !curl_ssl_nss )
+	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.28.0-prefix.patch \
+		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
+		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
+		"${FILESDIR}"/${P}-fix-http-auth.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 \
+		$(use_enable nonblocking) \
+		--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)  \
+		$(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
+}
diff --git a/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch b/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch
new file mode 100644
index 000000000000..441fd3f47e33
--- /dev/null
+++ b/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch
@@ -0,0 +1,22 @@
+Revert "zero out auth structs before transfer" which breaks http/https auth.
+
+See:
+https://bugs.gentoo.org/show_bug.cgi?id=438718
+https://sourceforge.net/tracker/?func=detail&aid=3577557&group_id=976&atid=100976
+
+--
+diff --git a/lib/transfer.c b/lib/transfer.c
+index 2ad5fad..a00469e 100644
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -1433,10 +1433,6 @@ CURLcode Curl_pretransfer(struct SessionHandle *data)
+ 
+   data->state.ssl_connect_retry = FALSE;
+ 
+-  /* zero out auth state */
+-  memset(&data->state.authhost, 0, sizeof(struct auth));
+-  memset(&data->state.authproxy, 0, sizeof(struct auth));
+-
+   data->state.authproblem = FALSE;
+   data->state.authhost.want = data->set.httpauth;
+   data->state.authproxy.want = data->set.proxyauth;