diff options
| author |   Michael Smith <msmith@cbnco.com> | 2011-01-19 06:05:43 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-19 09:31:11 +0100 |
| commit | 0170ab1106a72b3adf48af358c2a641350aaab62 (patch) | |
| tree | f840d50539b1ea60b9450770e936a09cedc4c1ca | |
| parent | 4219f2672b1695664280e8c3ddf1541513d46a1f (diff) | |
| download | openembedded-0170ab1106a72b3adf48af358c2a641350aaab62.tar.gz | |
libsoup-2.4: update 2.29.91 to 2.32.2
* The new release fixes several issues and is API/ABI compatible.
(at least, webkit-gtk still builds and runs.)
Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch | 29 | ||||
| -rw-r--r-- | recipes/gnome/libsoup-2.4_2.32.2.bb (renamed from recipes/gnome/libsoup-2.4_2.29.91.bb) | 8 |
2 files changed, 2 insertions, 35 deletions
diff --git a/recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch b/recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch deleted file mode 100644 index 1a03581e2b..0000000000 --- a/recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/recipes/gnome/libsoup-2.4_2.29.91.bb b/recipes/gnome/libsoup-2.4_2.32.2.bb index aec60fa2a7..5bc793c392 100644 --- a/recipes/gnome/libsoup-2.4_2.29.91.bb +++ b/recipes/gnome/libsoup-2.4_2.32.2.bb @@ -3,15 +3,11 @@ SECTION = "x11/gnome/libs" LICENSE = "GPL" DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring" -PR = "r2" - inherit gnome SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2;name=libsoup" -SRC_URI[libsoup.md5sum] = "900390c0ead254fbb23f3f0b84fd18bb" -SRC_URI[libsoup.sha256sum] = "626c88f6b87463cb092733d2bcd5672ca69529a766cc6c5cc817f34b49c821b1" - -SRC_URI += "file://Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch" +SRC_URI[libsoup.md5sum] = "03f37350a2a31046ebabb8470e75abcc" +SRC_URI[libsoup.sha256sum] = "96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f" S = "${WORKDIR}/libsoup-${PV}" |