From f8a7fb1b24870f16c6688d57bec490c2d6d01400 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 13 Aug 2026 05:43:28 +0000 Subject: [PATCH] appstream: upgrade 1.1.5 -> 1.1.6 Source: NEWS Version 1.1.6 ~~~~~~~~~~~~~ Released: 2026-08-12 Features: * validator: Ensure description markup has no invalid attributes set * validator: Validate bundle/pkgname values for allowed characters Bugfixes: * xml: Sanitize description markup when reading and writing it * yaml/json: Ensure description markup is sanitized when loading/saving it * meson: Work around wrong library linkage when linking Qt tests * Allow sealing of component-IDs to safely use them in hash tables and indices * Ensure we never emit or read an invalid data origin * Prevent crash when comparing bad version strings that have an epoch after rev * Fix potential out-of-bounds read in OARS mapping table * apt: yaml: Harden against potential corrupted YAML / YAML-headers * compose: Guess a filename even from invalid URLs instead of crashing * compose: Confine directory unit data reads to the unit's root directory * compose: Refactor directory unit to use openat2, if possible * news-convert: Don't crash in case we receive bad freeform YAML news input * ascli: Guard against bad bundle values when calling "install" Contributors: Matthias Klumpp --- .../appstream/appstream/0001-remove-hardcoded-path.patch | 6 +++--- .../appstream/appstream/0002-Do-not-build-qt-tests.patch | 6 +++--- ...x-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch | 2 +- .../appstream/{appstream_1.1.5.bb => appstream_1.1.6.bb} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-support/appstream/{appstream_1.1.5.bb => appstream_1.1.6.bb} (95%) diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch index 56a5479099..9d1ff639c0 100644 --- a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch +++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch @@ -1,4 +1,4 @@ -From bf79c20cfee4a074ca752a1466dc96d0b9eb6175 Mon Sep 17 00:00:00 2001 +From 75c550f2f88d990fdb18b6118ca052af732a11b2 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 12 Dec 2022 15:42:42 +0100 Subject: [PATCH] remove hardcoded path @@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [oe-specific] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 9af5f58..ad1483d 100644 +index 24d1069..14fffff 100644 --- a/meson.build +++ b/meson.build -@@ -194,10 +194,10 @@ endif +@@ -230,10 +230,10 @@ endif stemmer_inc_dirs = include_directories() if get_option('stemming') stemmer_lib = cc.find_library('stemmer', required: true) diff --git a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch index 3e666181eb..c9d544f3fc 100644 --- a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch +++ b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch @@ -1,4 +1,4 @@ -From 1a1619dce3c3fa54fa5f47f7ed89447e0805de43 Mon Sep 17 00:00:00 2001 +From 6b50c15e350f80e805816f1c2ae2abe97cef6312 Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Fri, 26 Jul 2024 15:41:00 -0400 Subject: [PATCH] Do not build qt/tests @@ -23,10 +23,10 @@ Signed-off-by: Marc Ferland 1 file changed, 2 deletions(-) diff --git a/qt/meson.build b/qt/meson.build -index 407a57a..840c838 100644 +index 488fe60..83c2715 100644 --- a/qt/meson.build +++ b/qt/meson.build -@@ -130,5 +130,3 @@ install_data ( +@@ -144,5 +144,3 @@ install_data ( join_paths(meson.current_build_dir(), 'AppStreamQtConfigVersion.cmake'), install_dir: join_paths(get_option('libdir'), 'cmake', 'AppStreamQt') ) diff --git a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch index 8ba4de95c9..185dd507b3 100644 --- a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch +++ b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch @@ -1,4 +1,4 @@ -From 4fdd29346b51eea577ee46c7166348dad19bbcb0 Mon Sep 17 00:00:00 2001 +From f7a125e90f99a997652fceb07263517df0f1ecc6 Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Mon, 29 Jul 2024 09:35:51 -0400 Subject: [PATCH] Fix PACKAGE_PREFIX_DIR in qt/cmake/AppStreamQtConfig.cmake.in diff --git a/meta/recipes-support/appstream/appstream_1.1.5.bb b/meta/recipes-support/appstream/appstream_1.1.6.bb similarity index 95% rename from meta/recipes-support/appstream/appstream_1.1.5.bb rename to meta/recipes-support/appstream/appstream_1.1.6.bb index e33359e5a1..723c740006 100644 --- a/meta/recipes-support/appstream/appstream_1.1.5.bb +++ b/meta/recipes-support/appstream/appstream_1.1.6.bb @@ -24,7 +24,7 @@ SRC_URI = " \ file://0002-Do-not-build-qt-tests.patch \ file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \ " -SRC_URI[sha256sum] = "fc57337e250b0d27e75ac4216cc69a76d03c54011a5da5c7a2c57711a3d0cdf9" +SRC_URI[sha256sum] = "e298929f39729e84a70f6be6941f3e7f3fc2ee3c83cb3ea1b1b5b280a8fe3a24" S = "${UNPACKDIR}/AppStream-${PV}" -- 2.47.1