5 files changed, 14 insertions, 6 deletions
diff --git a/source/x/x11-skel/scripts/xwmconfig.desktop b/source/x/x11-skel/scripts/xwmconfig.desktop
new file mode 100644
index 000000000..c604f74d9
--- /dev/null
+++ b/source/x/x11-skel/scripts/xwmconfig.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Xsession default
+Comment=Use Xsession to start the desktop configured by xwmconfig
+Exec=/etc/X11/xdm/Xsession
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index 553e77664..c934c6692 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011, 2012, 2018, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=x11-skel
 VERSION=7.7
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -63,6 +63,7 @@ mkdir -p usr/lib${LIBDIRSUFFIX}/X11
 mkdir -p usr/bin
 mkdir -p var/log/setup
 mkdir -p usr/man/man1
+mkdir -p usr/share/xsessions
 
 # obsolete:
 #cp -a $CWD/scripts/xorg.conf-fbdev etc/X11
@@ -79,6 +80,9 @@ cp -a $CWD/scripts/setup.xwmconfig var/log/setup
 chown root:root var/log/setup/setup.xwmconfig
 chmod 755 var/log/setup/setup.xwmconfig
 cat $CWD/manpages/xwmconfig.1 | gzip -9c > $PKG/usr/man/man1/xwmconfig.1.gz
+cp -a $CWD/scripts/xwmconfig.desktop usr/share/xsessions
+chown root:root usr/share/xsessions/xwmconfig.desktop
+chmod 644 usr/share/xsessions/xwmconfig.desktop
 
 mkdir -p install
 zcat $CWD/doinst.sh.gz \
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index b4de39476..48082f72f 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-11
+12
diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm
index 68c356c50..fc3b5a679 100644
--- a/source/x/x11/doinst.sh/xdm
+++ b/source/x/x11/doinst.sh/xdm
@@ -4,8 +4,8 @@ config() {
   # 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
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # MOVE IT OVER TO FIX PERMS
+    mv $NEW $OLD
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index 31b390d80..9b4c481ab 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -30,8 +30,8 @@ do
   # pre Slackware-14.1 development cycle.
   awk "/[^ ]/ { copy=1 }; copy { print }" $PKG/etc/X11/xdm/${conffile} > $PKG/etc/X11/xdm/${conffile}.new
   touch -r $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new
+  chmod --reference=$PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new
   rm -f $PKG/etc/X11/xdm/${conffile}
-  #mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
 done
 
 # Change default auth type: