network/amavisd-new: Updated for version 2.13.1.

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

9 files changed, 54 insertions, 56 deletions

diff --git a/network/amavisd-new/README.patches b/network/amavisd-new/README.patches
deleted file mode 100644
index c8ad0e6e809df..0000000000000
--- a/network/amavisd-new/README.patches
+++ /dev/null
@@ -1,5 +0,0 @@
-README.patches
-
-3/12/2019 - Applied DKIM outbound signing patch mentioned here:
-https://gitlab.com/amavis/amavis/merge_requests/1
-
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
diff --git a/network/amavisd-new/amavisd-new.info b/network/amavisd-new/amavisd-new.info
index 07f59a6ad7162..ca994b6965b57 100644
--- a/network/amavisd-new/amavisd-new.info
+++ b/network/amavisd-new/amavisd-new.info
@@ -1,8 +1,8 @@
 PRGNAM="amavisd-new"
-VERSION="2.11.1"
+VERSION="2.13.1"
 HOMEPAGE="https://www.ijs.si/software/amavisd/"
-DOWNLOAD="https://www.ijs.si/software/amavisd/amavisd-new-2.11.1.tar.bz2"
-MD5SUM="f89fc043c790e35137121e45f2890703"
+DOWNLOAD="https://gitlab.com/amavis/amavis/-/archive/v2.13.1/amavis-v2.13.1-cdd11b069e20a4cb99960614ca9c3eb385d4e200.tar.bz2"
+MD5SUM="8ccffe7190bce8ec81b52e84be5f8fed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/amavisd-new/patches/amavis-mc.patch b/network/amavisd-new/patches/amavis-mc.patch
index a610b73987615..c88aece49c27d 100644
--- a/network/amavisd-new/patches/amavis-mc.patch
+++ b/network/amavisd-new/patches/amavis-mc.patch
@@ -1,16 +1,16 @@
 --- amavis-mc.orig	2016-04-26 22:59:10.509555481 -0500
 +++ amavis-mc	2016-04-26 23:01:52.834846414 -0500
-@@ -70,10 +70,10 @@
+@@ -73,10 +73,10 @@
  
  ### USER CONFIGURABLE:
  
--$daemon_user  = 'vscan';
--$daemon_group = 'vscan';
-+$daemon_user  = 'amavis';
-+$daemon_group = 'amavis';
+-$daemon_user   = 'vscan';
+-@daemon_groups = 'vscan';
++$daemon_user   = 'amavis';
++@daemon_groups = 'amavis';
  
 -$pid_file = '/var/amavis/amavis-mc.pid';
-+$pid_file = '/var/run/amavis/amavis-mc.pid';
++$pid_file = '/run/amavis/amavis-mc.pid';
  
  $log_level = 0;
  $syslog_ident = 'amavis-mc';
diff --git a/network/amavisd-new/patches/amavisd-release.patch b/network/amavisd-new/patches/amavisd-release.patch
index 7a7cba7805db4..62837085974ff 100644
--- a/network/amavisd-new/patches/amavisd-release.patch
+++ b/network/amavisd-new/patches/amavisd-release.patch
@@ -5,7 +5,7 @@
  # $socketname = '127.0.0.1:9998';
  # $socketname = '[::1]:9998';
 -  $socketname = '/var/amavis/amavisd.sock';
-+  $socketname = '/var/run/amavis/amavisd.sock';
++  $socketname = '/run/amavis/amavisd.sock';
  
  ### END OF USER CONFIGURABLE
  }
diff --git a/network/amavisd-new/patches/amavisd-signer.patch b/network/amavisd-new/patches/amavisd-signer.patch
index 54da1748a0a72..22a57e75f17f0 100644
--- a/network/amavisd-new/patches/amavisd-signer.patch
+++ b/network/amavisd-new/patches/amavisd-signer.patch
@@ -1,13 +1,13 @@
 --- amavisd-signer.orig	2016-04-26 23:00:03.028973260 -0500
 +++ amavisd-signer	2016-04-26 23:05:54.207764264 -0500
-@@ -86,11 +86,11 @@
+@@ -88,11 +88,11 @@
  # Please adjust the following settings as necessary:
  #
  
--$daemon_user  = 'vscan';
--$daemon_group = 'vscan';
-+$daemon_user  = 'amavis';
-+$daemon_group = 'amavis';
+-$daemon_user   = 'vscan';
+-@daemon_groups = 'vscan';
++$daemon_user   = 'amavis';
++@daemon_groups = 'amavis';
  # $daemon_chroot_dir = '/var/amavis';   # chroot directory or undef
  
 -# $daemonize = 1;
diff --git a/network/amavisd-new/patches/amavisd-submit.patch b/network/amavisd-new/patches/amavisd-submit.patch
index 8d3a4fd26fb22..7da9441cc91bf 100644
--- a/network/amavisd-new/patches/amavisd-submit.patch
+++ b/network/amavisd-new/patches/amavisd-submit.patch
@@ -8,7 +8,7 @@
 +  $tempbase = '/var/lib/amavis/tmp';  # where to create a temp directory with a msg
  
 -  $socketname = '/var/amavis/amavisd.sock';
-+  $socketname = '/var/run/amavis/amavisd.sock';
++  $socketname = '/run/amavis/amavisd.sock';
  # $socketname = '127.0.0.1:9998';
  # $socketname = '[::1]:9998';
  
diff --git a/network/amavisd-new/patches/outbound_dkim_signing_fix.patch b/network/amavisd-new/patches/outbound_dkim_signing_fix.patch
deleted file mode 100644
index 77c991fb314b9..0000000000000
--- a/network/amavisd-new/patches/outbound_dkim_signing_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- amavisd	2018-10-09 07:41:10.000000000 -0500
-+++ amavisd.new	2019-03-12 11:20:03.926164315 -0500
-@@ -22814,6 +22814,7 @@
-         }
-         # load policy banks from the 'client_ipaddr_policy' lookup
-         Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl;
-+	$msginfo->originating(c('originating'));
- 
-         $msginfo->client_addr($cl_ip);      # ADDR
-         $msginfo->client_port($cl_port);    # PORT
-@@ -34357,6 +34358,7 @@
-     $sig_ind++;
-   }
-   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
-+  $msginfo->originating(c('originating'));
-   $msginfo->dkim_signatures_valid(\@signatures_valid)  if @signatures_valid;
- # if (ll(5) && $sig_ind > 0) {
- #   # show which header fields are covered by which signature
diff --git a/network/amavisd-new/rc.amavisd-new b/network/amavisd-new/rc.amavisd-new
index 24b6610c8ffb6..8156a8782d465 100644
--- a/network/amavisd-new/rc.amavisd-new
+++ b/network/amavisd-new/rc.amavisd-new
@@ -20,8 +20,8 @@
 # /etc/rc.d/rc.amavisd-new start
 
 
-MC_PID=/var/run/amavis/amavis-mc.pid
-PID=/var/run/amavis/amavisd.pid
+MC_PID=/run/amavis/amavis-mc.pid
+PID=/run/amavis/amavisd.pid
 AMAVIS_USER=@AMAVIS_USER@
 AMAVIS_GROUP=@AMAVIS_GROUP@