1 files changed, 22 insertions, 20 deletions
diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index e9edf2be1e81..8d4b49f6d149 100644
--- a/network/amavisd-new/amavisd-new.SlackBuild
+++ b/network/amavisd-new/amavisd-new.SlackBuild
@@ -3,8 +3,8 @@
 # Slackware Package Build Script for amavisd-new
 # Home Page http://www.ijs.si/software/amavisd/
 
-# Copyright (c) 2009-2012, Nishant Limbachia, Hoffman Estates, IL, USA
-# <nishant _AT_ mnspace _DOT_ net>
+# Copyright (c) 2009-2014, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -26,11 +26,10 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="amavisd-new"
-VERSION=${VERSION:-2.7.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
+VERSION=${VERSION:-2.10.1}
 ARCH="noarch"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -79,18 +78,22 @@ QUARANTINE_DIR=${QUARANTINE_DIR:-$AMAVIS_HOME/quarantine}
 DOCS="AAAREADME.first INSTALL TODO amavisd*.conf* LDAP*
   RELEASE_NOTES LICENSE README_FILES test-messages"
 
-rm -rf $PKG
+rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
+cd $TMP/$PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# apply patches
+for i in $CWD/patches/*.patch; do
+  patch -p0 < $i
+done
 
 ### amavisd-new home directory
 mkdir -p $PKG/$AMAVIS_HOME/{tmp,var,db,home}
@@ -102,16 +105,16 @@ mkdir -p $PKG/var/run/amavis
 ### your quarantine directory into different categories
 ### used by $(clean|banned_files|bad_header|spam|virus)_quarantine_method directive
 ### in amavisd config file
-mkdir -p $PKG/$QUARANTINE_DIR/{clean,spam,banned,badh,virus}
+mkdir -p $PKG/$QUARANTINE_DIR/{clean,spam,banned,badh,virus,archive}
 
 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 )
 
-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 0755 amavis-mc amavis-services amavisd-agent \
+  amavisd-nanny amavisd-release amavisd-signer amavisd-snmp-subagent \
+  amavisd-snmp-subagent-zmq amavisd-status amavisd-submit p0f-analyzer.pl \
+  $PKG/usr/sbin
 install -m 0640 -D amavisd.conf $PKG/etc/amavisd.conf.new
 
 # change permissions
@@ -119,8 +122,7 @@ 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 -r  $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R +r  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ### install rc script