From 9369d7cbc5ff1b0433ba039dde1a21f38b2b06ab Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 10 Jan 2023 19:35:31 +0100 Subject: [PATCH] AppStream: update to 0.15.6. --- ...h_cache-fix-NULL-pointer-dereference.patch | 29 ------------------- srcpkgs/AppStream/template | 6 ++-- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch diff --git a/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch b/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch deleted file mode 100644 index 8bbe5996e36..00000000000 --- a/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/ximion/appstream/pull/432 -From: Roberto Ricci -Date: Mon, 19 Sep 2022 16:02:59 +0200 -Subject: [PATCH] ascli_refresh_cache: fix NULL pointer dereference - -The command `appstreamcli refresh-cache --cachepath /tmp/cache` -segfaults. In this code path, `ret` (initialized to `FALSE`) is not -updated when `as_pool_load` returns successfully and sets the `error` -pointer to NULL. Then the code tries to print `error->message`. ---- - tools/ascli-actions-mdata.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/ascli-actions-mdata.c b/tools/ascli-actions-mdata.c -index c77773da..30bfd325 100644 ---- a/tools/ascli-actions-mdata.c -+++ b/tools/ascli-actions-mdata.c -@@ -81,7 +81,7 @@ ascli_refresh_cache (const gchar *cachepath, - ret = as_pool_refresh_system_cache (pool, forced, &cache_updated, &error); - } else { - as_pool_override_cache_locations (pool, cachepath, NULL); -- as_pool_load (pool, NULL, &error); -+ ret = as_pool_load (pool, NULL, &error); - cache_updated = TRUE; - } - --- -2.37.3 - diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template index 7642218bc50..5eca5e52e63 100644 --- a/srcpkgs/AppStream/template +++ b/srcpkgs/AppStream/template @@ -1,7 +1,7 @@ # Template file for 'AppStream' pkgname=AppStream -version=0.15.5 -revision=2 +version=0.15.6 +revision=1 build_style=meson build_helper="gir qemu" configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi) @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/ximion/appstream" changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS" distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz" -checksum=829b8e62a4c857ff37948b089ee1524a86e9ae8cf963d2204cca0b204deb2060 +checksum=d46a6689f57aaefb587f01bf91071966b3e65de15b833d11e1911ce07a1350f2 conf_files="/etc/appstream.conf" triggers="appstream-cache"