network/amavisd-new: Updated for version 2.13.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 36 insertions, 15 deletions

diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index 6045f9c994c38..22349ee09f6bf 100644
--- a/network/amavisd-new/amavisd-new.SlackBuild
+++ b/network/amavisd-new/amavisd-new.SlackBuild
@@ -28,15 +28,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="amavisd-new"
-VERSION=${VERSION:-2.11.1}
+VERSION=${VERSION:-2.13.1}
 ARCH="noarch"
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
+SRCNAM="amavis"
+GITVER="cdd11b069e20a4cb99960614ca9c3eb385d4e200"
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -71,14 +70,15 @@ AMAVIS_GROUP=${AMAVIS_GROUP:-amavis}
 AMAVIS_HOME=${AMAVIS_HOME:-/var/lib/amavis}
 QUARANTINE_DIR=${QUARANTINE_DIR:-$AMAVIS_HOME/quarantine}
 
-DOCS="AAAREADME.first INSTALL TODO amavisd*.conf* LDAP*
-  RELEASE_NOTES LICENSE README_FILES test-messages"
+DOCS="AAAREADME.first TODO conf/amavisd*.conf* contrib/LDAP*
+  RELEASE_NOTES LICENSE README_FILES t/messages README.md
+  CONTRIBUTING.md"
 
-rm -fr $TMP/$PRGNAM-$VERSION $PKG
+rm -fr $TMP/${SRCNAM}-v${VERSION}-${GITVER} $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $TMP/$PRGNAM-$VERSION
+tar xvf ${CWD}/${SRCNAM}-v${VERSION}-${GITVER}.tar.?z*
+cd $TMP/${SRCNAM}-v${VERSION}-${GITVER}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -87,9 +87,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # apply patches
+pushd bin
 for i in $CWD/patches/*.patch; do
   patch -p0 < $i
 done
+popd
 
 ### amavisd-new home directory
 mkdir -p $PKG/$AMAVIS_HOME/{tmp,var,db,home}
@@ -101,15 +103,34 @@ mkdir -p $PKG/$AMAVIS_HOME/{tmp,var,db,home}
 ### in amavisd config file
 mkdir -p $PKG/$QUARANTINE_DIR/{clean,spam,banned,badh,virus,archive}
 
+mkdir -p ${PKG}/usr/share/perl5/vendor_perl/{Mail/SpamAssassin/Logger,Amavis/{DB,LDAP,DKIM,Out/{SMTP,SQL},SpamControl,Unpackers,In/Message,IO,Lookup,MIME/Body}}
+
 mkdir -p $PKG/usr/{sbin,doc/$PRGNAM-$VERSION}
-install -m 0755 -D amavisd $PKG/usr/sbin/$PRGNAM
+install -m 0755 -D bin/amavisd $PKG/usr/sbin/$PRGNAM
 ( cd $PKG/usr/sbin; ln -sf $PRGNAM amavisd )
 
-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 \
+install -m 0755 bin/amavis-mc bin/amavis-services bin/amavisd-agent \
+  bin/amavisd-nanny bin/amavisd-release bin/amavisd-signer bin/amavisd-snmp-subagent \
+  bin/amavisd-snmp-subagent-zmq bin/amavisd-status bin/amavisd-submit contrib/p0f-analyzer.pl \
   $PKG/usr/sbin
-install -m 0640 -D amavisd.conf $PKG/etc/amavisd.conf.new
+install -m 0640 -D conf/amavisd.conf $PKG/etc/amavisd.conf.new
+
+install -m 0444 lib/Amavis.pm					${PKG}/usr/share/perl5/vendor_perl/Amavis.pm
+install -m 0444 lib/Mail/SpamAssassin/Logger/Amavislog.pm	${PKG}/usr/share/perl5/vendor_perl/Mail/SpamAssassin/Logger/Amavislog.pm
+install -m 0444 lib/Amavis/*.pm					${PKG}/usr/share/perl5/vendor_perl/Amavis
+install -m 0444 lib/Amavis/DB/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/DB
+install -m 0444 lib/Amavis/LDAP/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/LDAP
+install -m 0444 lib/Amavis/DKIM/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/DKIM
+install -m 0444 lib/Amavis/Out/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/Out
+install -m 0444 lib/Amavis/Out/SMTP/*.pm			${PKG}/usr/share/perl5/vendor_perl/Amavis/Out/SMTP
+install -m 0444 lib/Amavis/Out/SQL/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/Out/SQL
+install -m 0444 lib/Amavis/SpamControl/*.pm			${PKG}/usr/share/perl5/vendor_perl/Amavis/SpamControl
+install -m 0444 lib/Amavis/Unpackers/*.pm			${PKG}/usr/share/perl5/vendor_perl/Amavis/Unpackers
+install -m 0444 lib/Amavis/In/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/In
+install -m 0444 lib/Amavis/In/Message/*.pm			${PKG}/usr/share/perl5/vendor_perl/Amavis/In/Message
+install -m 0444 lib/Amavis/IO/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/IO
+install -m 0444 lib/Amavis/Lookup/*.pm				${PKG}/usr/share/perl5/vendor_perl/Amavis/Lookup
+install -m 0444 lib/Amavis/MIME/Body/*.pm			${PKG}/usr/share/perl5/vendor_perl/Amavis/MIME/Body
 
 # change permissions
 chown $AMAVIS_USER:$AMAVIS_GROUP $PKG/etc/amavisd.conf.new