From ad70ddccbf92ef8f86822b9853180723ac76c403f1e8444b6d266abee2b250f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Apr 2020 22:38:30 +0000 Subject: [PATCH 1/2] Accepting request 795001 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/795001 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=140 --- _service | 2 +- _servicedata | 2 +- appstream-glib-0.7.16.obscpio | 3 --- appstream-glib-0.7.17.obscpio | 3 +++ appstream-glib.changes | 17 +++++++++++++++++ appstream-glib.obsinfo | 6 +++--- appstream-glib.spec | 4 ++-- 7 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 appstream-glib-0.7.16.obscpio create mode 100644 appstream-glib-0.7.17.obscpio diff --git a/_service b/_service index 69a0d04..715aaa6 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ appstream_glib_(\d+)_(\d+)_(\d+) \1.\2.\3 enable - refs/tags/appstream_glib_0_7_16 + refs/tags/appstream_glib_0_7_17 diff --git a/_servicedata b/_servicedata index adc567f..f0af6b7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/hughsie/appstream-glib.git - 230e2da082d9754858330c3e262a9d44f816def1 \ No newline at end of file + 93f614add2377465bc7bd24a9a99c8ae28e2342f \ No newline at end of file diff --git a/appstream-glib-0.7.16.obscpio b/appstream-glib-0.7.16.obscpio deleted file mode 100644 index 47cf6d7..0000000 --- a/appstream-glib-0.7.16.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:daf92fc5d013098cd0e797aae8000552d4fbdf18e6c941b26e50bded2b43f09a -size 4317196 diff --git a/appstream-glib-0.7.17.obscpio b/appstream-glib-0.7.17.obscpio new file mode 100644 index 0000000..41d51ed --- /dev/null +++ b/appstream-glib-0.7.17.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cc5c3683d6c5ff92fd9a7a7001c09d1088378422f2dd141169fabc97111315f +size 4333068 diff --git a/appstream-glib.changes b/appstream-glib.changes index f608fce..6688a4e 100644 --- a/appstream-glib.changes +++ b/appstream-glib.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Apr 15 17:12:57 UTC 2020 - dimstar@opensuse.org + +- Update to version 0.7.17: + * Support versioning on clang/macOS + * Use ".so" suffix for the plugins on macOS + * Use internal uuid library in macOS + * docs: Fix examples of AsNodeToXmlFlags using an invalid flag. + * Bump minimum glib2 dependency. + * Update Galician translations + * as-app: properly initialize unique_id_mutex + * Use _fullpath() instead of GetFullPathNameA(). + * Fix Win32 headers. + * Support ${id}/${locale}.qm in addition to ${id}_${locale}.qm + * as-app: add "icon-theme" as recognised component type + * as-content-rating: Make default values match OARS semantics + ------------------------------------------------------------------- Thu Dec 19 12:07:58 UTC 2019 - dimstar@opensuse.org diff --git a/appstream-glib.obsinfo b/appstream-glib.obsinfo index b363f7d..3b9934b 100644 --- a/appstream-glib.obsinfo +++ b/appstream-glib.obsinfo @@ -1,5 +1,5 @@ name: appstream-glib -version: 0.7.16 -mtime: 1569866536 -commit: 230e2da082d9754858330c3e262a9d44f816def1 +version: 0.7.17 +mtime: 1582191077 +commit: 93f614add2377465bc7bd24a9a99c8ae28e2342f diff --git a/appstream-glib.spec b/appstream-glib.spec index 692287c..e26a616 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -1,7 +1,7 @@ # # spec file for package appstream-glib # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2014 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: appstream-glib -Version: 0.7.16 +Version: 0.7.17 Release: 0 Summary: AppStream Abstraction Library License: LGPL-2.1-or-later AND GPL-2.0-or-later From f32925ba76d1632eacca4cc6fcbdce95d37faf2aaa6d7095158517bf928b38c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 22 Apr 2020 11:16:03 +0000 Subject: [PATCH 2/2] Accepting request 796245 from GNOME:Next - Add as-glib-PR359.patch: Fix crash with invalid children of
    . OBS-URL: https://build.opensuse.org/request/show/796245 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=141 --- appstream-glib.changes | 5 ++++ appstream-glib.spec | 2 ++ as-glib-PR359.patch | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 as-glib-PR359.patch diff --git a/appstream-glib.changes b/appstream-glib.changes index 6688a4e..914edc9 100644 --- a/appstream-glib.changes +++ b/appstream-glib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 22 09:30:51 UTC 2020 - Dominique Leuenberger + +- Add as-glib-PR359.patch: Fix crash with invalid children of
      . + ------------------------------------------------------------------- Wed Apr 15 17:12:57 UTC 2020 - dimstar@opensuse.org diff --git a/appstream-glib.spec b/appstream-glib.spec index e26a616..d5e9577 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -26,6 +26,8 @@ Group: System/Libraries URL: http://people.freedesktop.org/~hughsient/appstream-glib/ Source0: %{name}-%{version}.tar.xz Source1: openSUSE-appstream-process +# PATCH-FIX-UPSTREAM as-glib-PR359.patch dimstar@opensuse.org -- Fix crash with invalid children of
        +Patch0: as-glib-PR359.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcab >= 0.6 BuildRequires: gobject-introspection-devel diff --git a/as-glib-PR359.patch b/as-glib-PR359.patch new file mode 100644 index 0000000..caf438a --- /dev/null +++ b/as-glib-PR359.patch @@ -0,0 +1,55 @@ +From d4bfa8389932029ae85a7bad4a762d69a47fbbb4 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 22 Apr 2020 11:22:03 +0200 +Subject: [PATCH] Fix crash with invalid children of
          + +It segfaulted when building the error message as data_c->name was invalid. +data_c was a valid tag, so only the data_c->tag union member was active. +Fix the crash by calling the proper function instead and add a test case. +--- + libappstream-glib/as-node.c | 2 +- + libappstream-glib/as-self-test.c | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c +index 7fd68515..66d582a8 100644 +--- a/libappstream-glib/as-node.c ++++ b/libappstream-glib/as-node.c +@@ -1891,7 +1891,7 @@ as_node_get_localized_unwrap_type_li (const AsNode *node, + AS_NODE_ERROR, + AS_NODE_ERROR_INVALID_MARKUP, + "Tag %s in %s invalid", +- data_c->name, ++ as_tag_data_get_name (data_c), + as_tag_data_get_name (data)); + return FALSE; + } +diff --git a/libappstream-glib/as-self-test.c b/libappstream-glib/as-self-test.c +index 47ad937f..66166410 100644 +--- a/libappstream-glib/as-self-test.c ++++ b/libappstream-glib/as-self-test.c +@@ -2810,6 +2810,7 @@ as_test_node_xml_func (void) + AsNode *n2; + AsNode *root; + GString *xml; ++ GHashTable *hashtable; + + /* invalid XML */ + root = as_node_from_xml ("", 0, &error); +@@ -2920,6 +2921,16 @@ as_test_node_xml_func (void) + g_assert_cmpstr (xml->str, ==, "\n\n\n"); + g_string_free (xml, TRUE); + as_node_unref (root); ++ ++ /* invalid child of ul */ ++ root = as_node_from_xml ("
            ", 0, &error); ++ g_assert_no_error (error); ++ g_assert (root != NULL); ++ hashtable = as_node_get_localized_unwrap (root, &error); ++ g_assert_error (error, AS_NODE_ERROR, AS_NODE_ERROR_INVALID_MARKUP); ++ g_assert_cmpstr (error->message, ==, "Tag ul in ul invalid"); ++ g_clear_error (&error); ++ g_assert (hashtable == NULL); + } + + static void