Skip to contentSkip to conversation

gnutls: move to latest stable branch 2.10.2 -> 2.10.4

PATCH In review Michael Smith 4 participants 6 messages Jan 18, 2011 – Jan 19, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gnutls: move to latest stable branch 2.10.2 -> 2.10.4

---
 .../gettextize-with-gettext-0.18.patch             |    0
 .../gnutls-openssl.patch                           |    0
 .../gnutls-replace-siginterrupt.patch              |    0
 .../gnutls/{gnutls_2.10.2.bb => gnutls_2.10.4.bb}  |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gettextize-with-gettext-0.18.patch (100%)
 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gnutls-openssl.patch (100%)
 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gnutls-replace-siginterrupt.patch (100%)
 rename recipes/gnutls/{gnutls_2.10.2.bb => gnutls_2.10.4.bb} (77%)
recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch renamed from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch
rename to recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch
recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch renamed from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch
recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch renamed from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch
recipes/gnutls/gnutls_2.10.4.bb renamed from recipes/gnutls/gnutls_2.10.2.bb +2 -2
similarity index 77%
rename from recipes/gnutls/gnutls_2.10.2.bb
rename to recipes/gnutls/gnutls_2.10.4.bb
index 8af70ec..3e582b0 100644
@@ -24,5 +24,5 @@ do_configure_prepend() {
 
 }
 
-SRC_URI[gnutls.md5sum] = "777823f5746ab80cd6f7f7b5fcb2f91b"
-SRC_URI[gnutls.sha256sum] = "e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724"
+SRC_URI[gnutls.md5sum] = "4e1517084018a8b1fdc96daabea40528"
+SRC_URI[gnutls.sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
Signature · 1 line
1.6.3.2
#1 lore raw

PATCH 2/2 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.)

---
 ...isable-TLS-1.2-in-addition-to-1.0-and-1.1.patch |   29 --------------------
 ...ibsoup-2.4_2.29.91.bb => libsoup-2.4_2.32.2.bb} |    8 +----
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch
 rename recipes/gnome/{libsoup-2.4_2.29.91.bb => libsoup-2.4_2.32.2.bb} (68%)
recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch deleted +0 -29
deleted file mode 100644
index 1a03581..0000000
@@ -1,29 +0,0 @@
-From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001
-From: Dan Winship <[email protected]>
-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
recipes/gnome/libsoup-2.4_2.32.2.bb renamed from recipes/gnome/libsoup-2.4_2.29.91.bb +2 -6
similarity index 68%
rename from recipes/gnome/libsoup-2.4_2.29.91.bb
rename to recipes/gnome/libsoup-2.4_2.32.2.bb
index aec60fa..5bc793c 100644
@@ -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}"
 
Signature · 1 line
1.6.3.2
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] libsoup-2.4: update 2.29.91 to 2.32.2

Quoted 5 lines · Michael Smith

The new release fixes several issues and is API/ABI compatible. (at least, webkit-gtk still builds and runs.)

Looks ok. Make sure its not pinned somewhere then RFC those parts too

Quoted 76 lines

---
 ...isable-TLS-1.2-in-addition-to-1.0-and-1.1.patch |   29 -------------------- ...ibsoup-2.4_2.29.91.bb => libsoup-2.4_2.32.2.bb} |    8 +----

 2 files changed, 2 insertions(+), 35 deletions(-)

 delete mode 100644 recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch rename recipes/gnome/{libsoup-2.4_2.29.91.bb => libsoup-2.4_2.32.2.bb} (68%)

recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch deleted +0 -29
deleted file mode 100644
index 1a03581..0000000
@@ -1,29 +0,0 @@
-From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001
-From: Dan Winship <[email protected]>
-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
recipes/gnome/libsoup-2.4_2.32.2.bb renamed from recipes/gnome/libsoup-2.4_2.29.91.bb +0 -0
similarity index 68%
rename from recipes/gnome/libsoup-2.4_2.29.91.bb
rename to recipes/gnome/libsoup-2.4_2.32.2.bb
index aec60fa..5bc793c 100644
@@ -3,15 +3,11 @@ SECTION = "x11/gnome/libs"

 LICENSE = "GPL"
 DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"

recipes/gnome/libsoup-2.4_2.32.2.bb renamed from recipes/gnome/libsoup-2.4_2.29.91.bb +0 -2
-PR = "r2"
-

 inherit gnome

 SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2;name=libsoup"

recipes/gnome/libsoup-2.4_2.32.2.bb renamed from recipes/gnome/libsoup-2.4_2.29.91.bb +2 -4
-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}"

--
1.6.3.2

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Acked-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] libsoup-2.4: update 2.29.91 to 2.32.2

In reply to Michael Smith

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Michael Smith

The new release fixes several issues and is API/ABI compatible. (at least, webkit-gtk still builds and runs.)

Quoted 57 lines
---
 ...isable-TLS-1.2-in-addition-to-1.0-and-1.1.patch |   29 --------------------
 ...ibsoup-2.4_2.29.91.bb => libsoup-2.4_2.32.2.bb} |    8 +----
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch
 rename recipes/gnome/{libsoup-2.4_2.29.91.bb => libsoup-2.4_2.32.2.bb} (68%)
recipes/gnome/libsoup-2.4/Disable-TLS-1.2-in-addition-to-1.0-and-1.1.patch deleted +0 -29
deleted file mode 100644
index 1a03581..0000000
@@ -1,29 +0,0 @@
-From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001
-From: Dan Winship <[email protected]>
-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
recipes/gnome/libsoup-2.4_2.32.2.bb renamed from recipes/gnome/libsoup-2.4_2.29.91.bb +0 -2
similarity index 68%
rename from recipes/gnome/libsoup-2.4_2.29.91.bb
rename to recipes/gnome/libsoup-2.4_2.32.2.bb
index aec60fa..5bc793c 100644
@@ -3,15 +3,11 @@ SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"
 
-PR = "r2"
-
 inherit gnome
 

recipes/gnome/libsoup-2.4_2.32.2.bb SECTION = "x11/gnome/libs" · line 13

Quoted 10 lines
recipes/gnome/libsoup-2.4_2.32.2.bb renamed from recipes/gnome/libsoup-2.4_2.29.91.bb +2 -4
 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}"
 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNNpFPMkyGM64RGpERAvnAAJoDljz3QZxRQtNKqmheOr1x2VzClACgkLIY sBMzE6vmlZkBQnUiQ2tV/Nk=
=hDXq
-----END PGP SIGNATURE-----

Acked-by on v1 1/2
#4 lore raw
In reply to Michael Smith
Quoted 2 lines · Michael Smith
Quoted 47 lines

---
 .../gettextize-with-gettext-0.18.patch             |    0 .../gnutls-openssl.patch                           |    0 .../gnutls-replace-siginterrupt.patch              |    0 .../gnutls/{gnutls_2.10.2.bb => gnutls_2.10.4.bb}  |    4 ++--

 4 files changed, 2 insertions(+), 2 deletions(-)

 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gettextize-with-gettext-0.18.patch (100%) rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gnutls-openssl.patch (100%) rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gnutls-replace-siginterrupt.patch (100%) rename recipes/gnutls/{gnutls_2.10.2.bb => gnutls_2.10.4.bb} (77%)

recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch renamed from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch
rename to recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch
recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch renamed from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch
recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch renamed from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch
recipes/gnutls/gnutls_2.10.4.bb renamed from recipes/gnutls/gnutls_2.10.2.bb +2 -3
similarity index 77%
rename from recipes/gnutls/gnutls_2.10.2.bb
rename to recipes/gnutls/gnutls_2.10.4.bb
index 8af70ec..3e582b0 100644
@@ -24,5 +24,5 @@ do_configure_prepend() {
 
  }
 
-SRC_URI[gnutls.md5sum] = "777823f5746ab80cd6f7f7b5fcb2f91b"
-SRC_URI[gnutls.sha256sum] = "e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724"
+SRC_URI[gnutls.md5sum] = "4e1517084018a8b1fdc96daabea40528"
+SRC_URI[gnutls.sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
--

1.6.3.2

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#5 lore raw
In reply to Michael Smith
Quoted 43 lines · Michael Smith
---
 .../gettextize-with-gettext-0.18.patch             |    0
 .../gnutls-openssl.patch                           |    0
 .../gnutls-replace-siginterrupt.patch              |    0
 .../gnutls/{gnutls_2.10.2.bb => gnutls_2.10.4.bb}  |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gettextize-with-gettext-0.18.patch (100%)
 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gnutls-openssl.patch (100%)
 rename recipes/gnutls/{gnutls-2.10.2 => gnutls-2.10.4}/gnutls-replace-siginterrupt.patch (100%)
 rename recipes/gnutls/{gnutls_2.10.2.bb => gnutls_2.10.4.bb} (77%)
recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch renamed from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch
rename to recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch
recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch renamed from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch
recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch renamed from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch +0 -0
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch
recipes/gnutls/gnutls_2.10.4.bb renamed from recipes/gnutls/gnutls_2.10.2.bb +2 -2
similarity index 77%
rename from recipes/gnutls/gnutls_2.10.2.bb
rename to recipes/gnutls/gnutls_2.10.4.bb
index 8af70ec..3e582b0 100644
@@ -24,5 +24,5 @@ do_configure_prepend() {
 
 }
 
-SRC_URI[gnutls.md5sum] = "777823f5746ab80cd6f7f7b5fcb2f91b"
-SRC_URI[gnutls.sha256sum] = "e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724"
+SRC_URI[gnutls.md5sum] = "4e1517084018a8b1fdc96daabea40528"
+SRC_URI[gnutls.sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
Signature · 1 line
1.6.3.2

I guess gnutls-2.10.2/parallel-build.patch needs to be moved to..

PR = "${INC_PR}.1"

should be "${INC_PR}.0"

but if all patches still apply then otherwise looks ok..

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]