Date: Friday, October 14, 2022 @ 21:02:05
Author: eworm
Revision: 1329073
upgpkg: packagekit 1.2.5-2: fix handling of HookDir (FS#68013)
Added:
packagekit/trunk/0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
Modified:
packagekit/trunk/PKGBUILD
----------------------------------------------------------------+
0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch | 47
++++++++++
PKGBUILD | 8 +
2 files changed, 52 insertions(+), 3 deletions(-)
Added: 0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
===================================================================
--- 0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
(rev 0)
+++ 0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
2022-10-14 21:02:05 UTC (rev 1329073)
@@ -0,0 +1,47 @@
+From 2b6c18e142b93ecfe71d91356d63018d91aa907d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?=
+ <[email protected]>
+Date: Fri, 9 Sep 2022 20:03:11 -0400
+Subject: [PATCH 1/1] Fix incorrect handling of hookdirs config [fixes #342]
+
+Fix `pk_alpm_config_list_options` incorrect alphabetical order, otherwise the
hookdirs config is not available.
+
+Iterate through `config->hookdirs` and use the correct API call to set
additional hooks directories `alpm_option_add_hookdir`, this way SYSHOOKDIR is
not overridden
+---
+ backends/alpm/pk-alpm-config.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/backends/alpm/pk-alpm-config.c b/backends/alpm/pk-alpm-config.c
+index 0a64a1890..c96b4e167 100644
+--- a/backends/alpm/pk-alpm-config.c
++++ b/backends/alpm/pk-alpm-config.c
+@@ -362,6 +362,7 @@ typedef struct
+ /* keep this in alphabetical order */
+ static const PkAlpmConfigList pk_alpm_config_list_options[] = {
+ { "HoldPkg", G_STRUCT_OFFSET (PkAlpmConfig, holdpkgs) },
++ { "HookDir", G_STRUCT_OFFSET (PkAlpmConfig, hookdirs) },
+ { "IgnoreGroup", G_STRUCT_OFFSET (PkAlpmConfig, ignoregroups) },
+ { "IgnorePkg", G_STRUCT_OFFSET (PkAlpmConfig, ignorepkgs) },
+ { "LocalFileSigLevel", G_STRUCT_OFFSET (PkAlpmConfig,
+@@ -370,7 +371,6 @@ static const PkAlpmConfigList
pk_alpm_config_list_options[] = {
+ { "NoUpgrade", G_STRUCT_OFFSET (PkAlpmConfig, noupgrades) },
+ { "RemoteFileSigLevel", G_STRUCT_OFFSET (PkAlpmConfig,
+ remotefilesiglevels) },
+- { "HookDir", G_STRUCT_OFFSET (PkAlpmConfig, hookdirs) },
+ { NULL, 0 }
+ };
+
+@@ -1014,7 +1014,9 @@ pk_alpm_config_configure_alpm (PkBackend *backend,
PkAlpmConfig *config, GError
+ config->noupgrades = NULL;
+
+ /* alpm takes ownership */
+- alpm_option_set_noupgrades (handle, config->hookdirs);
++ for(alpm_list_t *j = config->hookdirs; j; j = j->next) {
++ alpm_option_add_hookdir(handle, j->data);
++ }
+ config->hookdirs = NULL;
+
+ pk_alpm_config_configure_repos (backend, config, handle, error);
+--
+2.38.0
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-14 20:45:09 UTC (rev 1329072)
+++ PKGBUILD 2022-10-14 21:02:05 UTC (rev 1329073)
@@ -4,7 +4,7 @@
pkgbase='packagekit'
pkgname=('packagekit' 'libpackagekit-glib')
pkgver=1.2.5
-pkgrel=1
+pkgrel=2
pkgdesc='A system designed to make installation and updates of packages easier'
arch=('x86_64')
url='https://www.freedesktop.org/software/PackageKit/'
@@ -15,9 +15,11 @@
validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17' # Richard
Hughes <[email protected]>
'EC60AABDF42AAE8FB062640480858FA38F62AF74') # Kalev Lember
<[email protected]>
source=("https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${pkgver}.tar.xz";
- '0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch')
+ '0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch'
+ '0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch')
sha256sums=('e08cb9164700ac684386e4257f783493ebac637141d34a8ce8077147ea10ad26'
- '1f648e1ad7309e769449783a0ecadc78bac18460518e8b8394f6532d66874d51')
+ '1f648e1ad7309e769449783a0ecadc78bac18460518e8b8394f6532d66874d51'
+ 'f07c02dea37d3d6d73f41f6a3fc6b40f0b75a38bdd96bd52b11a949e79a0608c')
prepare() {
for _patch in *.patch; do
