Update to 0.95.2

1 files changed, 22 insertions, 21 deletions

diff --git a/clamav/build/clamav.SlackBuild b/clamav/build/clamav.SlackBuild
index 15ca4d38..cef04c34 100755
--- a/clamav/build/clamav.SlackBuild
+++ b/clamav/build/clamav.SlackBuild
@@ -1,5 +1,6 @@
 #!/bin/sh
 # $Id$
+
 # Copyright 2006-2009  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
@@ -117,6 +118,8 @@
 #            * New release.
 # 0.95.1-1:  17/apr/2009 by Eric Hameleers
 #            * New release.
+# 0.95.2-1:  11/jun/2009 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 .
@@ -127,7 +130,7 @@
 # Set initial variables:
 
 PRGNAM=clamav
-VERSION=${VERSION:-"0.95.1"}
+VERSION=${VERSION:-"0.95.2"}
 ARCH=${ARCH:-"i486"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -181,9 +184,6 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
 esac
 
 # Prepare a sane build environment:
@@ -245,21 +245,22 @@ echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --mandir=/usr/man \
-            --with-user=${CLAMUSR} --with-group=${CLAMGRP} \
-            --with-dbdir=/usr/share/clamav \
-            --disable-milter \
-            --enable-id-check \
-            --disable-check \
-            --disable-static \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-            # deprecated:
-            #--with-libcurl --with-tcpwrappers \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --with-user=${CLAMUSR} --with-group=${CLAMGRP} \
+  --with-dbdir=/usr/share/clamav \
+  --disable-milter \
+  --enable-id-check \
+  --disable-check \
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  # deprecated:
+  #--with-libcurl --with-tcpwrappers \
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 cd etc
@@ -326,7 +327,7 @@ chroot . <<EOR 2>/dev/null
 /usr/sbin/groupadd ${CLAMGRP} 2> /dev/null
 # Add the '${CLAMUSR}' user if it doesn't already exist:
 /usr/sbin/useradd -c "ClamAV user"  \\
-        -g ${CLAMGRP} -s "/bin/false" ${CLAMUSR} 2> /dev/null
+  -g ${CLAMGRP} -s "/bin/false" ${CLAMUSR} 2> /dev/null
 
 # Restore the correct permissions
 chown ${CLAMUSR} usr/sbin/clamav-milter
@@ -374,7 +375,7 @@ chown -R root:root $PKG
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+/sbin/makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
 md5sum $PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.tgz > $PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.tgz.md5
 cd -