From e44b004f816d2140277048fc285b2134805bc1e0 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Thu, 14 Apr 2022 01:32:17 -0400
Subject: system/xrdp: Fix doinst.sh.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/xrdp/doinst.sh       |  2 ++
 system/xrdp/xrdp.SlackBuild | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'system')

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 8d418204fd..13ec540299 100644
--- a/system/xrdp/xrdp.SlackBuild
+++ b/system/xrdp/xrdp.SlackBuild
@@ -4,11 +4,14 @@
 # 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}
 
@@ -20,9 +23,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -65,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
-- 
cgit v1.2.3