Version bump. Bug fixes. Include patch for gnutls from distributor list.

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

4 files changed, 63 insertions, 10 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 5d9aba05de9c..61c3ecdb4a16 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.191 2009/07/26 04:56:14 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.192 2009/07/26 18:08:09 eva Exp $
+
+*libsoup-2.26.3 (26 Jul 2009)
+
+  26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libsoup-2.26.1.ebuild, +libsoup-2.26.3.ebuild,
+  +files/libsoup-2.26.3-gnutls-strict.patch:
+  Version bump. Bug fixes. Include patch for gnutls from distributor list.
 
   26 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> libsoup-2.2.105-r2.ebuild,
   +files/libsoup-2.2.105-dprintf.patch:
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 3500c4b13d89..e6653693125b 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -3,20 +3,21 @@ Hash: SHA1
 
 AUX libsoup-2.2.105-dprintf.patch 36777 RMD160 4b650dca580ac52c26afa55c53a10f7e1bf94cc1 SHA1 c6aa31846dc1aeaebdd6fa1f4ef502c2767fcf1e SHA256 a06b6892422777347bbfbd313257be9eff36b1c6099b14beb14f84699e75ebf7
 AUX libsoup-2.2.105-fix-devhelp-docs.patch 3343 RMD160 a286f5e4b5618b0da9c96f2359fbd5e1e33041a7 SHA1 6ab321d61239f657133faa266c7a87a42fdd5a5d SHA256 4f9690c379e6002d79856e113c7b7d56730fbc32c3ea6c5b1a7deb46fa763a85
+AUX libsoup-2.26.3-gnutls-strict.patch 1585 RMD160 b76789792e7a2e294f879b748a4d7483521e3fac SHA1 fcc632a12052352161daa425a4de14b40ae4385a SHA256 43c826dbe6bb35542ea33907598c0dcea67f37ef8a0e32636a41b0facb4efece
 DIST libsoup-2.2.105.tar.bz2 505095 RMD160 c6850dbccd074ab5bc3178248d139ecc953fde63 SHA1 45756c61d48bc9ec3919d5375b06d952bb65bf58 SHA256 3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f
 DIST libsoup-2.24.3.tar.bz2 661415 RMD160 9000d0355e65879f4031278bead9a4ad61a2bdea SHA1 b63cf9c0bc20264c59e84dea73eb76862be9329c SHA256 30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
-DIST libsoup-2.26.1.tar.bz2 736811 RMD160 627da2989062a71748df1c716cf122db7e3bae74 SHA1 ef5e1b921b013b893163f13c848dc7ee279d822c SHA256 bfc37afcfcc5f182dd2b80b4c21aa3262c7719173ee27bc45ffb00a6a8267c78
 DIST libsoup-2.26.2.tar.bz2 687860 RMD160 7491662db5990e6c60a5e5184d51b7090f9e52b8 SHA1 0fa4e963fd018bba7562d2ac6132d26645a85498 SHA256 afcedda15bde2395dec31a82a243871a0540ea2e13e7a14d15846ad0c1f09a7b
+DIST libsoup-2.26.3.tar.bz2 686248 RMD160 adc6b621ecbe86bf9467ec610a670dbc6fcf31e6 SHA1 95e7c095c1059dc6f406f4bfd67a523b0f94cc61 SHA256 e6662e56e6987124891db62325622bc46fd5dcd42458285d5ead5afc6d5be1dc
 EBUILD libsoup-2.2.105-r2.ebuild 1243 RMD160 f3e894a8269e730d40b45dca890b43f9c8a67a0f SHA1 77a79d2348744251855e9b4c97032c666f72a30c SHA256 b241b800c5c2601c1ddc455067bd16eb0b754e2a1259bc9cc23f2d082850e479
 EBUILD libsoup-2.24.3.ebuild 816 RMD160 93b553c39d858a820ca1c2983d457b1f23a3ac68 SHA1 4760759bef0286a848ea966a6a3405324b91ff63 SHA256 cf823a988b03939734de21f5bf191c1ae4ace65ef845e2bdbce82043898c296e
-EBUILD libsoup-2.26.1.ebuild 1197 RMD160 67a92fb8dc54d9090105ca3fe016b3b9c75781a0 SHA1 b77c3854b453183a61a0f7f02315f97c664fed50 SHA256 3f6648d2323e004e64e97a27d000582811c791ab1e922c63b175ea023ef3093f
 EBUILD libsoup-2.26.2.ebuild 1189 RMD160 ccba05cc78fddfcd063bd575de771e572b75bf22 SHA1 09f2709a812c90212a4e54c06a25e62e1b3875e7 SHA256 672d35f4354ba125064169e356c3b1243f5020cb30817cb9953a1c02841f9a97
-MISC ChangeLog 23878 RMD160 c12d825cb2d3ad4a9289f015237beb0b405f72f9 SHA1 ed12f6135d1635de3f6995fb367ae0bb0329cc63 SHA256 4509bfd69d0dce88d24f804aa826fc5a500b42e7a59b289cc29cd98a76305beb
+EBUILD libsoup-2.26.3.ebuild 1305 RMD160 2da02252d3a88cfc4aee806997b33e875196cb34 SHA1 e8a39d53cb2f8c2466e819029022cf9610affcce SHA256 fe202a2c0c062535e032cc6a11b3f3c259246a0d3b7b800b89a31da467fa1fec
+MISC ChangeLog 24128 RMD160 00d079ab666716b6ce0a8438d0cb8d6da0a3c7f1 SHA1 653101a56665fab0a63f7d468ee71672c42d8f8e SHA256 038a175d502abdb7a3cefa876aa746d08711eed6d7810407610202e138cf4dcb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpr4hMACgkQiqiDRvmkBmJ5mQCg7GN3CxBKicVTbhGfaos3uaH7
-64cAoJOw5UESgV/6YJw38RuXSocluDJ9
-=K0yR
+iEYEARECAAYFAkpsm48ACgkQ1fmVwcYIWAaPkgCg7XoTxfmg/RxBd6hnoCKUn2nP
+DGgAnRMm1aHboMrgIk8A67nHml2R1HU1
+=HV72
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch b/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch
new file mode 100644
index 000000000000..5459e8c063e8
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch
@@ -0,0 +1,42 @@
+From 139502583e065520e1c7a31e73c6e68969153d70 Mon Sep 17 00:00:00 2001
+From: Patrick Ohly <patrick.ohly@gmx.de>
+Date: Thu, 23 Jul 2009 16:03:34 +0200
+Subject: [PATCH] Allow version 1 CA certificates in clients
+
+This is done by setting the GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT
+flag while setting up the credentials and parsing the CA certificate
+file. This is necessary because without it, some releases of gnutls
+reject certificates that are currently in use by major sites, including
+Google.
+
+Setting the flag is safe in libsoup because the file is meant to
+contain only CA certificates. The main weakness around version 1
+certs is that personal certificates could be mistaken for CA certs,
+which shouldn't happen if libsoup is used as intended.
+
+Servers don't have the possibility to verify their clients, so this
+problem doesn't apply to them.
+
+http://bugzilla.gnome.org/show_bug.cgi?id=589323
+---
+ libsoup/soup-gnutls.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
+index 46b4188..b4f0876 100644
+--- a/libsoup/soup-gnutls.c
++++ b/libsoup/soup-gnutls.c
+@@ -529,6 +529,10 @@ soup_ssl_get_client_credentials (const char *ca_file)
+ 	creds = g_slice_new0 (SoupSSLCredentials);
+ 	gnutls_certificate_allocate_credentials (&creds->creds);
+ 
++	/* http://bugzilla.gnome.org/show_bug.cgi?id=589323 */
++	gnutls_certificate_set_verify_flags (creds->creds,
++					     GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
++
+ 	if (ca_file) {
+ 		creds->have_ca_file = TRUE;
+ 		status = gnutls_certificate_set_x509_trust_file (
+-- 
+1.6.3.3
+
diff --git a/net-libs/libsoup/libsoup-2.26.1.ebuild b/net-libs/libsoup/libsoup-2.26.3.ebuild
index b3393bc483c6..48103876557c 100644
--- a/net-libs/libsoup/libsoup-2.26.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.26.1.ebuild,v 1.12 2009/05/20 19:27:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.26.3.ebuild,v 1.1 2009/07/26 18:08:09 eva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 # Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
 IUSE="debug doc gnome ssl"
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 #		dev-lang/php
 #		net-misc/curl )
 
-DOCS="AUTHORS ChangeLog NEWS README"
+DOCS="AUTHORS NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -42,6 +42,9 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# Allow validation of common certificates, upstream bug #589323
+	epatch "${FILESDIR}/${PN}-2.26.3-gnutls-strict.patch"
+
 	# Fix test to follow POSIX (for x86-fbsd)
 	# No patch to prevent having to eautoreconf
 	sed -e 's/\(test.*\)==/\1=/g' -i configure.in configure || die "sed failed"