- Update to 4.62.9

- for details please refer to the PR

PR:		ports/115907
Submitted by:	maintainer (Jan-Peter Koopmann)

6 files changed, 14 insertions, 79 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index a167a2b85fea..4425f222c113 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.61.7
+PORTVERSION=	4.62.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -51,7 +51,7 @@ OPTIONS=	SPAMASSASSIN "Install SpamAssassin" on \
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
-PATCHLEVEL=	1
+PATCHLEVEL=	3
 
 USE_PERL5=	yes
 
@@ -125,7 +125,7 @@ USE_RC_SUBR=	mailscanner mta
 SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 post-extract:
-	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
+	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}-${PATCHLEVEL}/* .
 
 do-build:
 	${PERL} -pi -e \
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index dc0e36269056..300059ad9e5d 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.61.7-1.tar.gz) = 62b4af78e735a1708bb30bdbd6a0c908
-SHA256 (MailScanner-install-4.61.7-1.tar.gz) = 1917f06684a5ba26302224f0d786911ec248384cb5c4c607965bd0ad9541d837
-SIZE (MailScanner-install-4.61.7-1.tar.gz) = 7712590
+MD5 (MailScanner-install-4.62.9-3.tar.gz) = f5c23f38a6d7bcb70d2820c126ce4c1a
+SHA256 (MailScanner-install-4.62.9-3.tar.gz) = 5ff091c432585ba313eb2d10c457cd22093de188043112259c0adfd22117945f
+SIZE (MailScanner-install-4.62.9-3.tar.gz) = 7741491
diff --git a/mail/mailscanner/files/CHANGES.port b/mail/mailscanner/files/CHANGES.port
index c0bc32c64d36..a8e8d0f0696f 100644
--- a/mail/mailscanner/files/CHANGES.port
+++ b/mail/mailscanner/files/CHANGES.port
@@ -1,3 +1,10 @@
+Version 4.62.9
+==============
+- Upgrade to 4.62.9
+- update_spamassassin and update_spamassassin.cron are untouched again. I
+  currently do not have enough time to get this running the FreeBSD way.
+  Patches are welcome.
+
 Version 4.61.7
 ==============
 - Upgrade to 4.61.7
diff --git a/mail/mailscanner/files/patch-bin-cron-update_spamassassin.cron b/mail/mailscanner/files/patch-bin-cron-update_spamassassin.cron
deleted file mode 100644
index 1433c570ff18..000000000000
--- a/mail/mailscanner/files/patch-bin-cron-update_spamassassin.cron
+++ /dev/null
@@ -1,42 +0,0 @@
---- ../MailScanner-install-4.61.7.orig/bin/cron/update_spamassassin.cron	Mon Jul  2 12:34:52 2007
-+++ bin/cron/update_spamassassin.cron	Mon Jul  2 12:50:12 2007
-@@ -11,23 +11,28 @@
-   exit;
- fi
- 
--# Insert a random delay up to this value, to spread virus updates round
--# the clock. 1800 seconds = 30 minutes.
--# Set this to 0 to disable it.
--UPDATEMAXDELAY=3600
-+# Add the following line to /etc/rc.conf to configure a maximum delay in
-+# order to spread spamassassin updates round the clock. 1800 seconds = 30 minutes.
-+# Set this to 0 to disable it
-+
-+. %%RC_SUBR%%
-+
-+name="mailscanner"
-+rcvar=`set_rcvar`
-+
-+load_rc_config $name
-+
-+: ${mailscanner_sa_updatemaxdelay="3600"}
-+
- SAUPDATE=/opt/MailScanner/bin/update_spamassassin
--if [ -f /etc/sysconfig/MailScanner ] ; then
--        . /etc/sysconfig/MailScanner
--fi
--export UPDATEMAXDELAY
- export SAUPDATE
- 
- [ -x $SAUPDATE ] || exit 0
--if [ "x$UPDATEMAXDELAY" = "x0" ]; then
-+if [ "x${mailscanner_sa_updatemaxdelay}" = "x0" ]; then
-   :
- else
--  logger -p mail.info -t update_spamassassin Delaying cron job up to $UPDATEMAXDELAY seconds
--  perl -e "sleep int(rand($UPDATEMAXDELAY));"
-+  logger -p mail.info -t update_spamassassin Delaying cron job up to ${mailscanner_sa_updatemaxdelay} seconds
-+  perl -e "sleep int(rand(${mailscanner_sa_updatemaxdelay}));"
- fi
- exec $SAUPDATE
- exit 0
diff --git a/mail/mailscanner/files/patch-bin-update_spamassassin b/mail/mailscanner/files/patch-bin-update_spamassassin
deleted file mode 100644
index 4c9424ca7c85..000000000000
--- a/mail/mailscanner/files/patch-bin-update_spamassassin
+++ /dev/null
@@ -1,31 +0,0 @@
---- ../MailScanner-install-4.61.7.orig/bin/update_spamassassin	Mon Jul  2 12:34:52 2007
-+++ bin/update_spamassassin	Mon Jul  2 12:53:22 2007
-@@ -14,26 +14,17 @@
-   exit;
- fi
- 
--# Insert a random delay up to this value, to spread virus updates round
--# the clock. 1800 seconds = 30 minutes.
--# Set this to 0 to disable it.
--UPDATEMAXDELAY=3600
- SAUPDATE=/usr/bin/sa-update
- SACOMPILE=/usr/bin/sa-compile
- if [ -f /etc/sysconfig/MailScanner ] ; then
-         . /etc/sysconfig/MailScanner
- fi
--export UPDATEMAXDELAY
- export SAUPDATE
- export SACOMPILE
- 
- [ -x $SAUPDATE ] || exit 0
--if [ "x$UPDATEMAXDELAY" = "x0" ]; then
--  :
--else
--  logger -p mail.info -t sa-update Delaying cron job up to $UPDATEMAXDELAY seconds
--  perl -e "sleep int(rand($UPDATEMAXDELAY));"
--fi
-+logger -p mail.info -t sa-update Delaying cron job up to $UPDATEMAXDELAY seconds
-+perl -e "sleep int(rand($UPDATEMAXDELAY));"
- 
- # Update SpamAssassin rules
- $SAUPDATE
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 5ea53d92705a..bb16f5495022 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -17,6 +17,7 @@ lib/MailScanner/MailScanner/BinHex.pm
 lib/MailScanner/MailScanner/Config.pm
 lib/MailScanner/MailScanner/ConfigDefs.pl
 lib/MailScanner/MailScanner/CustomConfig.pm
+lib/MailScanner/MailScanner/CustomFunctions/CustomAction.pm
 lib/MailScanner/MailScanner/CustomFunctions/GenericSpamScanner.pm
 lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
 lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm