- Update to 4.78.9

PR:		ports/137747
Submitted by:	Mike Jakubik <mikej@rogers.com>
Approved by:	maintainer timeout
Feature safe:	yes

4 files changed, 26 insertions, 4 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 36dd276d5202..ef18d78b2589 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.75.11
+PORTVERSION=	4.78.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -106,6 +106,7 @@ RUN_DEPENDS+=	bdc:${PORTSDIR}/security/bdc
 
 DOC_FILES=	INSTALL.FreeBSD INSTALL.OpenBSD README
 ETC_FILES=	MailScanner.conf filename.rules.conf \
+		archives.filename.rules.conf archives.filetype.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf \
 		phishing.safe.sites.conf \
@@ -164,6 +165,10 @@ do-build:
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		${WRKSRC}/bin/update_bad_phishing_emails
+	${PERL} -pi -e \
+		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/bin/update_phishing_sites
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
@@ -241,6 +246,8 @@ do-install:
 		${PREFIX}/libexec/MailScanner/clean.quarantine
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mailscanner_create_locks \
 		${PREFIX}/libexec/MailScanner/mailscanner_create_locks
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_emails \
+		${PREFIX}/libexec/MailScanner/update_bad_phishing_emails
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_phishing_sites \
 		${PREFIX}/libexec/MailScanner/update_phishing_sites
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_sites \
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index bfd4629198fb..a89b2d780ff7 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.75.11-1.tar.gz) = d380ffefc721980cf6753e2e8a9b0575
-SHA256 (MailScanner-install-4.75.11-1.tar.gz) = 18c79d1170d68091bc82e48037440dd9db7881ad93dfb7643d588166257816f2
-SIZE (MailScanner-install-4.75.11-1.tar.gz) = 8429830
+MD5 (MailScanner-install-4.78.9-1.tar.gz) = 264b1b7cbb37117aced6f450d48a03d7
+SHA256 (MailScanner-install-4.78.9-1.tar.gz) = c389948605544d418c1a022d4a179430464840e5597ef13a4c11d1c7819ea0db
+SIZE (MailScanner-install-4.78.9-1.tar.gz) = 9111014
diff --git a/mail/mailscanner/files/pkg-message.in b/mail/mailscanner/files/pkg-message.in
index 1a6f8229db45..59fea1df8f11 100644
--- a/mail/mailscanner/files/pkg-message.in
+++ b/mail/mailscanner/files/pkg-message.in
@@ -41,4 +41,13 @@
 	Please also always look at the port changelog at
 	%%PREFIX%%/share/doc/MailScanner/CHANGES.port
 
+       ************************************************************
+       Some users have reported problems with this port and a
+       previously upgraded port of perl (5.8.8 > 5.8.9). Please
+       ensure you are taking the correct steps when upgrading perl
+       as described in /usr/ports/UPDATING. If you are still
+       having problems, many people have had success by upgrading
+       to perl 5.10 instead.
+       ************************************************************
+
 *************************************************************************
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 14eff5f28220..44e6f96d3da6 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -1,4 +1,6 @@
 @comment $FreeBSD$
+etc/MailScanner/archives.filename.rules.conf.sample
+etc/MailScanner/archives.filetype.rules.conf.sample
 etc/MailScanner/country.domains.conf.sample
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
@@ -32,7 +34,9 @@ lib/MailScanner/MailScanner/CustomFunctions/LastSpam.pm
 lib/MailScanner/MailScanner/CustomFunctions/Ruleset-from-Function.pm
 lib/MailScanner/MailScanner/Exim.pm
 lib/MailScanner/MailScanner/EximDiskStore.pm
+lib/MailScanner/MailScanner/FileInto.pm
 lib/MailScanner/MailScanner/GenericSpam.pm
+lib/MailScanner/MailScanner/LinksDump.pm
 lib/MailScanner/MailScanner/Lock.pm
 lib/MailScanner/MailScanner/Log.pm
 lib/MailScanner/MailScanner/MCP.pm
@@ -55,6 +59,7 @@ lib/MailScanner/MailScanner/SweepOther.pm
 lib/MailScanner/MailScanner/SweepViruses.pm
 lib/MailScanner/MailScanner/SystemDefs.pm
 lib/MailScanner/MailScanner/TNEF.pm
+lib/MailScanner/MailScanner/Unzip.pm
 lib/MailScanner/MailScanner/WorkArea.pm
 lib/MailScanner/MailScanner/ZMDiskStore.pm
 lib/MailScanner/MailScanner/ZMailer.pm
@@ -62,6 +67,7 @@ libexec/MailScanner/analyse_SpamAssassin_cache
 libexec/MailScanner/clean.SA.cache
 libexec/MailScanner/clean.quarantine
 libexec/MailScanner/mailscanner_create_locks
+libexec/MailScanner/update_bad_phishing_emails
 libexec/MailScanner/update_phishing_sites
 libexec/MailScanner/update_bad_phishing_sites
 libexec/MailScanner/update_bad_phishing_sites.cron