Updated

1 files changed, 20 insertions, 25 deletions

diff --git a/clamav/build/clamav.SlackBuild b/clamav/build/clamav.SlackBuild
index 2568bd01..33efffe8 100755
--- a/clamav/build/clamav.SlackBuild
+++ b/clamav/build/clamav.SlackBuild
@@ -60,6 +60,9 @@
 #              root is not that of the running machine (using chroot).
 # 0.88.7-1:  13/dec/2006 by Eric Hameleers
 #            * Rew release.
+# 0.90-1:    14/feb/2007 by Eric Hameleers
+#            * Rew release. Since clamav's .conf files changed quite a bit,
+#              I had to re-do the .patch files.
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -71,7 +74,7 @@
 # Set initial variables:
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.88.7}
+VERSION=${VERSION:-0.90}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
@@ -184,18 +187,8 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-cd $PKG
-
-# Explode the package framework:
-if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
-  explodepkg $SRCDIR/_$PRGNAM.tar.gz
-fi
-
 cd $TMP/tmp-$PRGNAM
 
-
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xzvf $SOURCE
 
@@ -223,19 +216,19 @@ CFLAGS="$SLKCFLAGS" \
             --sysconfdir=/etc \
             --mandir=/usr/man \
             --with-user=${CLAMUSR} --with-group=${CLAMGRP} \
-            --enable-id-check \
             --with-dbdir=/usr/share/clamav \
             --with-libcurl \
             --with-tcpwrappers \
             --enable-milter \
             --enable-id-check \
+            --disable-static \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-(cd etc
- patch < $SRCDIR/clamav.conf.patch 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
- patch < $SRCDIR/freshclam.conf.patch 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-)
+cd etc
+patch < $SRCDIR/clamd.conf.patch 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+patch < $SRCDIR/freshclam.conf.patch 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+cd -
 
 #
 # Install all the needed stuff to the package dir
@@ -248,10 +241,10 @@ else
 fi
 
 # Prepare the config files:
-(cd $PKG/etc
- mv clamd.conf clamd.conf.new
- mv freshclam.conf freshclam.conf.new
-)
+cd $PKG/etc
+mv clamd.conf clamd.conf.new
+mv freshclam.conf freshclam.conf.new
+cd -
 
 # Where to store the pid file:
 mkdir -p $PKG/var/run/clamav
@@ -339,10 +332,10 @@ chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 # Strip binaries
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+cd $PKG
+find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd -
 
 
 # --- OWNERSHIP, RIGHTS ---
@@ -364,7 +357,9 @@ fi
 # Build the package:
 cd $PKG
 makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
-(cd $OUTPUT && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5)
+cd $OUTPUT
+md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5
+cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txt