From 40b6dbb21ea615896468eedc594782e8dc842b9b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 19 May 2022 23:07:59 +0000
Subject: Thu May 19 23:07:59 UTC 2022

d/rinutils-0.10.1-x86_64-1.txz:  Upgraded.
d/rust-1.61.0-x86_64-1.txz:  Upgraded.
kde/okteta-0.26.8-x86_64-1.txz:  Upgraded.
kde/plasma-workspace-5.24.5-x86_64-3.txz:  Rebuilt.
  Install /etc/pam.d/kde as a .new file. Thanks to PiterPunk.
n/bind-9.18.3-x86_64-1.txz:  Upgraded.
  Fixed a crash in DNS-over-HTTPS (DoH) code caused by premature TLS stream
  socket object deletion.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1183
  (* Security fix *)
---
 source/kde/kde/build/plasma-workspace                     |  2 +-
 source/kde/kde/doinst.sh/plasma-workspace                 | 14 ++++++++++++++
 source/kde/kde/post-install/plasma-workspace.post-install |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 source/kde/kde/doinst.sh/plasma-workspace

(limited to 'source/kde')

diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/doinst.sh/plasma-workspace b/source/kde/kde/doinst.sh/plasma-workspace
new file mode 100644
index 000000000..cb5080698
--- /dev/null
+++ b/source/kde/kde/doinst.sh/plasma-workspace
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/pam.d/kde.new
diff --git a/source/kde/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install
index 4ba279a20..8f3839ec2 100644
--- a/source/kde/kde/post-install/plasma-workspace.post-install
+++ b/source/kde/kde/post-install/plasma-workspace.post-install
@@ -46,7 +46,7 @@ if [ "$SLACKPAM" == "no" ]; then
     -i $PKG/usr/share/wayland-sessions/plasmawayland.desktop
 else
   # Install a PAM file for Plasma5 workspace:
-  install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde
+  install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde.new
 fi
 
 if [ "$SLKELOGIND" == "yes" ]; then
-- 
cgit v1.2.3-79-gdb01