1 files changed, 28 insertions, 8 deletions
diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index 2676af027f..7a8665d168 100644
--- a/network/amavisd-new/amavisd-new.SlackBuild
+++ b/network/amavisd-new/amavisd-new.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for amavisd-new
 # Home Page http://www.ijs.si/software/amavisd/
 
-# Copyright (c) 2009-2011, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2012, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 
@@ -26,11 +26,12 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="amavisd-new"
-VERSION=${VERSION:-2.6.6}
-ARCH="noarch"
+VERSION=${VERSION:-2.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+ARCH="noarch"
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -38,6 +39,20 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 # Create system user and group for amavisd-new
 if ! grep -q ^amavis: /etc/group ; then
   echo "  Please add a dedicated group to run amavisd-new"
@@ -64,11 +79,12 @@ QUARANTINE_DIR=${QUARANTINE_DIR:-$AMAVIS_HOME/quarantine}
 DOCS="AAAREADME.first INSTALL TODO amavisd*.conf* LDAP*
   RELEASE_NOTES LICENSE README_FILES test-messages"
 
-rm -fr $TMP/$PRGNAM-$VERSION $PKG
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -91,8 +107,11 @@ mkdir -p $PKG/$QUARANTINE_DIR/{clean,spam,banned,badh,virus}
 mkdir -p $PKG/usr/{sbin,doc/$PRGNAM-$VERSION}
 install -m 0755 -D amavisd $PKG/usr/sbin/$PRGNAM
 ( cd $PKG/usr/sbin; ln -sf $PRGNAM amavisd )
-install -m 0755 amavisd-agent amavisd-nanny amavisd-release \
-  amavisd-snmp-subagent p0f-analyzer.pl $PKG/usr/sbin
+
+patch -p0 < $CWD/amavisd-signer.patch
+
+install -m 0755 amavisd-agent amavisd-nanny amavisd-release amavisd-signer \
+  amavisd-snmp-subagent amavisd-submit p0f-analyzer.pl $PKG/usr/sbin
 install -m 0640 -D amavisd.conf $PKG/etc/amavisd.conf.new
 
 # change permissions
@@ -100,7 +119,8 @@ chown $USER:$GROUP $PKG/etc/amavisd.conf.new
 chown -R $USER:$GROUP $PKG/$AMAVIS_HOME $PKG/var/run/amavis $PKG/$QUARANTINE_DIR
 chmod -R 0770 $PKG/$AMAVIS_HOME $PKG/var/run/amavis $PKG/$QUARANTINE_DIR
 
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -r  $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+chmod -R +r  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ### install rc script