From 194ec853e8f20fd32d5a91eec74ff77383093f4e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 6 Feb 2020 01:59:35 +0000
Subject: Thu Feb  6 01:59:35 UTC 2020

a/hwdata-0.332-noarch-1.txz:  Upgraded.
a/kernel-firmware-20200204_b791e15-noarch-1.txz:  Upgraded.
a/kernel-generic-5.4.18-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.18-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.18-x86_64-1.txz:  Upgraded.
d/cmake-3.16.4-x86_64-1.txz:  Upgraded.
d/icecream-1.3.1-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.18-x86-1.txz:  Upgraded.
k/kernel-source-5.4.18-noarch-1.txz:  Upgraded.
xap/xlockmore-5.62-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/kde/doinst.sh/kde-workspace                    |  5 ++---
 source/kde/kde.SlackBuild                             | 10 +++++-----
 source/kde/post-install/kde-workspace.post-install    |  9 +++++++++
 source/kde/post-install/kde-workspace/config/kde.pamd |  9 +++++++++
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 source/kde/post-install/kde-workspace/config/kde.pamd

(limited to 'source/kde')

diff --git a/source/kde/doinst.sh/kde-workspace b/source/kde/doinst.sh/kde-workspace
index 793bae742..5834cc55f 100644
--- a/source/kde/doinst.sh/kde-workspace
+++ b/source/kde/doinst.sh/kde-workspace
@@ -13,9 +13,6 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/kde/kdm/backgroundrc.new
-config etc/kde/kdm/kdmrc.new
-
 if [ -x usr/bin/update-desktop-database ]; then
   usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
@@ -24,3 +21,5 @@ if [ -x usr/bin/update-mime-database ]; then
   usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
+config etc/kde/kdm/backgroundrc.new
+config etc/kde/kdm/kdmrc.new
diff --git a/source/kde/kde.SlackBuild b/source/kde/kde.SlackBuild
index 06ae53d33..0fa0beea1 100755
--- a/source/kde/kde.SlackBuild
+++ b/source/kde/kde.SlackBuild
@@ -327,11 +327,6 @@ build_mod_pkg () {
       # Strip binaries:
       strip_binaries $PKG
 
-      # If there's any special post-install things to do, do them:
-      if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
-        . $CWD/post-install/${PKGNAME}.post-install
-      fi
-
       # If this package requires some doinst.sh material, add it here:
       if [ -r $CWD/doinst.sh/${PKGNAME} ]; then
         mkdir -p $PKG/install
@@ -340,6 +335,11 @@ build_mod_pkg () {
           >> $PKG/install/doinst.sh
       fi
 
+      # If there's any special post-install things to do, do them:
+      if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
+        . $CWD/post-install/${PKGNAME}.post-install
+      fi
+
       # If this is a modular package, build it here:
       if [ -d $SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME ]; then
         cd $PKG
diff --git a/source/kde/post-install/kde-workspace.post-install b/source/kde/post-install/kde-workspace.post-install
index 5cbabf507..f6e0c236d 100644
--- a/source/kde/post-install/kde-workspace.post-install
+++ b/source/kde/post-install/kde-workspace.post-install
@@ -39,6 +39,15 @@ cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDI
 # Add a .new suffix so we don't mangle an existing file:
 mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new
 
+# Add config file if PAM is installed:
+if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
+  mkdir -p $PKG/etc/pam.d
+  cp -a $CWD/post-install/kde-workspace/config/kde.pamd $PKG/etc/pam.d/kde.new
+  chown root:root $PKG/etc/pam.d/kde.new
+  chmod 644 $PKG/etc/pam.d/kde.new
+  echo "config etc/pam.d/kde.new" >> $PKG/install/doinst.sh
+fi
+
 # Move the KDM files someplace FHS compliant:
 mkdir -p $PKG/etc/kde
 mv $PKG/usr/share/config/kdm $PKG/etc/kde
diff --git a/source/kde/post-install/kde-workspace/config/kde.pamd b/source/kde/post-install/kde-workspace/config/kde.pamd
new file mode 100644
index 000000000..7acfd901e
--- /dev/null
+++ b/source/kde/post-install/kde-workspace/config/kde.pamd
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include      system-auth
+auth       include      postlogin
+account    include      system-auth
+password   include      system-auth
+session    include      system-auth
+session    required     pam_loginuid.so
+session    optional     pam_ck_connector.so nox11
+session    include      postlogin
-- 
cgit v1.2.3