Hello community,
here is the log from the commit of package PackageKit for openSUSE:Factory
checked in at 2020-11-02 09:38:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/PackageKit (Old)
and /work/SRC/openSUSE:Factory/.PackageKit.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit"
Mon Nov 2 09:38:34 2020 rev:207 rq:844984 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2020-10-15
13:47:51.261235473 +0200
+++ /work/SRC/openSUSE:Factory/.PackageKit.new.3463/PackageKit.changes
2020-11-02 09:38:53.217523194 +0100
@@ -1,0 +2,14 @@
+Fri Oct 30 03:12:47 UTC 2020 - Jonathan Kang <songchuan.k...@suse.com>
+
+- Add PackageKit-bsc1169739.patch: main: notify the service manager
+ when it's beginning to shutdown
+ (gh#/hughsie/PackageKit/commit/d8dd484d, bsc#1169739).
+
+-------------------------------------------------------------------
+Wed Oct 28 07:04:45 UTC 2020 - Franck Bui <f...@suse.com>
+
+- Replace $DISABLE_RESTART_ON_UPDATE=yes with
%service_del_postun_without_restart
+
+ Use of $DISABLE_RESTART_ON_UPDATE is deprecated.
+
+-------------------------------------------------------------------
New:
----
PackageKit-bsc1169739.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.VG5Rd4/_old 2020-11-02 09:38:53.933523881 +0100
+++ /var/tmp/diff_new_pack.VG5Rd4/_new 2020-11-02 09:38:53.937523885 +0100
@@ -56,6 +56,8 @@
Patch5: PackageKit-zypp-set-PATH.patch
# PATCH-FIX-UPSTREAM
PackageKit-zypp-dont-refresh-repos-on-offline-update.patch
gh#/hughsie/PackageKit/commit/81207bd3, bsc#1173562 sck...@suse.com -- zypp:
Don’t refresh repos again when actually updating packages
Patch6: PackageKit-zypp-dont-refresh-repos-on-offline-update.patch
+# PATCH-FIX-UPSTREAM PackageKit-bsc1169739.patch
gh#/hughsie/PackageKit/commit/d8dd484d, bsc#1169739 sck...@suse.com -- main:
notify the service manager when it's beginning to shutdown
+Patch7: PackageKit-bsc1169739.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -335,11 +337,10 @@
%postun
%mime_database_postun
# Do not restart PackageKit on upgrade - it kills the transaction
-export DISABLE_RESTART_ON_UPDATE=yes
-%service_del_postun packagekit.service
-%service_del_postun packagekit-background.service packagekit-background.timer
+%service_del_postun_without_restart packagekit.service
+%service_del_postun_without_restart packagekit-background.service
packagekit-background.timer
%if %{with offline_updates}
-%service_del_postun packagekit-offline-update.service
+%service_del_postun_without_restart packagekit-offline-update.service
%endif
%post gstreamer-plugin
++++++ PackageKit-bsc1169739.patch ++++++
>From 4a11b7fabb85f110c5e00084bd3800362909defe Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathank...@gnome.org>
Date: Fri, 30 Oct 2020 10:01:28 +0800
Subject: [PATCH 1/2] main: notify the service manager when it's beginning to
shutdown
This makes sure that the main process won't get SIGTERM on shutdown,
for example timed exit after idling for a while. This fix the problem
that libzypp fails to clean up some temporary files when packagekitd
quits.
---
meson.build | 1 +
src/pk-main.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/meson.build b/meson.build
index c0db907ea..2820e9366 100644
--- a/meson.build
+++ b/meson.build
@@ -29,6 +29,7 @@ if get_option('systemd')
systemd_system_unit_dir =
systemd.get_pkgconfig_variable('systemdsystemunitdir')
endif
+ add_project_arguments ('-DHAVE_SYSTEMD_SD_DAEMON_H=1', language: 'c')
add_project_arguments ('-DHAVE_SYSTEMD_SD_LOGIN_H=1', language: 'c')
else
if get_option('offline_update')
diff --git a/src/pk-main.c b/src/pk-main.c
index 5791c5fef..40bc783b8 100644
--- a/src/pk-main.c
+++ b/src/pk-main.c
@@ -32,6 +32,9 @@
#include <glib-unix.h>
#include <glib/gi18n.h>
#include <packagekit-glib2/pk-debug.h>
+#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+#include <systemd/sd-daemon.h>
+#endif
#include "pk-engine.h"
#include "pk-shared.h"
@@ -245,6 +248,10 @@ out:
syslog (LOG_DAEMON | LOG_DEBUG, "daemon quit");
closelog ();
+#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+ sd_notify (0, "STOPPING=1");
+#endif
+
if (helper.timer_id > 0)
g_source_remove (helper.timer_id);
if (loop != NULL)
--
2.26.2
>From 66c30ef3ad11e125b84ab32362d6597d91c819f5 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathank...@gnome.org>
Date: Fri, 30 Oct 2020 10:19:15 +0800
Subject: [PATCH 2/2] Revert "zypp: Clean up temporary files when PK quits"
The previous commit was meant to workaround the fact that PackageKit
doesn't quit normally on a timed exit. Since commit 8b621738 fixes
that, this is no longer needed.
This reverts commit 807f410e28074c8ad2b99682446bbb460fd54adf.
---
backends/zypp/pk-backend-zypp.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp
b/backends/zypp/pk-backend-zypp.cpp
index 0a5ed7766..2c1250331 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -1837,8 +1837,6 @@ pk_backend_destroy (PkBackend *backend)
{
g_debug ("zypp_backend_destroy");
- filesystem::recursive_rmdir (zypp::myTmpDir ());
-
g_free (_repoName);
delete priv;
}
--
2.26.2
