diff options
author | Eric Hameleers <alien@slackware.com> | 2010-06-04 13:55:40 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2010-06-04 13:55:40 +0000 |
commit | 02b943ccd016b7fc80943f7f178387adde4d47b0 (patch) | |
tree | 2f6955addb671e71d7d772d9f97ebd2a35966788 | |
parent | 7da075d500179c5a7c09ccd3ac2292cedd8d5ab8 (diff) | |
download | asb-02b943ccd016b7fc80943f7f178387adde4d47b0.tar.gz asb-02b943ccd016b7fc80943f7f178387adde4d47b0.tar.xz |
Rebuilt for Slackware 13.1. Also, give the nx account a random password.
-rwxr-xr-x | freenx/build/freenx.SlackBuild | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/freenx/build/freenx.SlackBuild b/freenx/build/freenx.SlackBuild index ba302ca9..da3f78dd 100755 --- a/freenx/build/freenx.SlackBuild +++ b/freenx/build/freenx.SlackBuild @@ -56,8 +56,12 @@ # 0.7.3-3: 27/jan/2009 by Eric Hameleers <alien@slackware.com> # * I changed several X paths to Slackware defaults in nxloadconfig # and node.conf.sample (default X session and KDE start command). +# 0.7.3-4: 04/jun/2010 by Eric Hameleers <alien@slackware.com> +# * Rebuilt for Slackware 13.1. The 'nx' user account is now created +# with a random password so that no further configuration is +# needed. # -# Run 'sh freenx.SlackBuild --cleanup' to build a Slackware package. +# Run 'sh freenx.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . # Install using 'installpkg'. # @@ -67,16 +71,9 @@ PRGNAM=freenx VERSION=${VERSION:-0.7.3} -ARCH=${ARCH:-i486} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-alien} -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -95,6 +92,22 @@ SRCURL="http://download.berlios.de/${PRGNAM}/${PRGNAM}-server-${VERSION}.tar.gz" ## --- with a little luck, you won't have to edit below this point --- ## ## +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -102,6 +115,10 @@ trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR set -u P1=${1:-1} +# Save old umask and set to 0022: +_UMASK_=$(umask) +umask 0022 + # Create working directories: mkdir -p $OUTPUT # place for the package to be saved mkdir -p $TMP/tmp-$PRGNAM # location to build the source @@ -195,11 +212,7 @@ install -m 644 $SRCDIR/freenx.logrotate $PKG/etc/logrotate.d/freenx-server.new # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) | sed \ - -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \ - -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \ - -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \ - > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -216,8 +229,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Clean up the extra stuff: -if [ "$P1" = "--cleanup" ]; then - rm -rf $TMP/tmp-$PRGNAM - rm -rf $PKG -fi +# Restore the original umask: +umask ${_UMASK_} + |