Wed Dec 9 21:10:40 UTC 202020201209211040

a/elogind-243.7-x86_64-2.txz:  Rebuilt.
  Moved default udev rules to /lib/udev/rules.d/. Thanks to Robby Workman.
  Added /usr/share/polkit-1/rules.d/10-enable-session-power.rules.
a/glibc-zoneinfo-2020d-noarch-2.txz:  Rebuilt.
  Make /etc/localtime a symlink pointing into /usr/share/zoneinfo. If you
  have /usr on a separate partition, this might cause time problems prior
  to /usr being mounted (I recommend *not* making /usr a separate partition).
  But if you insist for some reason, you can probably work around it by
  adding the pointed-to directory and timezone file to your empty pre-mounted
  /usr directory.
a/upower-0.99.11-x86_64-2.txz:  Rebuilt.
  Added /usr/share/polkit-1/rules.d/10-enable-upower-suspend.rules.
d/autoconf-2.70-noarch-1.txz:  Upgraded.
d/gnucobol-3.1.1-x86_64-1.txz:  Upgraded.
kde/powerdevil-5.20.4-x86_64-2.txz:  Rebuilt.
  Moved 10-enable-powerdevil-discrete-gpu.rules.new to
  /usr/share/polkit-1/rules.d/. Thanks to Robby Workman.
  Moved 10-enable-session-power.rules to the elogind package.
  Moved 10-enable-upower-suspend.rules to the upower package.
  Thanks to GazL.
l/jasper-2.0.23-x86_64-1.txz:  Upgraded.
  Fix heap-overflow in cp_create() in jpc_enc.c.
  For more information, see:
    https://github.com/jasper-software/jasper/issues/252
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-27828
  (* Security fix *)
l/sbc-1.5-x86_64-1.txz:  Upgraded.
n/curl-7.74.0-x86_64-1.txz:  Upgraded.
  This release includes the following security related bugfixes:
  Inferior OCSP verification [93]
  FTP wildcard stack overflow [95]
  Trusting FTP PASV responses [97]
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-8286
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-8285
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-8284
  (* Security fix *)
xap/xscreensaver-5.45-x86_64-1.txz:  Upgraded.
xfce/Greybird-3.22.13-noarch-1.txz:  Upgraded.

6 files changed, 6 insertions, 62 deletions

diff --git a/source/kde/kde/build/powerdevil b/source/kde/kde/build/powerdevil
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/powerdevil
+++ b/source/kde/kde/build/powerdevil
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/doinst.sh/powerdevil b/source/kde/kde/doinst.sh/powerdevil
index 8745d6291..0f783c818 100644
--- a/source/kde/kde/doinst.sh/powerdevil
+++ b/source/kde/kde/doinst.sh/powerdevil
@@ -12,7 +12,4 @@ config() {
 }
 
 # Move over the new policy files:
-config etc/polkit-1/rules.d/10-enable-upower-suspend.rules.new
-config etc/polkit-1/rules.d/10-enable-session-power.rules.new
 config etc/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new 2>/dev/null
-
diff --git a/source/kde/kde/post-install/powerdevil.post-install b/source/kde/kde/post-install/powerdevil.post-install
index 4d6b9f836..92303702c 100644
--- a/source/kde/kde/post-install/powerdevil.post-install
+++ b/source/kde/kde/post-install/powerdevil.post-install
@@ -2,29 +2,9 @@
 mkdir -p $PKG/etc
 mv $PKG/etc/kde/dbus-1 $PKG/etc/
 
-mkdir -p $PKG/etc/polkit-1/rules.d
-
-# Add upower policy allowing users in the 'power' group
-# to suspend/hibernate the computer:
+# Add powerdevil policy file that allows users in the 'power' group
+# to check for existence of a discrete gpu:
+mkdir -p $PKG/usr/share/polkit-1/rules.d
 install -m 0644 -o root \
-  $CWD/post-install/powerdevil/10-enable-upower-suspend.rules \
-  $PKG/etc/polkit-1/rules.d/10-enable-upower-suspend.rules.new
-
-if [ "$SLKELOGIND" == "no" ]; then
-  # Add ConsoleKit2 policy file that allows users in the 'power' group
-  # to shutdown/reboot the computer:
-  install -m 0644 -o root \
-    $CWD/post-install/powerdevil/10-enable-ck2-power.rules \
-    $PKG/etc/polkit-1/rules.d/10-enable-session-power.rules.new
-else
-  # Add login1 policy file that allows users in the 'power' group
-  # to shutdown/reboot the computer:
-  install -m 0644 -o root \
-    $CWD/post-install/powerdevil/10-enable-elogind-power.rules \
-    $PKG/etc/polkit-1/rules.d/10-enable-session-power.rules.new
-  # Add powerdevil policy file that allows users in the 'power' group
-  # to check for existence of a discrete gpu:
-  install -m 0644 -o root \
-    $CWD/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules \
-    $PKG/etc/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new
-fi
+  $CWD/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules \
+  $PKG/usr/share/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new
diff --git a/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules b/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules
deleted file mode 100644
index 2a8a5a70b..000000000
--- a/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-polkit.addRule(
-  function(action, subject) {
-    if ( (action.id == "org.freedesktop.consolekit.system.restart" ||
-          action.id == "org.freedesktop.consolekit.system.restart-multiple-users" ||
-          action.id == "org.freedesktop.consolekit.system.stop" ||
-          action.id == "org.freedesktop.consolekit.system.stop-multiple-users")
-          && subject.isInGroup("power") ) {
-      return polkit.Result.YES;
-    }
-  }
-);
-
diff --git a/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules b/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules
deleted file mode 100644
index db4992062..000000000
--- a/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-polkit.addRule(
-  function(action, subject) {
-    if ( (action.id == "org.freedesktop.login1.reboot" ||
-          action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
-          action.id == "org.freedesktop.login1.power-off" ||
-          action.id == "org.freedesktop.login1.power-off-multiple-sessions")
-           && subject.isInGroup("power") ) {
-      return polkit.Result.YES;
-    }
-  }
-);
-
diff --git a/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules b/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules
deleted file mode 100644
index 4bccfb014..000000000
--- a/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-polkit.addRule(
-  function(action, subject) {
-    if ( (action.id == "org.freedesktop.upower.suspend" ||
-          action.id == "org.freedesktop.upower.hibernate")
-          && subject.isInGroup("power") ) {
-      return polkit.Result.YES;
-    }
-  }
-);