Service release for nx-3.4.0

1 files changed, 35 insertions, 26 deletions

diff --git a/freenx/build/nx.SlackBuild b/freenx/build/nx.SlackBuild
index 00622580..87a7889c 100755
--- a/freenx/build/nx.SlackBuild
+++ b/freenx/build/nx.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2008, 2009  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright (c) 2008,2009,2010  Eric Hameleers, Eindhoven, The Netherlands
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -55,6 +55,8 @@
 #               (nxcompext, nx-X11, nxagent, nxcompshad).
 # 3.4.0-1:    18/dec/2009 by Eric Hameleers <alien@slackware.com>
 #             * 3.4.0 service release by NoMachine updates several components
+# 3.4.0-2:    04/jun/2010 by Eric Hameleers <alien@slackware.com>
+#             * 3.4.0 service release by NoMachine updates several components
 # 
 # Run 'sh nx.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -66,7 +68,7 @@
 
 PRGNAM=nx
 VERSION=${VERSION:-3.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 # Where do we look for sources?
@@ -80,41 +82,41 @@ OUTPUT=${OUTPUT:-/tmp}
 SOURCE[0]="$SRCDIR/nxproxy-${VERSION}-2.tar.gz"
 SRCURL[0]="http://64.34.161.181/download/${VERSION}/sources/nxproxy-${VERSION}-2.tar.gz"
 
-SOURCE[1]="$SRCDIR/nxcomp-${VERSION}-1.tar.gz"
-SRCURL[1]="http://64.34.161.181/download/${VERSION}/sources/nxcomp-${VERSION}-1.tar.gz"
+SOURCE[1]="$SRCDIR/nxcomp-${VERSION}-7.tar.gz"
+SRCURL[1]="http://64.34.161.181/download/${VERSION}/sources/nxcomp-${VERSION}-7.tar.gz"
 
 SOURCE[2]="$SRCDIR/nxcompext-${VERSION}-1.tar.gz"
 SRCURL[2]="http://64.34.161.181/download/${VERSION}/sources/nxcompext-${VERSION}-1.tar.gz"
 
-SOURCE[3]="$SRCDIR/nxssh-${VERSION}-1.tar.gz"
-SRCURL[3]="http://64.34.161.181/download/${VERSION}/sources/nxssh-${VERSION}-1.tar.gz"
+SOURCE[3]="$SRCDIR/nxssh-${VERSION}-2.tar.gz"
+SRCURL[3]="http://64.34.161.181/download/${VERSION}/sources/nxssh-${VERSION}-2.tar.gz"
 
-SOURCE[4]="$SRCDIR/nx-X11-${VERSION}-1.tar.gz"
-SRCURL[4]="http://64.34.161.181/download/${VERSION}/sources/nx-X11-${VERSION}-1.tar.gz"
+SOURCE[4]="$SRCDIR/nx-X11-${VERSION}-3.tar.gz"
+SRCURL[4]="http://64.34.161.181/download/${VERSION}/sources/nx-X11-${VERSION}-3.tar.gz"
 
-SOURCE[5]="$SRCDIR/nxwin-${VERSION}-2.tar.gz"
-SRCURL[5]="http://64.34.161.181/download/${VERSION}/sources/nxwin-${VERSION}-2.tar.gz"
+SOURCE[5]="$SRCDIR/nxwin-${VERSION}-5.tar.gz"
+SRCURL[5]="http://64.34.161.181/download/${VERSION}/sources/nxwin-${VERSION}-5.tar.gz"
 
-SOURCE[6]="$SRCDIR/nxauth-${VERSION}-1.tar.gz"
-SRCURL[6]="http://64.34.161.181/download/${VERSION}/sources/nxauth-${VERSION}-1.tar.gz"
+SOURCE[6]="$SRCDIR/nxauth-${VERSION}-3.tar.gz"
+SRCURL[6]="http://64.34.161.181/download/${VERSION}/sources/nxauth-${VERSION}-3.tar.gz"
 
-SOURCE[7]="$SRCDIR/nxagent-${VERSION}-3.tar.gz"
-SRCURL[7]="http://64.34.161.181/download/${VERSION}/sources/nxagent-${VERSION}-3.tar.gz"
+SOURCE[7]="$SRCDIR/nxagent-${VERSION}-5.tar.gz"
+SRCURL[7]="http://64.34.161.181/download/${VERSION}/sources/nxagent-${VERSION}-5.tar.gz"
 
-SOURCE[8]="$SRCDIR/nxesd-${VERSION}-1.tar.gz"
-SRCURL[8]="http://64.34.161.181/download/${VERSION}/sources/nxesd-${VERSION}-1.tar.gz"
+SOURCE[8]="$SRCDIR/nxesd-${VERSION}-2.tar.gz"
+SRCURL[8]="http://64.34.161.181/download/${VERSION}/sources/nxesd-${VERSION}-2.tar.gz"
 
-SOURCE[9]="$SRCDIR/nxcompshad-${VERSION}-1.tar.gz"
-SRCURL[9]="http://64.34.161.181/download/${VERSION}/sources/nxcompshad-${VERSION}-1.tar.gz"
+SOURCE[9]="$SRCDIR/nxcompshad-${VERSION}-3.tar.gz"
+SRCURL[9]="http://64.34.161.181/download/${VERSION}/sources/nxcompshad-${VERSION}-3.tar.gz"
 
 SOURCE[10]="$SRCDIR/nxscripts-${VERSION}-1.tar.gz"
 SRCURL[10]="http://64.34.161.181/download/${VERSION}/sources/nxscripts-${VERSION}-1.tar.gz"
 
-SOURCE[11]="$SRCDIR/nxspool-${VERSION}-1.tar.gz"
-SRCURL[11]="http://64.34.161.181/download/${VERSION}/sources/nxspool-${VERSION}-1.tar.gz"
+SOURCE[11]="$SRCDIR/nxspool-${VERSION}-2.tar.gz"
+SRCURL[11]="http://64.34.161.181/download/${VERSION}/sources/nxspool-${VERSION}-2.tar.gz"
 
-SOURCE[12]="$SRCDIR/nxservice-${VERSION}-1.tar.gz"
-SRCURL[12]="http://64.34.161.181/download/${VERSION}/sources/nxservice-${VERSION}-1.tar.gz"
+SOURCE[12]="$SRCDIR/nxservice-${VERSION}-2.tar.gz"
+SRCURL[12]="http://64.34.161.181/download/${VERSION}/sources/nxservice-${VERSION}-2.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -134,12 +136,12 @@ case "$ARCH" in
   i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  s390)      SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
+  *)         SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
 esac
 
 # Exit the script on errors:
@@ -149,6 +151,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
@@ -194,7 +200,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
   tar -xvf ${SOURCE[$i]}
 done
 chown -R root:root *
-chmod -R u+w,go+r-w,a-s *
+chmod -R u+w,go+r-w,a+X-s *
 
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
@@ -388,3 +394,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
 
+# Restore the original umask:
+umask ${_UMASK_}
+