Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/PackageKit.git#6ece49605161e97da18d4788fd4f2b6eee2bd4c4
This commit is contained in:
DistroBaker
parent
77f3412dfe
commit
9a336ff54e
1
.gitignore
vendored
1
.gitignore
vendored
@ -80,3 +80,4 @@ PackageKit-0.6.7.tar.bz2
|
||||
/PackageKit-1.2.0.tar.xz
|
||||
/PackageKit-1.2.1.tar.xz
|
||||
/PackageKit-1.2.2.tar.xz
|
||||
/PackageKit-1.2.3.tar.xz
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 36ecb04a711603f047c3d5a45194533833ec829b Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Tue, 9 Feb 2021 15:02:51 +0100
|
||||
Subject: [PATCH] Fix multilib conflicts in generated pk-enum-types.h
|
||||
|
||||
Avoid using full filename in comments as that can be different on
|
||||
different arches if the build directory differs, leading to multilib
|
||||
conflicts. Instead just use @basename@, which is always the same.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1915259
|
||||
---
|
||||
lib/packagekit-glib2/pk-enum-types.c.template | 4 ++--
|
||||
lib/packagekit-glib2/pk-enum-types.h.template | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/packagekit-glib2/pk-enum-types.c.template b/lib/packagekit-glib2/pk-enum-types.c.template
|
||||
index 683cbdaa8..d3db6e905 100644
|
||||
--- a/lib/packagekit-glib2/pk-enum-types.c.template
|
||||
+++ b/lib/packagekit-glib2/pk-enum-types.c.template
|
||||
@@ -9,8 +9,8 @@
|
||||
/*** END file-header ***/
|
||||
|
||||
/*** BEGIN file-production ***/
|
||||
-#include "@filename@"
|
||||
-/* enumerations from "@filename@" */
|
||||
+#include "@basename@"
|
||||
+/* enumerations from "@basename@" */
|
||||
/*** END file-production ***/
|
||||
|
||||
/*** BEGIN value-header ***/
|
||||
diff --git a/lib/packagekit-glib2/pk-enum-types.h.template b/lib/packagekit-glib2/pk-enum-types.h.template
|
||||
index c42c9e5da..42aee7a3b 100644
|
||||
--- a/lib/packagekit-glib2/pk-enum-types.h.template
|
||||
+++ b/lib/packagekit-glib2/pk-enum-types.h.template
|
||||
@@ -13,7 +13,7 @@ G_BEGIN_DECLS
|
||||
|
||||
/*** BEGIN file-production ***/
|
||||
|
||||
-/* enumerations from "@filename@" */
|
||||
+/* enumerations from "@basename@" */
|
||||
/*** END file-production ***/
|
||||
|
||||
/*** BEGIN value-header ***/
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 0a7437961dad8ba8366d133e73068c6a578e9754 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Hughes <richard@hughsie.com>
|
||||
Date: Thu, 29 Oct 2020 15:40:00 +0000
|
||||
Subject: [PATCH] Do not crash when calling pk_dbus_get_uid() before D-Bus is
|
||||
setup
|
||||
|
||||
Fixes https://github.com/hughsie/PackageKit/issues/436
|
||||
---
|
||||
src/pk-dbus.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/pk-dbus.c b/src/pk-dbus.c
|
||||
index ddd04d4e6..af275eb2a 100644
|
||||
--- a/src/pk-dbus.c
|
||||
+++ b/src/pk-dbus.c
|
||||
@@ -64,6 +64,10 @@ pk_dbus_get_uid (PkDbus *dbus, const gchar *sender)
|
||||
g_return_val_if_fail (PK_IS_DBUS (dbus), G_MAXUINT);
|
||||
g_return_val_if_fail (sender != NULL, G_MAXUINT);
|
||||
|
||||
+ /* no connection to DBus */
|
||||
+ if (dbus->priv->proxy_uid == NULL)
|
||||
+ return G_MAXUINT;
|
||||
+
|
||||
/* set in the test suite */
|
||||
if (g_strcmp0 (sender, ":org.freedesktop.PackageKit") == 0) {
|
||||
g_debug ("using self-check shortcut");
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
Summary: Package management service
|
||||
Name: PackageKit
|
||||
Version: 1.2.2
|
||||
Release: 5%{?dist}
|
||||
Version: 1.2.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: http://www.freedesktop.org/software/PackageKit/
|
||||
Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
|
||||
@ -17,15 +17,6 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
|
||||
Patch0: PackageKit-0.3.8-RHEL-Vendor.conf.patch
|
||||
%endif
|
||||
|
||||
# Do not crash on login.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1836304
|
||||
# https://github.com/hughsie/PackageKit/pull/437
|
||||
Patch1: PackageKit-1.2.2-Do-not-crash-when-calling-pk_dbus_get_uid-before-D-Bus-is-setup.patch
|
||||
|
||||
# Fix multilib conflicts in generated pk-enum-types.h
|
||||
# https://github.com/hughsie/PackageKit/pull/456
|
||||
Patch2: 0001-Fix-multilib-conflicts-in-generated-pk-enum-types.h.patch
|
||||
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: gtk-doc
|
||||
@ -243,6 +234,13 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
|
||||
%{_datadir}/vala/vapi/packagekit-glib2.deps
|
||||
|
||||
%changelog
|
||||
* Mon Mar 22 2021 Richard Hughes <rhughes@redhat.com> - 1.2.3-1
|
||||
- New upstream release
|
||||
- Add support for coercing upgrade to distupgrade
|
||||
- Append to cron log instead of overwriting it
|
||||
- Cancel a transaction if calling Cancel fails or the daemon disappears
|
||||
- Remove large transaction size sanity check
|
||||
|
||||
* Mon Mar 08 2021 Richard Hughes <rhughes@redhat.com> - 1.2.2-5
|
||||
- Drop unused gnome-doc-utils BR
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (PackageKit-1.2.2.tar.xz) = ee83647cacadadd35cc67ceb10d5aec28f4af3f02343422633f58a4361be86a33be6183d63333b015e067be493c98f36aa685a4c48f53c7cc4047f3651264081
|
||||
SHA512 (PackageKit-1.2.3.tar.xz) = 4f41bc20ddb32bef624d2961b75e77e074c378791258710c533b7a43ac76dc9fec1cdff30dc161f5a677c289ecb78397424fa7977dca32688bef8bd28902b493
|
||||
|
||||
Loading…
Reference in New Issue
Block a user