Update to 0.96

1 files changed, 32 insertions, 19 deletions

diff --git a/clamav/build/clamav.SlackBuild b/clamav/build/clamav.SlackBuild
index 05324a65..b8ecfc71 100755
--- a/clamav/build/clamav.SlackBuild
+++ b/clamav/build/clamav.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id$
 
-# Copyright 2006-2009  Eric Hameleers, Eindhoven, NL
+# Copyright 2006-2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -122,6 +122,8 @@
 #            * New release.
 # 0.95.3-1:  30/oct/2009 by Eric Hameleers
 #            * New release.
+# 0.96-1:    02/apr/2010 by Eric Hameleers
+#            * New release.
 # 
 # Run 'sh clamav.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -132,8 +134,7 @@
 # Set initial variables:
 
 PRGNAM=clamav
-VERSION=${VERSION:-"0.95.3"}
-ARCH=${ARCH:-"i486"}
+VERSION=${VERSION:-"0.96"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -152,13 +153,6 @@ TMP=${TMP:-"/tmp/build"}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-"/tmp"}
 
-# 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}
-
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
@@ -173,18 +167,39 @@ else
   MOPT=cpu
 fi
 
+# 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 -m${MOPT}=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
+
 # Prepare a sane build environment:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
@@ -351,12 +366,7 @@ DOCS="AUTHORS BUGS COPYING* ChangeLog FAQ INSTALL NEWS README UPGRADE \
       README.slackware"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cat $SRCDIR/$(basename $0) | sed \
-  -e "/^ISOCC=/s/:-.*}/:-$ISOCC}/" \
-  -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 {} \;
 
@@ -385,3 +395,6 @@ md5sum $PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.tgz > $PRGNAM-$VERSION-$ARCH-${BUIL
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.txt
 
+# Restore the original umask:
+umask ${_UMASK_}
+