[PackageKit/f16] yum: don't perceive all updates as untrusted (#814945)

[Nils Philippsen]

commit 08cac9f987a2b4c508700dd1221e3ab8dec7c1d4
Author: Nils Philippsen <nils at redhat.com>
Date:   Thu Apr 26 17:51:15 2012 +0200

    yum: don't perceive all updates as untrusted (#814945)

 PackageKit-0.6.22-yum-untrusted.patch |   36 +++++++++++++++++++++++++++++++++
 PackageKit.spec                       |    9 +++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/PackageKit-0.6.22-yum-untrusted.patch b/PackageKit-0.6.22-yum-untrusted.patch
new file mode 100644
index 0000000..613f6ec
--- /dev/null
+++ b/PackageKit-0.6.22-yum-untrusted.patch
@@ -0,0 +1,36 @@
+From e64b8512487fdad978a92221106d874b43311e29 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Thu, 26 Apr 2012 17:39:43 +0200
+Subject: [PATCH] yum: don't perceive all updates as untrusted
+
+Consider all packages as signed during simulation. Fixes rhbz#814945.
+(cherry picked from commit 9f4fb9fe5bf123c99c4325c7b2a7091f728c466b)
+---
+ backends/yum/yumBackend.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
+index 1cb7a8e..e3e8504 100755
+--- a/backends/yum/yumBackend.py
++++ b/backends/yum/yumBackend.py
+@@ -1971,7 +1971,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
+         self.status(STATUS_RUNNING)
+         txmbrs = []
+ 
+-        self._set_only_trusted(only_trusted)
++        self._set_only_trusted(only_trusted or simulate)
+ 
+         for package_id in package_ids:
+             grp = self._is_meta_package(package_id)
+@@ -2311,7 +2311,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
+         self.percentage(0)
+         self.status(STATUS_RUNNING)
+ 
+-        self._set_only_trusted(only_trusted)
++        self._set_only_trusted(only_trusted or simulate)
+ 
+         txmbrs = []
+         try:
+-- 
+1.7.10
+
diff --git a/PackageKit.spec b/PackageKit.spec
index 58aca82..bddb41c 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -3,7 +3,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.22
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -17,6 +17,9 @@ Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 # Un-Upstreamed: Fix browser plugin compile
 Patch2:    fix-new-xulrunner-dep.patch
 
+# Upstreamed: don't perceive all updates as untrusted
+Patch3:    PackageKit-0.6.22-yum-untrusted.patch
+
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-backend
 Requires: shared-mime-info
@@ -254,6 +257,7 @@ user to restart the computer or remove and re-insert the device.
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 %patch2 -p1 -R -b .fix-browser-compile
+%patch3 -p1 -b .yum-untrusted
 
 %build
 %configure \
@@ -467,6 +471,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Apr 26 2012 Nils Philippsen <nils at redhat.com> - 0.6.22-2
+- yum: don't perceive all updates as untrusted (#814945)
+
 * Wed Apr 11 2012 Richard Hughes  <rhughes at redhat.com> - 0.6.22-1
 - New upstream release.
 - Remove upstreamed patches.