Update for new release; also reworked the SlackBuild script for Slackware 11

1 files changed, 127 insertions, 56 deletions

diff --git a/clamav/build/clamav.SlackBuild b/clamav/build/clamav.SlackBuild
index fddc57f3..64aa7048 100755
--- a/clamav/build/clamav.SlackBuild
+++ b/clamav/build/clamav.SlackBuild
@@ -1,6 +1,5 @@
 #!/bin/sh
 # Copyright (c) 2006 Eric Hameleers <alien@sox.homeip.net>
-# Distributed under the terms of the GNU General Public License, Version 2
 # $Id$
 # -----------------------------------------------------------------------------
 # Slackware SlackBuild script 
@@ -51,6 +50,8 @@
 #              DATAROOTDIR, explicitly configure the mandir.
 # 0.88.4-1:  10/aug/2006 by Eric Hameleers
 #            * Rebuilt for the new release.
+# 0.88.5-1:  18/oct/2006 by Eric Hameleers
+#            * Rebuilt for the new release.
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -60,37 +61,110 @@
 
 # --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=clamav
-VERSION=0.88.4
+VERSION=${VERSION:-0.88.5}
 ARCH=${ARCH:-i486}
-BUILD=1
+BUILD=${BUILD:-1}
 
 # Read "README.slackware" for compatibility with amavisd-new
 CLAMUSR=clamav
 CLAMGRP=clamav
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-fi
+# Where do we look for sources?
+CWD=`pwd`
+SRCDIR=`dirname $0`
+[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
 
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+SOURCE="${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
+
+##
+## --- with a little luck, you won't have to edit below this point --- ##
+##
+
+# Slackware 11 and up need other option (gcc > 3.3.x)
+if [ `gcc -dumpversion | tr -d  '.' |cut -c 1-2` -gt 33 ]; then
+  MOPT=tune
+else
+  MOPT=cpu
+fi
+
+case "$ARCH" in
+  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  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
 
 if [ ! -d $TMP/tmp-$PRGNAM ]; then
   mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+elif [ "$P1" != "--oldbuild" ]; then
+  # If the "--oldbuild" parameter is present, we keep
+  #  the old build files and continue;
+  # By default we remove the remnants of previous build and continue:
+  rm -rf $TMP/tmp-$PRGNAM/*
 fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
+
+if [ "$PKG" = "" -o "$PKG" = "/" ] ; then
+  echo "Please provide a sane value for the variable 'PKG'."
+  exit 1
+elif [ ! -d $PKG ]; then
+  mkdir -p $PKG  # place for the package to be built
+else
+  rm -rf $PKG/*  # We always erase old package's contents:
+fi
+
+if [ ! -d $OUTPUT ]; then
+  mkdir -p $OUTPUT  # place for the package to be saved
+fi
+
+# --- SOURCE FILE AVAILABILITY ---
+
+if ! [ -f ${SRCDIR}/${SOURCE} ]; then
+  if ! [ "x${SRCURL}" == "x" ]; then
+    echo "Source '${SOURCE}' not available yet... will download now:"
+    wget -nv -O "${SRCDIR}/${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 ]; then
+      echo "Downloading '${SOURCE}' failed... aborting the build."
+      mv -f "${SRCDIR}/${SOURCE}" "${SRCDIR}/${SOURCE}".FAIL
+      exit 1
+    fi
+  else
+    echo "File '${SOURCE}' not available... aborting the build."
+    exit 1
+  fi
+fi
+
+if [ "$P1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
 fi
 
 
@@ -100,13 +174,11 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-rm -rf $PKG/*
-
 cd $PKG
 
 # Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
+if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
+  explodepkg $SRCDIR/_$PRGNAM.tar.gz
 fi
 
 cd $TMP/tmp-$PRGNAM
@@ -114,11 +186,10 @@ cd $TMP/tmp-$PRGNAM
 
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
-echo "Extracting the program tarball for $PRGNAM..."
-tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
+echo "Extracting the source archive(s) for $PRGNAM..."
+tar -xzvf $SRCDIR/${PRGNAM}-${VERSION}.tar.gz
 
 cd ${PRGNAM}-${VERSION}
-
 chown -R root.root *
 
 
@@ -134,8 +205,10 @@ echo Building ...
 /usr/sbin/useradd -c "ClamAV user" -g ${CLAMGRP} \
    -s "/bin/false" ${CLAMUSR} 2> /dev/null
 
+LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
             --mandir=/usr/man \
@@ -146,12 +219,12 @@ CFLAGS="$SLKCFLAGS" \
             --with-tcpwrappers \
             --enable-milter \
             --enable-id-check \
-            2>&1 | tee $CWD/configure-${PRGNAM}.log
-make 2>&1 | tee $CWD/make-${PRGNAM}.log
+            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 (cd etc
- patch < $CWD/clamav.conf.patch 2>&1 | tee $CWD/patch-${PRGNAM}.log
- patch < $CWD/freshclam.conf.patch 2>&1 | tee -a $CWD/patch-${PRGNAM}.log
+ 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
 )
 
 #
@@ -160,9 +233,9 @@ make 2>&1 | tee $CWD/make-${PRGNAM}.log
 # Use installwatch if available:
 which installwatch > /dev/null 2>&1
 if [ $? == 0 ]; then
-  installwatch -o $CWD/install-${PRGNAM}.log make DESTDIR=$PKG install
+  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
-  make DESTDIR=$PKG install 2>&1 |tee $CWD/install-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
 # Prepare the config files:
@@ -176,7 +249,7 @@ mkdir -p $PKG/var/run/clamav
 
 # Our rc script:
 mkdir -p $PKG/etc/rc.d/
-cp $CWD/rc.clamav $PKG/etc/rc.d/rc.clamav.new
+cp $SRCDIR/rc.clamav $PKG/etc/rc.d/rc.clamav.new
 chown root:root $PKG/etc/rc.d/rc.clamav.new
 chmod 754 $PKG/etc/rc.d/rc.clamav.new
 
@@ -210,9 +283,9 @@ config etc/rc.d/rc.clamav.new
 
 # Add the '${CLAMGRP}' group if it doesn't already exist:
 # Actually, the use of "amavis" group is for compatibility with amavisd-new.
-/usr/sbin/groupadd ${CLAMGRP} 2> /dev/null
+chroot . /usr/sbin/groupadd ${CLAMGRP} 2> /dev/null
 # Add the '${CLAMUSR}' user if it doesn't already exist:
-/usr/sbin/useradd -c "ClamAV user"  \\
+chroot . /usr/sbin/useradd -c "ClamAV user"  \\
         -g ${CLAMGRP} -s "/bin/false" ${CLAMUSR} 2> /dev/null
 
 # Create log files
@@ -220,16 +293,16 @@ touch var/log/clamd.log
 touch var/log/freshclam.log
 
 # Restore the correct permissions
-/usr/bin/chown ${CLAMUSR} usr/sbin/clamav-milter
-/usr/bin/chmod 4700 usr/sbin/clamav-milter
-/usr/bin/chown -R ${CLAMUSR}:${CLAMGRP} var/run/clamav
-/usr/bin/chmod 771 var/run/clamav
-/usr/bin/chown ${CLAMUSR}:${CLAMGRP} var/log/clamd.log
-/usr/bin/chmod 660 var/log/clamd.log
-/usr/bin/chown ${CLAMUSR}:${CLAMGRP} var/log/freshclam.log
-/usr/bin/chmod 660 var/log/freshclam.log
-/usr/bin/chown -R ${CLAMUSR}:${CLAMGRP} usr/share/clamav
-/usr/bin/chmod -R 770 usr/share/clamav
+chown ${CLAMUSR} usr/sbin/clamav-milter
+chmod 4700 usr/sbin/clamav-milter
+chown -R ${CLAMUSR}:${CLAMGRP} var/run/clamav
+chmod 771 var/run/clamav
+chown ${CLAMUSR}:${CLAMGRP} var/log/clamd.log
+chmod 660 var/log/clamd.log
+chown ${CLAMUSR}:${CLAMGRP} var/log/freshclam.log
+chmod 660 var/log/freshclam.log
+chown -R ${CLAMUSR}:${CLAMGRP} usr/share/clamav
+chmod -R 770 usr/share/clamav
 
 EOINS
 
@@ -238,7 +311,7 @@ EOINS
 
 # --- DOCUMENTATION ---
 
-cp $CWD/00README.slackware README.slackware
+cp $SRCDIR/00README.slackware README.slackware
 cp -a clamav-milter/INSTALL INSTALL.milter
 DOCS="AUTHORS BUGS COPYING ChangeLog FAQ INSTALL NEWS README TODO \
       docs/*.pdf docs/html examples \
@@ -246,12 +319,11 @@ DOCS="AUTHORS BUGS COPYING ChangeLog FAQ INSTALL NEWS README TODO \
       README.slackware"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Compress the man page(s)
-gzip -9f $PKG/usr/man/*/*
+[ -d $PKG/usr/man ] && find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 # Strip binaries
 ( cd $PKG
@@ -268,9 +340,9 @@ chmod -R o-w $PKG
 # --- PACKAGE DESCRIPTION ---
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
 
 
@@ -278,16 +350,15 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $TMP && md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5)
-cat $CWD/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt
+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)
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txt
 
 
 # --- CLEANUP ---
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi