diff options
Diffstat (limited to 'system/xrdp/xrdp.SlackBuild')
| -rw-r--r-- | system/xrdp/xrdp.SlackBuild | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/system/xrdp/xrdp.SlackBuild b/system/xrdp/xrdp.SlackBuild index 0a18e3aadaa5..d5ff39cc11c8 100644 --- a/system/xrdp/xrdp.SlackBuild +++ b/system/xrdp/xrdp.SlackBuild @@ -4,13 +4,13 @@ # Written by Phillip Warner <pc_warner@yahoo.com> PRGNAM=xrdp -VERSION=${VERSION:-0.6.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -25,8 +25,8 @@ OUTPUT=${OUTPUT:-/tmp} # then run this script as: "USE_PAM=YES ./xrdp.SlackBuild" USE_PAM=${USE_PAM:-NO} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -44,9 +44,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-v$VERSION -tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz -cd $PRGNAM-v$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +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 \) \ @@ -58,16 +58,11 @@ find -L . \ autoreconf -vfi if [ "$USE_PAM" = "NO" ]; then - NOPAM_OPT="--enable-nopam" + NOPAM_OPT="--disable-pam" else NOPAM_OPT="" fi -# patches from Mancha -patch -p1 < $CWD/xrdp-v0.6.1_disabled.diff -patch -p1 < $CWD/xrdp-v0.6.1_crypt.diff -patch -p1 < $CWD/xrdp-v0.6.1_cleanup-state.diff - # Optional config options if built with FreeRDP: # --enable-freerdp Build freerdp module (default: no) # --enable-freerdp1 Build freerdp1 module (default: no) @@ -81,6 +76,8 @@ CPPFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ + --disable-painter \ + --disable-rfxcodec \ $NOPAM_OPT # Fix path in what will become the init script @@ -89,13 +86,6 @@ sed -i "s/SBINDIR=\/usr\/local\/sbin/SBINDIR=\/usr\/sbin/" instfiles/xrdp.sh # Change xinit script name to xrdp-xinitrc sed -i "s/startwm.sh/xrdp-xinitrc/" instfiles/xrdp.sh -# Change LogLevel to INFO instead of DEBUG -# Disable Root logins by default -# Set user-specific RDP session script to ~/.xrdp-xinitrc -# Set default RDP session xinit script to /etc/xrdp/xrdp-xinitrc -# Note: LogFile now at /var/log/xrdp-sesman.log -patch -d sesman/ -p2 < $CWD/sesman.ini.patch - # Build fails if a copy of config.{c,h} is not in sesman/tools/ cp -v sesman/config.{c,h} sesman/tools/ @@ -118,7 +108,6 @@ mv $PKG/etc/$PRGNAM/startwm.sh $PKG/etc/$PRGNAM/xrdp-xinitrc.new mv rsakeys.ini rsakeys.ini.new mv sesman.ini sesman.ini.new mv xrdp.ini xrdp.ini.new - rename ini ini.new km-????.ini ) # Install the xrdp-xwmconfig utility @@ -131,7 +120,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING design.txt install.txt readme.txt faq-*.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING design.txt install.txt README.md faq-*.txt $PKG/usr/doc/$PRGNAM-$VERSION + # Keep a backup copy of startwm.sh in the docs cat sesman/startwm.sh > $PKG/usr/doc/$PRGNAM-$VERSION/startwm.sh-example cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |