Update to 1.1.2

This commit is contained in:
Kalev Lember 2016-07-12 16:57:46 +02:00
parent 18826f7554
commit 17a7631dfa
5 changed files with 7 additions and 86 deletions

1
.gitignore vendored
View File

@ -54,3 +54,4 @@ PackageKit-0.6.7.tar.bz2
/PackageKit-1.0.11.tar.xz
/PackageKit-1.1.0.tar.xz
/PackageKit-1.1.1.tar.xz
/PackageKit-1.1.2.tar.xz

View File

@ -1,54 +0,0 @@
From f2368faaeeee7bbce951499a4428f9530fde5c09 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 25 May 2016 10:41:48 +0100
Subject: [PATCH] Require admin authorisation to trigger a distro upgrade
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1335458
---
policy/org.freedesktop.packagekit.policy.in | 16 ++++++++++++++++
src/pk-engine.c | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/policy/org.freedesktop.packagekit.policy.in b/policy/org.freedesktop.packagekit.policy.in
index aac0fd1..221010d 100644
--- a/policy/org.freedesktop.packagekit.policy.in
+++ b/policy/org.freedesktop.packagekit.policy.in
@@ -286,6 +286,22 @@
</defaults>
</action>
+ <action id="org.freedesktop.packagekit.trigger-offline-upgrade">
+ <!-- SECURITY:
+ - Normal users require admin authentication to upgrade the system
+ to a new distribution since this can make the system unbootable or
+ stop other applications from working.
+ -->
+ <_description>Trigger offline updates</_description>
+ <_message>Authentication is required to trigger offline updates</_message>
+ <icon_name>package-x-generic</icon_name>
+ <defaults>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ </action>
+
<action id="org.freedesktop.packagekit.clear-offline-update">
<!-- SECURITY:
- Normal users are able to clear the updates message that is
diff --git a/src/pk-engine.c b/src/pk-engine.c
index 6b145b6..603de08 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -1733,7 +1733,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
helper->invocation = g_object_ref (invocation);
helper->action = action;
polkit_authority_check_authorization (engine->priv->authority, subject,
- "org.freedesktop.packagekit.trigger-offline-update",
+ "org.freedesktop.packagekit.trigger-offline-upgrade",
NULL,
POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
NULL,
--
2.7.4

View File

@ -1,24 +0,0 @@
From 062aec45763534f9d57aaee2e2915dcdeb3d25c7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 2 Jun 2016 14:01:43 +0200
Subject: [PATCH] hif: Match unavailable packages for the what-provides query
---
backends/hif/pk-backend-hif.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/backends/hif/pk-backend-hif.c b/backends/hif/pk-backend-hif.c
index 4f0d633..0f644f6 100644
--- a/backends/hif/pk-backend-hif.c
+++ b/backends/hif/pk-backend-hif.c
@@ -636,6 +636,7 @@ hif_utils_create_sack_for_filters (PkBackendJob *job,
case PK_ROLE_ENUM_SEARCH_DETAILS:
case PK_ROLE_ENUM_SEARCH_FILE:
case PK_ROLE_ENUM_GET_DETAILS:
+ case PK_ROLE_ENUM_WHAT_PROVIDES:
flags |= HIF_SACK_ADD_FLAG_UNAVAILABLE;
break;
default:
--
2.5.5

View File

@ -6,17 +6,14 @@
Summary: Package management service
Name: PackageKit
Version: 1.1.1
Release: 3%{?dist}
Version: 1.1.2
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
# Fedora-specific: set Vendor.conf up for Fedora.
Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
# Backported from upstream
Patch1: 0001-Require-admin-authorisation-to-trigger-a-distro-upgr.patch
Patch2: 0001-hif-Match-unavailable-packages-for-the-what-provides.patch
Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: shared-mime-info
@ -150,8 +147,6 @@ using PackageKit.
%prep
%setup -q
%patch0 -p1 -b .fedora
%patch1 -p1
%patch2 -p1
%build
%configure \
@ -279,6 +274,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
%{_datadir}/vala/vapi/packagekit-glib2.vapi
%changelog
* Tue Jul 12 2016 Kalev Lember <klember@redhat.com> - 1.1.2-1
- Update to 1.1.2
* Tue Jun 07 2016 Kalev Lember <klember@redhat.com> - 1.1.1-3
- Match unavailable packages for the what-provides query

View File

@ -1 +1 @@
1a605cd48474c4f177ca84a61457e49b PackageKit-1.1.1.tar.xz
d9e531d305edd5b8f9fe2d9bfe00efc1 PackageKit-1.1.2.tar.xz