3 files changed, 52 insertions, 38 deletions
diff --git a/system/xrdp/README b/system/xrdp/README
index e127d9d09a..f04525fa85 100644
--- a/system/xrdp/README
+++ b/system/xrdp/README
@@ -1,34 +1,36 @@
-Xrdp provides a fully functional Linux terminal server, capable of accepting
-connections from rdesktop and Microsoft's own terminal server/remote desktop
-clients. Xrdp uses Xvnc or xorgxrdp (which are installed separately) to manage
-the X session.  This means a RDP client can connect to a VNC server on the
-xrdp server machine in addition to the RDP server. Xrdp can also act as a
-bridging server, allowing RDP clients to connect to other RDP or VNC servers
-through the xrdp server.
+Xrdp provides a fully functional Linux terminal server, capable of
+accepting connections from rdesktop and Microsoft's own terminal
+server/remote desktop clients. Xrdp uses Xvnc or xorgxrdp (which
+are installed separately) to manage the X session.  This means a
+RDP client can connect to a VNC server on the xrdp server machine in
+addition to the RDP server. Xrdp can also act as a bridging server,
+allowing RDP clients to connect to other RDP or VNC servers through
+the xrdp server.
 
 Xvnc is included with tigervnc (in Slackware /extra).
 xorgxrdp can be compiled and installed after installing xrdp.
 
-By default, this script will make xrdp without PAM support since PAM is not
-installed in Slackware by default.  The script supports building with PAM,
-but it is completely untested by us.  If you want to enable PAM, run the
-script as follows:
+By default, this script will make xrdp without PAM support since
+PAM is not installed in Slackware by default.  The script supports
+building with PAM, but it is completely untested by us.  If you want
+to enable PAM, run the script as follows:
   USE_PAM=YES ./xrdp.SlackBuild
 
-By default, this script will make xrdp without GVFS support, as it can cause
-a problem if a session is unexpectedly terminated leaving an orphan GVFS
-mount. (This can be corrected by logging into the server hosting xrdp and
-running 'fusermount -uz ~/thinclient_drives').
-If you want to use drive redirection and shared clipboard support,
-run the script as follows:
+By default, this script will make xrdp without GVFS support, as it
+can cause a problem if a session is unexpectedly terminated leaving
+an orphan GVFS mount. (This can be corrected by logging into the
+server hosting xrdp and running 'fusermount -uz ~/thinclient_drives').
+If you want to use drive redirection and shared clipboard support, run
+the script as follows:
   USE_GVFS=YES ./xrdp.SlackBuild
 
-After installing xrdp there are some configuration files in /etc/xrdp that
-can be modified:
+After installing xrdp there are some configuration files in /etc/xrdp
+that can be modified:
 
 ** sesman.ini **
-sesman.ini has some useful options to take note of such as the ability to
-allow xrdp use by only a certain group and to specify the log location.
+sesman.ini has some useful options to take note of such as the ability
+to allow xrdp use by only a certain group and to specify the log
+location.
 *NOTE:* The default log location is now /var/log/xrdp-sesman.log, and
 the logs are rotated according to /etc/logrotate.d/xrdp-sesman added
 by the script.
@@ -48,17 +50,17 @@ the logs are rotated according to /etc/logrotate.d/xrdp added
 by the script.
 
 ** xrdp-xinitrc **
-xrdp-xinitrc by default tries to load one of several DE/WMs in order to
-start a X11rdp session.  Change this as desired to load a specific DE/WM.
-A similar script can be executed on a per-user basis by creating an
-executable script at ~/.xrdp-xinitrc.  A utility program, xrdp-xwmconfig,
-is included to allow you to use your xinit scripts during sessions.
-It works just like xwmconfig, so run it as root to set the global default,
-or run it as a normal user to set only the default for that user.  See the
-sesman.ini man page for details about defining different names or locations
-for the startup scripts.
+xrdp-xinitrc by default tries to load one of several DE/WMs in order
+to start a X11rdp session.  Change this as desired to load a specific
+DE/WM.  A similar script can be executed on a per-user basis by
+creating an executable script at ~/.xrdp-xinitrc.  A utility program,
+xrdp-xwmconfig, is included to allow you to use your xinit scripts
+during sessions. It works just like xwmconfig, so run it as root to
+set the global default, or run it as a normal user to set only the
+default for that user. See the sesman.ini man page for details about
+defining different names or locations for the startup scripts.
 
-If using xorgxrdp, you will likely need a /etc/X11/Xwrapper.config wrapper
-script containing a line:
+If using xorgxrdp, you will likely need a /etc/X11/Xwrapper.config
+wrapper script containing a line:
   allowed_users = anybody
 (See 'man Xwrapper.config' for details)
diff --git a/system/xrdp/doinst.sh b/system/xrdp/doinst.sh
index 5e27a33eb6..51dec44e87 100644
--- a/system/xrdp/doinst.sh
+++ b/system/xrdp/doinst.sh
@@ -47,3 +47,5 @@ config etc/xrdp/km-00000813.ini.new
 config etc/xrdp/km-00000816.ini.new
 config etc/xrdp/km-0000100c.ini.new
 config etc/xrdp/km-00010409.ini.new
+config etc/logrotate.d/xrdp-sesman.new
+config etc/logrotate.d/xrdp.new
diff --git a/system/xrdp/xrdp.SlackBuild b/system/xrdp/xrdp.SlackBuild
index 520cda33c9..13ec540299 100644
--- a/system/xrdp/xrdp.SlackBuild
+++ b/system/xrdp/xrdp.SlackBuild
@@ -1,13 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xrdp
 # Written by Phillip Warner <pc_warner@yahoo.com>
 # Amended by David Allen <david.a58@optusnet.com.au>
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add a couple missing .new config files to doinst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xrdp
 VERSION=${VERSION:-0.9.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +23,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,9 +65,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # uses autoreconf now
 autoreconf -vfi
@@ -154,4 +164,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE