From a8098782fab87498026a09c06716b631c77c5ad6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 8 Oct 2018 11:58:32 +0100 Subject: libsoup: upgrade to 2.62.3 Freeze-breaking upgrade for a security bug fix involving cookie URLs, and a number of static analysis fixes. Drop CVE-2018-12910.patch as this is merged in 2.62.3. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libsoup/libsoup-2.4/CVE-2018-12910.patch | 32 -------------------- meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb | 35 ---------------------- meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb | 34 +++++++++++++++++++++ 3 files changed, 34 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb create mode 100644 meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch deleted file mode 100644 index 158bf93093..0000000000 --- a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch +++ /dev/null @@ -1,32 +0,0 @@ -CVE: CVE-2018-12910 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From db2b0d5809d5f8226d47312b40992cadbcde439f Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sun, 24 Jun 2018 19:46:19 -0500 -Subject: [PATCH] cookie-jar: bail if hostname is an empty string - -There are several other ways to fix the problem with this function, but -skipping over all of the code is probably the simplest. - -Fixes #3 ---- - libsoup/soup-cookie-jar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c -index 2369c8a7..b2b78909 100644 ---- a/libsoup/soup-cookie-jar.c -+++ b/libsoup/soup-cookie-jar.c -@@ -307,7 +307,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_ - - priv = soup_cookie_jar_get_instance_private (jar); - -- if (!uri->host) -+ if (!uri->host || !uri->host[0]) - return NULL; - - /* The logic here is a little weird, but the plan is that if --- -2.17.1 diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb deleted file mode 100644 index ba3e86a03c..0000000000 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "An HTTP library implementation in C" -HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome/libs" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ - file://CVE-2018-12910.patch" -SRC_URI[md5sum] = "eaf99b04ac8968ed2b26f2509ba75584" -SRC_URI[sha256sum] = "9e536fe3da60b25d2c63addb84a9d5072d00b0d8b8cbeabc629a6bcd63f879b6" - -S = "${WORKDIR}/libsoup-${PV}" - -inherit autotools gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc - -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. -PACKAGECONFIG ??= "" -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" - -EXTRA_OECONF = "--disable-vala" - -# When built without gnome support, libsoup-2.4 will contain only one shared lib -# and will therefore become subject to renaming by debian.bbclass. Prevent -# renaming in order to keep the package name consistent regardless of whether -# gnome support is enabled or disabled. -DEBIAN_NOAUTONAME_${PN} = "1" - -# glib-networking is needed for SSL, proxies, etc. -RRECOMMENDS_${PN} = "glib-networking" diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb new file mode 100644 index 0000000000..aaa3cc5103 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "An HTTP library implementation in C" +HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" +SRC_URI[md5sum] = "dfbf30af5fb6190bfafc5aa6abcc9dce" +SRC_URI[sha256sum] = "d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172" + +S = "${WORKDIR}/libsoup-${PV}" + +inherit autotools gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc + +# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. +PACKAGECONFIG ??= "" +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" + +EXTRA_OECONF = "--disable-vala" + +# When built without gnome support, libsoup-2.4 will contain only one shared lib +# and will therefore become subject to renaming by debian.bbclass. Prevent +# renaming in order to keep the package name consistent regardless of whether +# gnome support is enabled or disabled. +DEBIAN_NOAUTONAME_${PN} = "1" + +# glib-networking is needed for SSL, proxies, etc. +RRECOMMENDS_${PN} = "glib-networking" -- cgit 1.2.3-korg