Add fix for new versions of gnutls (bug #307343, GNOME bug #622857)

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index b4f83d876950af98e4f041e4325e052a543fd2c4..e7d71ba07efe6b7e526e131f888b1d88bc4a8554 100644 (file)
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.220 2010/06/23 11:46:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.221 2010/07/01 22:43:22 abcd Exp $
+
+*libsoup-2.30.2-r1 (01 Jul 2010)
+*libsoup-2.28.2-r1 (01 Jul 2010)
+
+  01 Jul 2010; Jonathan Callen <abcd@gentoo.org> +libsoup-2.28.2-r1.ebuild,
+  +libsoup-2.30.2-r1.ebuild, +files/libsoup-2.30.2-disable-tls1.2.patch:
+  Add fix for new versions of gnutls (bug #307343, GNOME bug #622857)
 
 *libsoup-2.30.2 (23 Jun 2010)
 

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 1b87c40d09f91f1f9d7834686947c9a64fe6497b..2e7e408519321d7abfc5be62c687b5d709c2bf85 100644 (file)
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libsoup-2.26.3-fix-build-without-gnome-with-doc.patch 1510 RMD160 4e397e405a7b5877ffadbc5cd6f4f321d10df9ee SHA1 e9839c0b84bd4010041e765bacac8c1bff0432a2 SHA256 5ba4dfc1eef663baf387145f936a0b64032f0b59673e58086177b642a96b15b8
 AUX libsoup-2.26.3-gnutls-strict.patch 1585 RMD160 b76789792e7a2e294f879b748a4d7483521e3fac SHA1 fcc632a12052352161daa425a4de14b40ae4385a SHA256 43c826dbe6bb35542ea33907598c0dcea67f37ef8a0e32636a41b0facb4efece
 AUX libsoup-2.30.1-fix-build-without-gnome-with-doc.patch 1818 RMD160 e68eb491f87c83517c59107931ba185d29e4ffa1 SHA1 085fc78a332a356ce2cddc2d0b0af510eb21bf74 SHA256 f385b68a7a6db02634e2189e775bc2eea54529ccebe1eefc4b81a12c28ff0e89
+AUX libsoup-2.30.2-disable-tls1.2.patch 1289 RMD160 0bace30f6e158f8188c192a9864e3dce0b64caaf SHA1 b48eb37ddbc38306f49dff679f9f3692b34226b6 SHA256 0818ba3dcb53bf58bd0dafe06d66e19aa3ccbab80d2ab403ec9f787717f50ee3
 DIST libsoup-2.24.3.tar.bz2 661415 RMD160 9000d0355e65879f4031278bead9a4ad61a2bdea SHA1 b63cf9c0bc20264c59e84dea73eb76862be9329c SHA256 30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
 DIST libsoup-2.26.3.tar.bz2 686248 RMD160 adc6b621ecbe86bf9467ec610a670dbc6fcf31e6 SHA1 95e7c095c1059dc6f406f4bfd67a523b0f94cc61 SHA256 e6662e56e6987124891db62325622bc46fd5dcd42458285d5ead5afc6d5be1dc
 DIST libsoup-2.28.2.tar.bz2 721840 RMD160 8648fe507511f7c1c83b164ac0f5c86b995650f9 SHA1 91031a351ba260906a86e9f7155234dec524bff0 SHA256 9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
@@ -11,14 +12,26 @@ DIST libsoup-2.30.1-build-gir-patches.tar.bz2 8678 RMD160 2043a4847d1d5830e1f2f2
 DIST libsoup-2.30.2.tar.bz2 644337 RMD160 e714287d93cf10d0775bfcb48676b4a4c487bff3 SHA1 bf3ce2efb5452f79758a05b010d21bdaa1ba985c SHA256 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6
 EBUILD libsoup-2.24.3.ebuild 818 RMD160 75c8fc7064d441751488184ec342c021cd044064 SHA1 3da373c5786356676ddeb680045deae24a3aa69c SHA256 5a66f531565536d05007f2668d5c9e3e6ee521589eb7b672d2592c96cdafa790
 EBUILD libsoup-2.26.3-r3.ebuild 1535 RMD160 feac050f758cbf31aba75190845f6e0c9895e54f SHA1 8523facf37d5c38d960fe2166ebc543c6d4b27d0 SHA256 a01e4c8ee96a08879da8b3483d7630588ec1761c32d4272dc5621e471238e864
+EBUILD libsoup-2.28.2-r1.ebuild 1552 RMD160 f13b685d248a952148583b785a8274e58b2ad7f1 SHA1 128026a59a535d0fdbbad3841203719f75e97158 SHA256 5d5c7074bb8f351ad7a4302c491b3c9fe0b6d1162a6131713eea045f6d13ed91
 EBUILD libsoup-2.28.2.ebuild 1420 RMD160 b218106c6eff573f2aead84f38f0755a48dd87e3 SHA1 8847e7086b31bec4c91323de1a5f7b0f6e881edc SHA256 367fa9b56899b555cfb5b6dd2808e46abf289d0cdb72f1472f011b86d6cc4ed2
+EBUILD libsoup-2.30.2-r1.ebuild 1864 RMD160 0a3d5b24c64604f4c69ad188be06652493d82cdd SHA1 17007736e1dacc0f9cd274f2a499de5141bcae11 SHA256 f1a6ea4e504d625b96725f3f6a60119e29ce073c4b08482056abdbd11d811701
 EBUILD libsoup-2.30.2.ebuild 1746 RMD160 f64025218ea91c105270dcb9852e678b9a5f7d4d SHA1 0ebdfc2c4ec075102d1610089f4ca7f59d796375 SHA256 397ad86891065108bda023f20d61c47708cb1ef43c166e86dea37b0582e9c71a
-MISC ChangeLog 28057 RMD160 9d2e612961ecbbf3bb1b34e9cf3f4b01698804f0 SHA1 190ce28eafefa20a393ebdd46875d99aaa63451a SHA256 4c41fa6d0a26e19f7848296505cafa09c36197b31786868044d28da3d573b269
+MISC ChangeLog 28343 RMD160 5b4299af6465c1acf5e8276b5447da68d94715a3 SHA1 4405ff365e723bcb8d65f47b4e6d1dee8b4dd1ea SHA256 1ea9dd37119f649aaf406694e85f61ad0747ad5442e6265a4263770e5134291e
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwh9BwACgkQCaWpQKGI+9QZRACeJ4Ku8kjqssjkKYpRipeWhbpw
-EqoAnR3pFqqHHKzNYPI7DQdmSsSRXg85
-=mHOY
+iQIcBAEBCAAGBQJMLRoUAAoJELHSF2kinlg4Mj0QAKkeoPSl3TCoCdRcbJ2DGSyy
+UOrM1m842MMzea/fcPBpisF1fyGJEx30iCWUUe1Xi++62vFASjnmDmtDXAwx17iH
+hx/he4NBeKmebN6/n9+YoQ1YN5wXDS22KMhxPKYZaABvz78mIdXnfXMfgf/AJJNV
+QLCX8WBvWU8FhEAHRHd5OlpLpDCZkMl8tjc/VGx1M6js4T/VwYB/2CgXtkOgtNTu
+6r8CU+kBBxT/ataNCvR1Obf8UlwDmQrdRu0XtBFhskkpEEwCNZjez9MIXLpQBzTt
+++Z6i2uYtIbPcTlBbr+r5YXO7DDhdUriPjpyxTaYrqNnaBmR3joBmFCjEcSXiJat
+QfmRWZZAB5QX2eXZg1phRruMMNB+UBb2XGu32yLQR5pjacQKimC9pKLc2qDLCKEa
+a7o5Ginv7I6+jFrUtxHPRK6mkETBpCOLJDxXw15QTx66UdIATw9hbRGj5Ujb99Iw
+//7J5AY4pL1bZqVf4minD/PJnjzh+DqR7BCoUku0y6ZXs53TiZiHJx/DhbrtqrUr
+iPjW5Fmx39sf/Lt9v/dh2lk2wlKn0VZptTuhU5DLCgOcioy0pSrwyGfQfNvqfiwM
+RRXKDuFAgPr72lFlj4tqjzGfIcYbfCJHEInnF+xCSM4he6BO/nz7ZW/RF8R52/Yw
+WKcnb0UKDzDKbIhUi22/
+=2Fnn
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch b/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch
new file mode 100644 (file)
index 0000000..d3cf218
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch
@@ -0,0 +1,31 @@
+Fix for bug #307343 (GNOME bug #622857), disabling TLS1.2
+---
+From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Tue, 29 Jun 2010 13:43:20 +0000
+Subject: Disable TLS 1.2 in addition to 1.0 and 1.1
+
+Due to bug 581342 we want to only negotiate SSL 3.0. Previously we
+were telling gnutls to not do TLS1.0 or TLS1.1, but that means with
+newer versions of gnutls that support TLS1.2 it would try to negotiate
+that instead and generally fail. Fix that by disabling TLS1.2 too
+(which works fine even with gnutls versions that don't support TLS1.2
+yet).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=622857
+---
+diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
+index cb0fbe5..0b57f28 100644
+--- a/libsoup/soup-gnutls.c
++++ b/libsoup/soup-gnutls.c
+@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking,
+               goto THROW_CREATE_ERROR;
+ 
+       /* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */
+-      if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
++      if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
+               goto THROW_CREATE_ERROR;
+ 
+       if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE,
+--
+cgit v0.8.3.1

diff --git a/net-libs/libsoup/libsoup-2.28.2-r1.ebuild b/net-libs/libsoup/libsoup-2.28.2-r1.ebuild
new file mode 100644 (file)
index 0000000..5659f0c
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.28.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.28.2-r1.ebuild,v 1.1 2010/07/01 22:43:22 abcd Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+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"
+
+RDEPEND=">=dev-libs/glib-2.21.3
+       >=dev-libs/libxml2-2
+       ssl? ( >=net-libs/gnutls-2.1.7 )"
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.9
+       dev-util/gtk-doc-am
+       doc? ( >=dev-util/gtk-doc-1 )"
+#      test? (
+#              www-servers/apache
+#              dev-lang/php
+#              net-misc/curl )
+PDEPEND="gnome? ( ~net-libs/${PN}-gnome-${PV} )"
+
+DOCS="AUTHORS NEWS README"
+
+pkg_setup() {
+       G2CONF="${G2CONF}
+               --disable-static
+               --without-gnome
+               $(use_enable ssl)"
+}
+
+src_prepare() {
+       gnome2_src_prepare
+
+       # 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"
+
+       # Patch *must* be applied conditionally (see patch for details)
+       if use doc; then
+               # Fix bug 268592 (build fails !gnome && doc)
+               epatch "${FILESDIR}/${PN}-2.26.3-fix-build-without-gnome-with-doc.patch"
+               eautoreconf
+       fi
+
+       # Fix for new versions of gnutls (bug #307343, GNOME bug #622857)
+       epatch "${FILESDIR}/${PN}-2.30.2-disable-tls1.2.patch"
+}

diff --git a/net-libs/libsoup/libsoup-2.30.2-r1.ebuild b/net-libs/libsoup/libsoup-2.30.2-r1.ebuild
new file mode 100644 (file)
index 0000000..cf2cfb2
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.30.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.2-r1.ebuild,v 1.1 2010/07/01 22:43:22 abcd Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+       mirror://gentoo/${PN}-2.30.1-build-gir-patches.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+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 +introspection gnome ssl"
+
+RDEPEND=">=dev-libs/glib-2.21.3
+       >=dev-libs/libxml2-2
+       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+       ssl? ( >=net-libs/gnutls-2.1.7 )"
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.9
+       dev-util/gtk-doc-am
+       doc? ( >=dev-util/gtk-doc-1 )"
+#      test? (
+#              www-servers/apache
+#              dev-lang/php
+#              net-misc/curl )
+PDEPEND="gnome? ( ~net-libs/${PN}-gnome-${PV} )"
+
+DOCS="AUTHORS NEWS README"
+
+pkg_setup() {
+       G2CONF="${G2CONF}
+               --disable-static
+               --without-gnome
+               $(use_enable introspection)
+               $(use_enable ssl)"
+}
+
+src_prepare() {
+       gnome2_src_prepare
+
+       # Fix test to follow POSIX (for x86-fbsd)
+       # No patch to prevent having to eautoreconf
+       sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
+
+       # Patch *must* be applied conditionally (see patch for details)
+       if use doc; then
+               # Fix bug 268592 (build fails !gnome && doc)
+               epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch"
+       fi
+
+       if use introspection; then
+               epatch "${WORKDIR}/${PN}-2.30.1-build-gir-1.patch"
+               epatch "${WORKDIR}/${PN}-2.30.1-build-gir-2.patch"
+       fi
+
+       # Fix for new versions of gnutls (bug #307343, GNOME bug #622857)
+       epatch "${FILESDIR}/${P}-disable-tls1.2.patch"
+
+       eautoreconf
+}