network/amavisd-new: Updated for version 2.11.0.

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

11 files changed, 31 insertions, 43 deletions

diff --git a/network/amavisd-new/README.SBo b/network/amavisd-new/README.SBo
index b662fa0ca677..787cf8b3a643 100644
--- a/network/amavisd-new/README.SBo
+++ b/network/amavisd-new/README.SBo
@@ -3,7 +3,7 @@ via spamd).  Amavisd-new calls spamassassin internally to scan messages.  You ca
 also install clamav and enable virus scanning in the configuration file.
 
 RUNTIME DEPENDENCIES:
-ZeroMQ library -- since amavisd-new version > 2.8.x depends heavily on ZeroMQ.
+ZeroMQ library -- since amavisd-new version > 2.8.x, depends heavily on ZeroMQ.
 
 DEPENDENCIES:
 
@@ -66,9 +66,11 @@ Script and package changes introduced in version >= 2.6.6
    notes are in the rc script.
    
 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
+1. Create amavis user/group, before running the script.  You don't have to follow
+uid/gid strictly.  This is just an example, you may as well use any other uid/gid
+combination.
+   groupadd -g 211 amavis
+   useradd -d -m /var/lib/amavis -s /bin/bash -u 211 -g 211 amavis
 
 2. Make sure you have write perms for amavis group to amavis home (in this
    case, /var/lib/amavis)
diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index 8d4b49f6d149..c85afb8aeded 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-2014, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2016, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="amavisd-new"
-VERSION=${VERSION:-2.10.1}
+VERSION=${VERSION:-2.11.0}
 ARCH="noarch"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,24 +38,10 @@ 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"
-  echo "    # groupadd -g 225 amavis"
+  echo "    # groupadd -g 211 amavis"
   echo "  Or something similar."
   echo "  Add amavis user to clamav group and set AllowSupplementaryGroups yes"
   echo "  in fresclam.conf to allow amavis to scan incoming messages"
@@ -64,7 +50,7 @@ fi
 
 if ! grep -q ^amavis: /etc/passwd ; then
   echo "  Please add a dedicated user to run amavisd-new"
-  echo "    # useradd -d /var/lib/amavis -s /bin/bash -u 225 -g 225 amavis"
+  echo "    # useradd -d /var/lib/amavis -s /bin/bash -u 211 -g 211 amavis"
   echo "  Or something similar."
   exit 1
 fi
diff --git a/network/amavisd-new/amavisd-new.info b/network/amavisd-new/amavisd-new.info
index 5cd0c4b16a74..49db7fc661bf 100644
--- a/network/amavisd-new/amavisd-new.info
+++ b/network/amavisd-new/amavisd-new.info
@@ -1,8 +1,8 @@
 PRGNAM="amavisd-new"
-VERSION="2.10.1"
+VERSION="2.11.0"
 HOMEPAGE="http://www.ijs.si/software/amavisd/"
-DOWNLOAD="http://www.ijs.si/software/amavisd/amavisd-new-2.10.1.tar.xz"
-MD5SUM="adb0c64ac6a91249ddeb4ed97747d755"
+DOWNLOAD="https://www.ijs.si/software/amavisd/amavisd-new-2.11.0.tar.xz"
+MD5SUM="4642d63c5d3f0daafbcacb9bb553e6f3"
 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 ee6958d903fc..a610b7398761 100644
--- a/network/amavisd-new/patches/amavis-mc.patch
+++ b/network/amavisd-new/patches/amavis-mc.patch
@@ -1,5 +1,5 @@
---- amavis-mc.orig	2014-11-08 20:40:11.560673812 -0600
-+++ amavis-mc	2014-11-08 20:41:17.561010101 -0600
+--- 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 @@
  
  ### USER CONFIGURABLE:
diff --git a/network/amavisd-new/patches/amavis-services.patch b/network/amavisd-new/patches/amavis-services.patch
index 1c71da09b05a..0fcbf3fbbcac 100644
--- a/network/amavisd-new/patches/amavis-services.patch
+++ b/network/amavisd-new/patches/amavis-services.patch
@@ -1,5 +1,5 @@
---- amavis-services.orig	2014-11-08 20:45:03.199992749 -0600
-+++ amavis-services	2014-11-08 20:45:51.805711423 -0600
+--- amavis-services.orig	2016-04-26 22:59:18.437618553 -0500
++++ amavis-services	2016-04-26 23:02:46.479272826 -0500
 @@ -71,7 +71,7 @@
  $syslog_facility = LOG_MAIL;
  $syslog_ident = $myproduct_name;
diff --git a/network/amavisd-new/patches/amavisd-agent.patch b/network/amavisd-new/patches/amavisd-agent.patch
index d56723cfb2d3..81e37849ce3c 100644
--- a/network/amavisd-new/patches/amavisd-agent.patch
+++ b/network/amavisd-new/patches/amavisd-agent.patch
@@ -1,5 +1,5 @@
---- amavisd-agent.orig	2014-11-08 20:48:15.953806621 -0600
-+++ amavisd-agent	2014-11-08 20:48:21.655008087 -0600
+--- amavisd-agent.orig	2016-04-26 22:59:27.573691233 -0500
++++ amavisd-agent	2016-04-26 23:03:34.388653565 -0500
 @@ -53,7 +53,7 @@
  
  my($dbfile) = 'snmp.db';
diff --git a/network/amavisd-new/patches/amavisd-nanny.patch b/network/amavisd-new/patches/amavisd-nanny.patch
index 245c32bec316..6fbbd35617b5 100644
--- a/network/amavisd-new/patches/amavisd-nanny.patch
+++ b/network/amavisd-new/patches/amavisd-nanny.patch
@@ -1,5 +1,5 @@
---- amavisd-nanny.orig	2014-11-08 20:50:59.129571221 -0600
-+++ amavisd-nanny	2014-11-08 20:51:20.573328532 -0600
+--- amavisd-nanny.orig	2016-04-26 22:59:42.227807804 -0500
++++ amavisd-nanny	2016-04-26 23:04:19.361010891 -0500
 @@ -61,7 +61,7 @@
  
  my($dbfile) = 'nanny.db';
diff --git a/network/amavisd-new/patches/amavisd-release.patch b/network/amavisd-new/patches/amavisd-release.patch
index 55cc609de725..7a7cba7805db 100644
--- a/network/amavisd-new/patches/amavisd-release.patch
+++ b/network/amavisd-new/patches/amavisd-release.patch
@@ -1,9 +1,9 @@
---- amavisd-release.orig	2014-11-08 20:52:13.295190231 -0600
-+++ amavisd-release	2014-11-08 20:52:29.313755808 -0600
-@@ -86,7 +86,7 @@
- 
+--- amavisd-release.orig	2016-04-26 22:59:53.924900846 -0500
++++ amavisd-release	2016-04-26 23:04:48.577242990 -0500
+@@ -87,7 +87,7 @@
    $log_level = 1;
  # $socketname = '127.0.0.1:9998';
+ # $socketname = '[::1]:9998';
 -  $socketname = '/var/amavis/amavisd.sock';
 +  $socketname = '/var/run/amavis/amavisd.sock';
  
diff --git a/network/amavisd-new/patches/amavisd-signer.patch b/network/amavisd-new/patches/amavisd-signer.patch
index e1c17266c4ba..54da1748a0a7 100644
--- a/network/amavisd-new/patches/amavisd-signer.patch
+++ b/network/amavisd-new/patches/amavisd-signer.patch
@@ -1,5 +1,5 @@
---- amavisd-signer.orig	2014-11-08 21:02:36.183683393 -0600
-+++ amavisd-signer	2014-11-08 21:04:50.079221328 -0600
+--- 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 @@
  # Please adjust the following settings as necessary:
  #
diff --git a/network/amavisd-new/patches/amavisd-snmp-subagent.patch b/network/amavisd-new/patches/amavisd-snmp-subagent.patch
index 344108b9b3ff..059972fbbd59 100644
--- a/network/amavisd-new/patches/amavisd-snmp-subagent.patch
+++ b/network/amavisd-new/patches/amavisd-snmp-subagent.patch
@@ -1,5 +1,5 @@
---- amavisd-snmp-subagent.orig	2014-11-08 20:58:13.439786270 -0600
-+++ amavisd-snmp-subagent	2014-11-08 21:01:24.141242836 -0600
+--- amavisd-snmp-subagent.orig	2016-04-26 23:00:28.965179539 -0500
++++ amavisd-snmp-subagent	2016-04-26 23:06:18.384956256 -0500
 @@ -69,7 +69,7 @@
  $syslog_facility = LOG_MAIL;
  
diff --git a/network/amavisd-new/patches/amavisd-submit.patch b/network/amavisd-new/patches/amavisd-submit.patch
index 9362191cb2a5..8d3a4fd26fb2 100644
--- a/network/amavisd-new/patches/amavisd-submit.patch
+++ b/network/amavisd-new/patches/amavisd-submit.patch
@@ -1,5 +1,5 @@
---- amavisd-submit.orig	2014-11-08 20:54:37.766290064 -0600
-+++ amavisd-submit	2014-11-08 20:55:19.205752430 -0600
+--- amavisd-submit.orig	2016-04-26 23:00:45.365309961 -0500
++++ amavisd-submit	2016-04-26 23:08:17.303900313 -0500
 @@ -72,9 +72,9 @@
  ### USER CONFIGURABLE: