[Lunar-commits] <moonbase> amavisd-new: updated to 2.6.4 Updated depends Fixed build Added post install to fix amavis not starting because of not updated SA

[Zbigniew Luszpinski]

commit 22126f603f77ffcdd44915fd91c6887f3e8dd9a2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Apr 26 20:45:34 2010 +0200

    amavisd-new: updated to 2.6.4
    Updated depends
    Fixed build
    Added post install to fix amavis not starting because of not updated SA
---
 mail/amavisd-new/BUILD        |    9 ++++-----
 mail/amavisd-new/DEPENDS      |   20 +++++++++++++-------
 mail/amavisd-new/DETAILS      |    7 +++----
 mail/amavisd-new/POST_INSTALL |    7 +++++++
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/mail/amavisd-new/BUILD b/mail/amavisd-new/BUILD
index 05c3cbc..c23aaba 100644
--- a/mail/amavisd-new/BUILD
+++ b/mail/amavisd-new/BUILD
@@ -1,18 +1,17 @@
 (
 
+  sedit "s@'vscan';@'amavis';@" amavisd.conf &&
   add_priv_user amavis:amavis -d /var/amavis -s /bin/true  &&
 
   prepare_install  &&
 
   install -m0755 amavisd /usr/sbin/  &&
 
-  if ! [ -d /var/amavis ] ; then
-      mkdir -m750 -p /var/amavis
-      chown amavis:amavis /var/amavis
-  fi  &&
+  mkdir -m750 -p /var/amavis/{tmp,db} &&
+  chown -R amavis:amavis /var/amavis &&
 
   if ! [ -e /etc/amavisd.conf ] ; then
     install -m0644 amavisd.conf /etc/
   fi
-   
+
 ) > $C_FIFO
diff --git a/mail/amavisd-new/DEPENDS b/mail/amavisd-new/DEPENDS
index 0b94dc9..08834e1 100644
--- a/mail/amavisd-new/DEPENDS
+++ b/mail/amavisd-new/DEPENDS
@@ -1,11 +1,17 @@
-depends  Unix-Syslog
-depends  MIME-tools
-depends  IO-stringy
+depends  file
+depends  Archive-Zip
+depends  Compress-Zlib
+depends  Compress-Raw-Zlib
 depends  Convert-TNEF
 depends  Convert-UUlib
-depends  Compress-Zlib
-depends  Archive-Tar
-depends  Archive-Zip
+depends  MIME-Base64
+depends  MIME-tools
 depends  Net-Server
- 
+depends  Digest-MD5
+depends  Time-HiRes
+depends  Unix-Syslog
+depends  BerkeleyDB
+depends  Mail-DKIM
+
 optional_depends "clamav" "" "" "for virus checking"
+optional_depends "spamassassin" "" "" "for doing spam scanning"
diff --git a/mail/amavisd-new/DETAILS b/mail/amavisd-new/DETAILS
index ffe3c0f..f3ba361 100644
--- a/mail/amavisd-new/DETAILS
+++ b/mail/amavisd-new/DETAILS
@@ -1,12 +1,11 @@
           MODULE=amavisd-new
-         VERSION=2.5.4
+         VERSION=2.6.4
           SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=http://www.ijs.si/software/amavisd
-      SOURCE_VFY=sha1:c63735594ecbc05850adf81bcd30e193eb873e38
+      SOURCE_VFY=sha1:993b7ca839ce038fd13f65351950f0ef03d99ff9
         WEB_SITE=http://www.ijs.si/software/amavisd
          ENTERED=20030315
-         UPDATED=20080314
+         UPDATED=20100425
            SHORT="interface between MTA (message transfer agent) and one or more content checkers: virus scanners, and/or SpamAssasin"
 
 cat << EOF
diff --git a/mail/amavisd-new/POST_INSTALL b/mail/amavisd-new/POST_INSTALL
new file mode 100644
index 0000000..99a210d
--- /dev/null
+++ b/mail/amavisd-new/POST_INSTALL
@@ -0,0 +1,7 @@
+  if [ -x `which sa-update` ] ; then
+    sa-check_spamd > /dev/null
+    STATUSSD=$?
+    [ $STATUSSD != '0' ] && service spamd start > /dev/null
+    sa-update && service spamd restart
+    [ $STATUSSD != '0' ] && service spamd stop > /dev/null
+  fi