← Back to branch summary

~ubuntu-branches/ubuntu/trusty/packagekit/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/policy.diff

  • Committer: Package Import Robot
  • Author(s): Sebastian Heinlein
  • Date: 2013-08-27 23:45:23 UTC
  • mfrom: (56.1.26 sid)
  • Revision ID: package-import@ubuntu.com-20130827234523-hm4d57mvdf5x17cg
Tags: 0.8.10-2ubuntu1
* Merge from Debian unstable. Remaining changes:
  + Client tools alternatively depend on or recommend aptdaemon's
    compatibility layer
  + packagekit provides the virtual packagekit-system-interface
  + Add break on packagekit-plugin-click <= 0.3
  + Fix default url in vendor-ubuntu.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/policy.diff
1
1
Set Debian PolKit policy for PackageKit
2
2
Forwarded: not-needed
3
3
Author: Matthias Klumpp <matthias@tenstral.net>
4
 
Last-Update: 2010-12-06
 
4
Last-Update: 2012-08-14
5
5
--- a/policy/org.freedesktop.packagekit.policy.in
6
6
+++ b/policy/org.freedesktop.packagekit.policy.in
7
7
@@ -94,7 +94,7 @@
22
22
     </defaults>
23
23
   </action>
24
24
 
 
25
@@ -236,7 +236,7 @@
 
26
 
 
27
   <action id="org.freedesktop.packagekit.trigger-offline-update">
 
28
     <!-- SECURITY:
 
29
-          - Normal users are able to ask updates to be installed at
 
30
+          - Administrators are able to ask updates to be installed at
 
31
             early boot time without a password.
 
32
      -->
 
33
     <_description>Trigger offline updates</_description>
 
34
@@ -245,7 +245,7 @@
 
35
     <defaults>
 
36
       <allow_any>no</allow_any>
 
37
       <allow_inactive>no</allow_inactive>
 
38
-      <allow_active>yes</allow_active>
 
39
+      <allow_active>auth_admin_keep</allow_active>
 
40
     </defaults>
 
41
     <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/pk-trigger-offline-update</annotate>
 
42
   </action>
 
43
--- a/policy/org.freedesktop.packagekit.rules
 
44
+++ b/policy/org.freedesktop.packagekit.rules
 
45
@@ -1,7 +1,8 @@
 
46
 polkit.addRule(function(action, subject) {
 
47
-    if (action.id == "org.freedesktop.packagekit.package-install" &&
 
48
+    if ((action.id == "org.freedesktop.packagekit.upgrade-system" ||
 
49
+         action.id == "org.freedesktop.packagekit.trigger-offline-update") &&
 
50
         subject.active == true && subject.local == true &&
 
51
-        subject.isInGroup("wheel")) {
 
52
+        subject.isInGroup("sudo")) {
 
53
             return polkit.Result.YES;
 
54
     }
 
55
 });