Rebuilt for Slackware 13.1

1 files changed, 42 insertions, 25 deletions

diff --git a/truecrypt/build/truecrypt.SlackBuild b/truecrypt/build/truecrypt.SlackBuild
index 2b2d6629..44eb4529 100755
--- a/truecrypt/build/truecrypt.SlackBuild
+++ b/truecrypt/build/truecrypt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2006-2009  Eric Hameleers, Eindhoven, NL
+# Copyright (c) 2006-2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -60,6 +60,10 @@
 # 6.3-2:     27/oct/2009 by Eric Hameleers <alien@slackware.com>
 #            * Updated the "open container directory" patch to get rid of
 #              a (harmless) error message.
+# 6.3a-1:    04/apr/2010 by Eric Hameleers <alien@slackware.com>
+#            * New release.
+# 6.3a-2:    31/may/2010 by Eric Hameleers <alien@slackware.com>
+#            * Rebuilt for Slackware 13.1.
 # 
 # Run 'sh truecrypt.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -70,8 +74,7 @@
 # Set initial variables:
 
 PRGNAM=truecrypt
-VERSION=${VERSION:-6.3}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-6.3a}
 BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
@@ -101,13 +104,14 @@ src_checkout() {
   # Param #1 : index in the SOURCE[] array.
   # Param #2 : full path to where SOURCE[$1] tarball should be created.
   # Determine the tarball extension:
-  PEXT=$(echo "${2}" | sed -r -e 's/.*[^.].(tar.gz|tar.bz2|tgz).*/\1/')
-  if [ "$PEXT" == "${2}" ]; then   # we did not find a allowed extension
-    echo "Archive can only have extension '.tar.gz' '.tar.bz2' or '.tgz'"
-    exit 1
-  else
-    [ "$PEXT" = "tar.bz2" ] && TARCOMP="j" || TARCOMP="z"
-  fi
+  PEXT=$(echo "${2}" | sed -r -e 's/.*[^.].(tar.xz|tar.gz|tar.bz2|tgz).*/\1/')
+  case "$PEXT" in
+    "tar.xz") TARCOMP="J" ;;
+    "tar.gz") TARCOMP="z" ;;
+    "tgz") TARCOMP="z" ;;
+    "tar.bz2") TARCOMP="j" ;;
+    *) echo "Archive can only have extension 'tar.xz', '.tar.gz' '.tar.bz2' or '.tgz'" ; exit 1 ;;
+  esac
   case ${1} in
   2) # pks-11
      mkdir pks-11-v2-20 \
@@ -126,25 +130,39 @@ src_checkout() {
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
-# Exit the script on errors:
-set -e
-trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
-# Catch unitialized variables:
-set -u
-P1=${1:-1}
+# 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
 
 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:
+set -e
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+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 +212,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 .
 cd ${PRGNAM}-${VERSION}-source
 # Add required rsa header files:
 cp -a ../pks-11-v2-20/*.h Crypto/
@@ -246,11 +264,7 @@ EOT
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Readme.txt License.txt Release/Setup\ Files/*.pdf $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 {} \;
 
@@ -266,3 +280,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_}
+