4 files changed, 67 insertions, 33 deletions
diff --git a/network/amavisd-new/README.SBo b/network/amavisd-new/README.SBo
index 4b4620cf8e..3c6e95837d 100644
--- a/network/amavisd-new/README.SBo
+++ b/network/amavisd-new/README.SBo
@@ -1,24 +1,55 @@
+If you plan to run amavisd-new, you don't need to run spamassassin separately (usually
+via spamd).  Amavisd-new calls spamassassin internally to scan messages.  You can
+also install clamav and enable virus scanning in the configuration file.
+
 DEPENDENCIES:
 
-FOR SPAMASSASSIN (please install in this order): perl-Test-Pod,
-perl-Encode-Detect, perl-Image-Info, perl-TimeDate, perl-Test-Simple,
-perl-Net-libIDN, Net-SSLeay, perl-Socket6, perl-IO-Socket-SSL,
-perl-IO-Socket-INET6, perl-Crypt-OpenSSL-Bignum, perl-Crypt-OpenSSL-Random,
-perl-Crypt-OpenSSL-RSA, perl-DB-File, perl-DBI, perl-Digest-SHA,
-perl-Geography-Countries, perl-IP-Country, perl-IO, perl-URI, perl-digest-sha1,
-perl-digest-hmac, perl-html-tagset, perl-html-parser, perl-libnet, re2c,
-libwww-perl, perl-NetAddr-IP, perl-Net-Server, perl-Net-Ident, perl-MailTools,
-perl-net-ip, perl-net-dns, perl-Net-DNS-Resolver-Programmable, perl-Mail-SPF,
-perl-Mail-DKIM, spamassassin
-
-FOR AMAVISD-NEW (please install in this order): perl-Convert-TNEF,
-perl-Convert-UUlib, perl-Convert-BinHex, perl-Archive-Zip, perl-IO-stringy,
-perl-MIME-tools, perl-Unix-Syslog, perl-BerkeleyDB
+FOR SPAMASSASSIN (please install in this order):
+perl-Test-Pod
+perl-Encode-Detect
+perl-Image-Info
+perl-TimeDate
+perl-Net-libIDN
+Net-SSLeay
+perl-Socket6
+perl-IO-Socket-SSL
+perl-IO-Socket-INET6
+perl-Crypt-OpenSSL-Bignum
+perl-Crypt-OpenSSL-Random
+perl-Crypt-OpenSSL-RSA
+perl-Geography-Countries
+perl-IP-Country
+perl-digest-sha1
+perl-digest-hmac
+perl-html-tagset
+perl-html-parser
+re2c
+libwww-perl
+perl-NetAddr-IP
+perl-Net-Server
+perl-Net-Ident
+perl-MailTools
+perl-net-ip
+perl-net-dns
+perl-Net-DNS-Resolver-Programmable
+perl-Mail-SPF
+perl-Mail-DKIM
+spamassassin
+
+FOR AMAVISD-NEW (please install in this order):
+perl-Convert-TNEF
+perl-Convert-UUlib
+perl-Convert-BinHex
+perl-Archive-Zip
+perl-IO-stringy
+perl-MIME-tools
+perl-Unix-Syslog
+perl-BerkeleyDB
 
 SETUP:
 1. Create amavis user/group, before running the script.
-    groupadd -g 225 amavis
-    useradd -d -m /var/lib/amavis -s /bin/bash -u 225 -g 225 amavis
+   groupadd -g 225 amavis
+   useradd -d -m /var/lib/amavis -s /bin/bash -u 225 -g 225 amavis
 
 2. Make sure you have write perms for amavis group to amavis home (in this
    case, /var/lib/amavis)
@@ -36,3 +67,6 @@ SETUP:
 
 6. Edit /etc/amavisd.conf.  Verbose version of config file is included to
    aid in configuration.
+
+7. You can turn on debugging in log file with $sa_debug configuration
+   variable in /etc/amavisd.conf.
diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index a1d17f9725..130ac1c10d 100644..100755
--- a/network/amavisd-new/amavisd-new.SlackBuild
+++ b/network/amavisd-new/amavisd-new.SlackBuild
@@ -3,13 +3,13 @@
 # Slackware Package Build Script for amavisd-new
 # Home Page http://www.ijs.si/software/amavisd/
 
-# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant__AT__mnspace__DOT__net)
+# Copyright (c) 2009-2010, 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 
+# Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 
-# 1. Redistributions of script must retain the above copyright notice, 
+# 1. Redistributions of script must retain the above copyright notice,
 #    this list of conditions and the following disclaimer.
 
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -25,9 +25,9 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="amavisd-new"
-VERSION=2.6.4
+VERSION="2.6.4"
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 TMP=${TMP:-/tmp/SBo}
@@ -48,7 +48,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-# Create system user and group for policyd
+# 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"
   echo "    # groupadd -g 225 amavis"
@@ -71,7 +71,7 @@ GROUP=${GROUP:-amavis}
 AMAVIS_HOME=${AMAVIS_HOME:-/var/lib/amavis}
 QUARANTINE_DIR=${QUARANTINE_DIR:-$AMAVIS_HOME/quarantine}
 
-DOCS="RELEASE_NOTES LICENSE AAAREADME.first INSTALL TODO 
+DOCS="RELEASE_NOTES LICENSE AAAREADME.first INSTALL TODO
   amavisd*.conf LDAP* test-messages README_FILES"
 
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
@@ -79,7 +79,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $TMP/$PRGNAM-$VERSION
-chown -R root:root .
+chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
@@ -103,11 +103,10 @@ 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
-install -D amavisd.conf $PKG/etc/amavisd.conf.new
+install -m 0640 -D amavisd.conf $PKG/etc/amavisd.conf.new
 
 # change permissions
 chown $USER:$GROUP $PKG/etc/amavisd.conf.new
-chmod 0640 $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
 
diff --git a/network/amavisd-new/rc.amavisd b/network/amavisd-new/rc.amavisd
index 25dbf1dc2f..b30ddd9c26 100644
--- a/network/amavisd-new/rc.amavisd
+++ b/network/amavisd-new/rc.amavisd
@@ -1,11 +1,12 @@
 #!/bin/sh
-#
-# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA [nishant@mnspace.net]
-#
+
+# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA
+
 # /etc/rc.d/rc.amavisd
-# start|stop|restart|status amavisd for Postfix
-# 
+# start|stop|restart|status for amavisd-new
+
 # For automatic startup at boot, call this script from rc.local
+
 PIDFILE=/var/run/amavis/amavisd.pid
 
 amavisd_start() {
diff --git a/network/amavisd-new/slack-desc b/network/amavisd-new/slack-desc
index c8a031addc..200469cd79 100644
--- a/network/amavisd-new/slack-desc
+++ b/network/amavisd-new/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler-----------------------------------------------------|
-amavisd-new: amavisd-new (interface between mailer and content checkers)
+amavisd-new: amavisd-new (interface between postfix content filters)
 amavisd-new:
-amavisd-new: amavisd-new is a high-performance interface between mailer (MTA) 
+amavisd-new: amavisd-new is a high-performance interface between mailer (MTA)
 amavisd-new: and content checkers: virus scanners, and/or SpamAssassin.
 amavisd-new:
 amavisd-new: