rpms/PackageKit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a patch to set-cache-age to 300 seconds instead of never refresh

Browse Source 
update openmamba valid repos patch [release 1.2.8-3mamba;Sun Apr 07 2024]
This commit is contained in:
Silvan Calarco 2024-04-09 19:04:08 +02:00
parent ad982d67a6
commit a30b67ebf7
10 changed files with 34 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
PackageKit-0.6.6-openmamba-groups.patch
View File

@ -1,82 +0,0 @@
diff -ru PackageKit-0.6.6.orig//backends/smart/smartBackend.py PackageKit-0.6.6/backends/smart/smartBackend.py
--- PackageKit-0.6.6.orig//backends/smart/smartBackend.py 2010-05-07 22:08:17.000000000 +0200
+++ PackageKit-0.6.6/backends/smart/smartBackend.py 2010-07-24 15:54:02.830191319 +0200
@@ -674,6 +674,78 @@
'Text tools' : GROUP_ACCESSORIES,
'Toys' : GROUP_GAMES,
'Video' : GROUP_MULTIMEDIA,
+ # RPM (openmamba)
+ 'Applications/Accessibility' : GROUP_ACCESSIBILITY,
+ 'Applications/Development' : GROUP_PROGRAMMING,
+ 'Applications/Educational' : GROUP_EDUCATION,
+ 'Applications/Fonts' : GROUP_FONTS,
+ 'Applications/Games' : GROUP_GAMES,
+ 'Applications/Graphics' : GROUP_GRAPHICS,
+ 'Applications/Mathematics' : GROUP_SCIENCE,
+ 'Applications/Networking' : GROUP_NETWORK,
+ 'Applications/Scientific' : GROUP_SCIENCE,
+ 'Applications/Security' : GROUP_SECURITY,
+ 'Applications/Shells' : GROUP_SYSTEM,
+ 'Applications/Spelling Checker' : GROUP_ACCESSORIES,
+ 'Applications/Web' : GROUP_OTHER,
+ 'Development/Bindings' : GROUP_PROGRAMMING,
+ 'Development/Applications' : GROUP_PROGRAMMING,
+ 'Development/Kernel' : GROUP_PROGRAMMING,
+ 'Development/Libraries/Java' : GROUP_PROGRAMMING,
+ 'Development/Libraries/Perl' : GROUP_PROGRAMMING,
+ 'Development/Libraries/Python' : GROUP_PROGRAMMING,
+ 'Graphical Desktop/Applications/Accessibility' : GROUP_ACCESSIBILITY,
+ 'Graphical Desktop/Applications/Administration' : GROUP_ADMIN_TOOLS,
+ 'Graphical Desktop/Applications/Archiving': GROUP_ACCESSORIES,
+ 'Graphical Desktop/Applications/Configuration' : GROUP_ADMIN_TOOLS,
+ 'Graphical Desktop/Applications/Databases': GROUP_ADMIN_TOOLS,
+ 'Graphical Desktop/Applications/Development' : GROUP_PROGRAMMING,
+ 'Graphical Desktop/Applications/Educational' : GROUP_EDUCATION,
+ 'Graphical Desktop/Applications/Environment' : GROUP_SYSTEM,
+ 'Graphical Desktop/Applications/Games' : GROUP_GAMES,
+ 'Graphical Desktop/Applications/Graphics' : GROUP_GRAPHICS,
+ 'Graphical Desktop/Applications/Internet' : GROUP_INTERNET,
+ 'Graphical Desktop/Applications/Multimedia' : GROUP_MULTIMEDIA,
+ 'Graphical Desktop/Applications/Networking' : GROUP_NETWORK,
+ 'Graphical Desktop/Applications/Office' : GROUP_OFFICE,
+ 'Graphical Desktop/Applications/Other' : GROUP_DESKTOP_OTHER,
+ 'Graphical Desktop/Applications/Publishing' : GROUP_PUBLISHING,
+ 'Graphical Desktop/Applications/Scientific' : GROUP_SCIENCE,
+ 'Graphical Desktop/Applications/Security' : GROUP_SECURITY,
+ 'Graphical Desktop/Applications/Utilities': GROUP_ACCESSORIES,
+ 'Graphical Desktop/Fonts' : GROUP_FONTS,
+ 'Graphical Desktop/Libraries/GNOME' : GROUP_DESKTOP_GNOME,
+ 'Graphical Desktop/Libraries/QT' : GROUP_DESKTOP_KDE,
+ 'Graphical Desktop/Libraries/KDE' : GROUP_DESKTOP_KDE,
+ 'Graphical Desktop/Look \'n\' feel' : GROUP_DESKTOP_KDE,
+ 'Graphical Desktop/Look \'n\' feel/Themes' : GROUP_DESKTOP_KDE,
+ 'Graphical Desktop/Look \'n\' feel/Screensavers' : GROUP_DESKTOP_KDE,
+ 'Network/File Transfer' : GROUP_NETWORK,
+ 'Network/File System' : GROUP_NETWORK,
+ 'Network/High Availability' : GROUP_NETWORK,
+ 'Network/Libraries' : GROUP_SYSTEM,
+ 'Network/Monitoring' : GROUP_NETWORK,
+ 'Network/Routing' : GROUP_NETWORK,
+ 'Network/Security' : GROUP_SECURITY,
+ 'System/Benchmarks' : GROUP_SYSTEM,
+ 'System/Clustering' : GROUP_SYSTEM,
+ 'System/Configuration' : GROUP_SYSTEM,
+ 'System/Database' : GROUP_SYSTEM,
+ 'System/Kernel and Hardware' : GROUP_SYSTEM,
+ 'System/Kernel and Hardware/Drivers' : GROUP_SYSTEM,
+ 'System/Fonts' : GROUP_FONTS,
+ 'System/Hardware' : GROUP_SYSTEM,
+ 'System/Internationalization' : GROUP_LOCALIZATION,
+ 'System/Libraries/Java' : GROUP_SYSTEM,
+ 'System/Libraries/Perl' : GROUP_SYSTEM,
+ 'System/Libraries/PHP' : GROUP_SYSTEM,
+ 'System/Libraries/Python' : GROUP_SYSTEM,
+ 'System/Management' : GROUP_SYSTEM,
+ 'System/Multimedia' : GROUP_SYSTEM,
+ 'System/Servers' : GROUP_SYSTEM,
+ 'System/Spooling' : GROUP_SYSTEM,
+ 'System/Telephony' : GROUP_SYSTEM,
+ 'System/Tools' : GROUP_SYSTEM,
# DEB
"admin" : GROUP_ADMIN_TOOLS,
"base" : GROUP_SYSTEM,

10
PackageKit-0.6.9-command_not_found_raise_timeout.patch
View File

@ -1,10 +0,0 @@
diff -Nru PackageKit-0.6.9.orig//contrib/command-not-found/CommandNotFound.conf PackageKit-0.6.9/contrib/command-not-found/CommandNotFound.conf
--- PackageKit-0.6.9.orig//contrib/command-not-found/CommandNotFound.conf 2010-09-13 16:33:08.000000000 +0200
+++ PackageKit-0.6.9/contrib/command-not-found/CommandNotFound.conf 2010-10-07 10:27:32.751429419 +0200
@@ -69,5 +69,5 @@
# Value is the number of milliseconds to allow.
#
# default=2000
-MaxSearchTime=2000
+MaxSearchTime=5000

11
PackageKit-1.1.12-dnf-repos-dir.patch
View File

@ -1,11 +0,0 @@
--- PackageKit-1.1.12/backends/dnf/pk-backend-dnf.c.orig 2019-06-04 19:08:15.890971265 +0200
+++ PackageKit-1.1.12/backends/dnf/pk-backend-dnf.c 2019-06-04 19:08:20.520990613 +0200
@@ -152,7 +152,7 @@
dnf_context_set_cache_dir (context, cache_dir);
solv_dir = g_build_filename (destdir, "/var/cache/PackageKit", release_ver, "hawkey", NULL);
dnf_context_set_solv_dir (context, solv_dir);
- repo_dir = g_build_filename (destdir, "/etc/yum.repos.d", NULL);
+ repo_dir = g_build_filename (destdir, "/etc/yum/repos.d", NULL);
dnf_context_set_repo_dir (context, repo_dir);
lock_dir = g_build_filename (destdir, "/var/run", NULL);
dnf_context_set_lock_dir (context, lock_dir);

35
PackageKit-1.1.12-upstream-dnf-invalidate-the-sack-cache-after-downloading-new-metadata.patch
View File

@ -1,35 +0,0 @@
From cdbd27d699b51e37c533d07abd2f1ab26e11355c Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 18 Dec 2018 01:02:27 +0100
Subject: [PATCH] dnf: Invalidate the sack cache after downloading new metadata
This fixes first resolve() after refresh() to correctly return the new
data.
https://bugzilla.redhat.com/show_bug.cgi?id=1642878
---
backends/dnf/pk-backend-dnf.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c
index 5961f1258..47e565915 100644
--- a/backends/dnf/pk-backend-dnf.c
+++ b/backends/dnf/pk-backend-dnf.c
@@ -1568,6 +1568,7 @@ pk_backend_refresh_cache_thread (PkBackendJob *job,
gpointer user_data)
{
PkBackendDnfJobData *job_data = pk_backend_job_get_user_data (job);
+ PkBackend *backend = pk_backend_job_get_backend (job);
DnfRepo *repo;
DnfState *state_local;
DnfState *state_loop;
@@ -1699,6 +1700,9 @@ pk_backend_refresh_cache_thread (PkBackendJob *job,
return;
}
+ /* invalidate the sack cache after downloading new metadata */
+ pk_backend_sack_cache_invalidate (backend, "downloaded new metadata");
+
/* regenerate the libsolv metadata */
state_local = dnf_state_get_child (job_data->state);
sack = dnf_utils_create_sack_for_filters (job, 0,

12
PackageKit-1.1.6-yumBackend-override_sigchecks.patch
View File

@ -1,12 +0,0 @@
diff -Nru PackageKit-1.1.6.orig/backends/yum/yumBackend.py PackageKit-1.1.6/backends/yum/yumBackend.py
--- PackageKit-1.1.6.orig/backends/yum/yumBackend.py 2016-09-02 10:05:30.000000000 +0200
+++ PackageKit-1.1.6/backends/yum/yumBackend.py 2017-11-15 02:28:33.226701894 +0100
@@ -1710,7 +1710,7 @@
if hasattr(self.yumbase, "_override_sigchecks"):
# _override_sigchecks logic is reversed
- override_sigchecks = not only_trusted
+ override_sigchecks = 1
self.yumbase._override_sigchecks = override_sigchecks

32
PackageKit-1.2.7-upstream-fix-pk_transaction_dispose-assertion_failed.patch
View File

@ -1,32 +0,0 @@
From 96a05994d528777ad7708c49dac012145693df1d Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 27 Aug 2023 19:04:20 +0200
Subject: [PATCH] transaction: We only need to emit finished when we were
committed
A transaction that has been staged but never actually has been committed
to run will never emit a ::Finished signal, and in this case that is
acceptable behavior.
Resolves: #656
---
src/pk-transaction.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index c9856b0a3..39ef37c97 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -5524,8 +5524,10 @@ pk_transaction_dispose (GObject *object)
}
if (transaction->priv->registration_id > 0) {
- /* We should have emitted ::Finished if the object was ever registered */
- g_assert (transaction->priv->emitted_finished);
+ /* We should have emitted ::Finished if the object was ever registered and committed */
+ if (transaction->priv->state != PK_TRANSACTION_STATE_UNKNOWN &&
+ transaction->priv->state != PK_TRANSACTION_STATE_NEW)
+ g_assert (transaction->priv->emitted_finished);
g_dbus_connection_unregister_object (transaction->priv->connection,
transaction->priv->registration_id);

11
PackageKit-1.2.7-workaround-pk_transaction_remove_assert.patch
View File

@ -1,11 +0,0 @@
--- PackageKit-1.2.7/src/pk-transaction.c.orig 2023-09-15 22:35:18.046436973 +0200
+++ PackageKit-1.2.7/src/pk-transaction.c 2023-09-15 22:35:35.724504373 +0200
@@ -5525,7 +5525,7 @@
if (transaction->priv->registration_id > 0) {
/* We should have emitted ::Finished if the object was ever registered */
- g_assert (transaction->priv->emitted_finished);
+ //g_assert (transaction->priv->emitted_finished);
g_dbus_connection_unregister_object (transaction->priv->connection,
transaction->priv->registration_id);

15
PackageKit-1.2.0-dnf-openmamba.patch → PackageKit-1.2.8-dnf-openmamba.patch
View File

@ -1,7 +1,6 @@
diff -Nru PackageKit-1.1.13.orig/backends/dnf/dnf-backend-vendor-openmamba.c PackageKit-1.1.13/backends/dnf/dnf-backend-vendor-openmamba.c --- PackageKit-1.2.8/backends/dnf/dnf-backend-vendor-openmamba.c.orig 1970-01-01 01:00:00.000000000 +0100
--- PackageKit-1.1.13.orig/backends/dnf/dnf-backend-vendor-openmamba.c 1970-01-01 01:00:00.000000000 +0100 +++ PackageKit-1.2.8/backends/dnf/dnf-backend-vendor-openmamba.c 2024-04-07 12:05:02.777825211 +0200
+++ PackageKit-1.1.13/backends/dnf/dnf-backend-vendor-openmamba.c 2020-01-08 16:42:42.017000000 +0100 @@ -0,0 +1,47 @@
@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * + *
+ * Copyright (C) 2016 Neal Gompa <ngompa13@gmail.com> + * Copyright (C) 2016 Neal Gompa <ngompa13@gmail.com>
@ -30,11 +29,15 @@ diff -Nru PackageKit-1.1.13.orig/backends/dnf/dnf-backend-vendor-openmamba.c Pac
+dnf_validate_supported_repo (const gchar *id) +dnf_validate_supported_repo (const gchar *id)
+{ +{
+ const gchar *default_repos[] = { "rolling", + const gchar *default_repos[] = { "rolling",
+ "rolling-games",
+ "rolling-i586", + "rolling-i586",
+ "rolling-games-i586",
+ "unstable-makedist", + "unstable-makedist",
+ "unstable-makedist-i586", + "unstable-makedist-i586",
+ "unstable-misc",
+ "unstable-misc-i586",
+ "unstable-kernel",
+ "unstable-kernel-i586",
+ "unstable-autodist",
+ "unstable-autodist-i586",
+ NULL }; + NULL };
+ +
+ /* core repos that users shouldn't play with */ + /* core repos that users shouldn't play with */

11
PackageKit-1.2.8-dnf-set_cache_age-300-seconds.patch Normal file
View File

@ -0,0 +1,11 @@
--- PackageKit-1.2.8/backends/dnf/pk-backend-dnf.c.orig 2024-04-07 12:37:38.941345425 +0200
+++ PackageKit-1.2.8/backends/dnf/pk-backend-dnf.c 2024-04-07 12:37:59.156395232 +0200
@@ -1706,7 +1706,7 @@
pk_backend_sack_cache_invalidate (backend, "downloaded new metadata");
/* We just downloaded our cache, avoid doing so again */
- pk_backend_job_set_cache_age(job, G_MAXUINT);
+ pk_backend_job_set_cache_age(job, 300);
/* regenerate the libsolv metadata */
state_local = dnf_state_get_child (job_data->state);

34
PackageKit.spec
View File

@ -1,6 +1,6 @@
Name: PackageKit Name: PackageKit
Version: 1.2.8 Version: 1.2.8
Release: 2mamba Release: 3mamba
Summary: A system designed to make installing and updating software on your computer easier Summary: A system designed to make installing and updating software on your computer easier
Group: System/Management Group: System/Management
Vendor: openmamba Vendor: openmamba
@ -8,17 +8,11 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.freedesktop.org/software/PackageKit/ URL: https://www.freedesktop.org/software/PackageKit/
Source: http://www.freedesktop.org/software/PackageKit/releases/PackageKit-%{version}.tar.xz Source: http://www.freedesktop.org/software/PackageKit/releases/PackageKit-%{version}.tar.xz
Patch0: %{name}-0.6.6-openmamba-groups.patch Patch1: PackageKit-1.2.7-openmamba-Vendor.conf.patch
Patch1: %{name}-1.2.7-openmamba-Vendor.conf.patch Patch2: PackageKit-1.2.8-dnf-openmamba.patch
Patch2: %{name}-0.6.9-command_not_found_raise_timeout.patch Patch3: PackageKit-1.1.12-dnf-disable-trusted-packages-check.patch
Patch14: PackageKit-1.1.6-yumBackend-override_sigchecks.patch Patch4: PackageKit-1.2.6-enable-ShutdownTimeout.patch
Patch15: PackageKit-1.2.0-dnf-openmamba.patch Patch5: PackageKit-1.2.8-dnf-set_cache_age-300-seconds.patch
Patch16: PackageKit-1.1.12-dnf-repos-dir.patch
Patch17: PackageKit-1.1.12-dnf-disable-trusted-packages-check.patch
Patch18: PackageKit-1.1.12-upstream-dnf-invalidate-the-sack-cache-after-downloading-new-metadata.patch
Patch19: PackageKit-1.2.6-enable-ShutdownTimeout.patch
Patch20: PackageKit-1.2.7-upstream-fix-pk_transaction_dispose-assertion_failed.patch
Patch21: PackageKit-1.2.7-workaround-pk_transaction_remove_assert.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -91,14 +85,10 @@ This package contains the Gtk interface library for %{name}.
%prep %prep
%setup -q %setup -q
%patch 1 -p1 %patch 1 -p1
#%patch14 -p1 %patch 2 -p1
%patch 15 -p1 %patch 3 -p1
#%patch16 -p1 %patch 4 -p1
%patch 17 -p1 %patch 5 -p1
#%patch18 -p1
%patch 19 -p1
#%patch 20 -p1 -b .upstream-fix-pk_transaction_dispose-assertion_failed
#%patch 21 -p1
sed -i "s|openmandriva|openmamba|" meson_options.txt sed -i "s|openmandriva|openmamba|" meson_options.txt
@ -190,6 +180,10 @@ install -d -m0755 %{buildroot}/var/cache/PackageKit
%doc NEWS README %doc NEWS README
%changelog %changelog
* Sun Apr 07 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.8-3mamba
- add a patch to set-cache-age to 300 seconds instead of never refresh
- update openmamba valid repos patch
* Thu Jan 11 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.8-2mamba * Thu Jan 11 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.8-2mamba
- rebilt with python3 - rebilt with python3