Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages / packagekit
Commits: f79f1f7e by Jelle van der Waa at 2024-03-12T21:07:00+01:00 upgpkg: 1.2.8-7 - - - - - 3 changed files: - .SRCINFO - 0001-alpm-add-compatibility-with-libalpm-14.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = packagekit pkgdesc = A system designed to make installation and updates of packages easier pkgver = 1.2.8 - pkgrel = 6 + pkgrel = 7 url = https://www.freedesktop.org/software/PackageKit/ arch = x86_64 license = GPL-2.0-or-later @@ -18,7 +18,7 @@ pkgbase = packagekit validpgpkeys = 163EB50119225DB3DF8F49EA17ACBA8DFA970E17 validpgpkeys = EC60AABDF42AAE8FB062640480858FA38F62AF74 sha256sums = d834250a0f121483027db2cfd93e8b2cba8dc48ff854395bfd88aa9511898be4 - sha256sums = 5d43fac477742a53ff6bafd1aa96eebd8aedb8156cea08c09a07061939284642 + sha256sums = 2a75223614fceffe12e2c5cbc8534a927be583f798cd7a5fbd41348b464ecbf7 pkgname = packagekit depends = libpackagekit-glib ===================================== 0001-alpm-add-compatibility-with-libalpm-14.patch ===================================== @@ -1,14 +1,17 @@ -From ddbae7f3432cca84884c99bdb111a364ef6e322a Mon Sep 17 00:00:00 2001 +From 40728db86389fa1254258ae60b462a9f8acf2786 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa <je...@archlinux.org> Date: Fri, 8 Mar 2024 18:06:46 +0100 Subject: [PATCH] alpm: add compatibility with libalpm 14 In libalpm alpm_conflict_t package struct members are now of type alpm_pkg_t instead of char*. + +Don't crash on the new directive CacheServer. --- backends/alpm/meson.build | 2 +- + backends/alpm/pk-alpm-config.c | 5 +++++ backends/alpm/pk-alpm-transaction.c | 15 +++++++++------ - 2 files changed, 10 insertions(+), 7 deletions(-) + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/backends/alpm/meson.build b/backends/alpm/meson.build index eb4d5b373..50301466a 100644 @@ -20,6 +23,22 @@ index eb4d5b373..50301466a 100644 shared_module( 'pk_backend_alpm', +diff --git a/backends/alpm/pk-alpm-config.c b/backends/alpm/pk-alpm-config.c +index c96b4e167..3954a45fb 100644 +--- a/backends/alpm/pk-alpm-config.c ++++ b/backends/alpm/pk-alpm-config.c +@@ -615,6 +615,11 @@ pk_alpm_config_parse (PkAlpmConfig *config, const gchar *filename, + continue; + } + ++ if (g_strcmp0 (key, "CacheServer") == 0 && str != NULL) { ++ /* Ignore "CacheServer" key instead of crashing */ ++ continue; ++ } ++ + /* report errors from above */ + g_set_error (&e, PK_ALPM_ERROR, PK_ALPM_ERR_CONFIG_INVALID, + "unrecognised directive '%s'", key); diff --git a/backends/alpm/pk-alpm-transaction.c b/backends/alpm/pk-alpm-transaction.c index 58f996067..bc1273375 100644 --- a/backends/alpm/pk-alpm-transaction.c ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgbase='packagekit' pkgname=('packagekit' 'libpackagekit-glib') pkgver=1.2.8 -pkgrel=6 +pkgrel=7 pkgdesc='A system designed to make installation and updates of packages easier' arch=('x86_64') url='https://www.freedesktop.org/software/PackageKit/' @@ -17,7 +17,7 @@ validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17' # Richard Hughes source=("https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${pkgver}.tar.xz" "0001-alpm-add-compatibility-with-libalpm-14.patch") sha256sums=('d834250a0f121483027db2cfd93e8b2cba8dc48ff854395bfd88aa9511898be4' - '5d43fac477742a53ff6bafd1aa96eebd8aedb8156cea08c09a07061939284642') + '2a75223614fceffe12e2c5cbc8534a927be583f798cd7a5fbd41348b464ecbf7') prepare() { cd PackageKit-${pkgver} View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/packagekit/-/commit/f79f1f7efc2fe2695149f0f95da1e8fb520fb771 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/packagekit/-/commit/f79f1f7efc2fe2695149f0f95da1e8fb520fb771 You're receiving this email because of your account on gitlab.archlinux.org.