- Update to 4.67.6

Submitted by:	maintainer via private mail

4 files changed, 28 insertions, 5 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 1c3f43fe4397..9a1147986f92 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.64.3
+PORTVERSION=	4.67.6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -107,6 +107,7 @@ ETC_FILES=	MailScanner.conf filename.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf \
 		phishing.safe.sites.conf \
+		phishing.bad.sites.conf \
 		country.domains.conf
 MCP_FILES=	mcp.spam.assassin.prefs.conf \
 		10_example.cf
@@ -157,6 +158,10 @@ do-build:
 		${WRKSRC}/bin/update_phishing_sites
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		${WRKSRC}/bin/update_bad_phishing_sites
+	${PERL} -pi -e \
+		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
 		s,%%RC_SUBR%%,${RC_SUBR},g;' \
 		${WRKSRC}/bin/cron/update_phishing_sites.cron
@@ -164,6 +169,11 @@ do-build:
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
 		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		${WRKSRC}/bin/cron/update_bad_phishing_sites.cron
+	${PERL} -pi -e \
+		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
+		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
+		s,%%RC_SUBR%%,${RC_SUBR},g;' \
 		${WRKSRC}/bin/cron/update_spamassassin.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
@@ -222,8 +232,12 @@ do-install:
 		${PREFIX}/libexec/MailScanner/clean.quarantine
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_phishing_sites \
 		${PREFIX}/libexec/MailScanner/update_phishing_sites
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_sites \
+		${PREFIX}/libexec/MailScanner/update_bad_phishing_sites
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cron/update_phishing_sites.cron \
 		${PREFIX}/libexec/MailScanner/update_phishing_sites.cron
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/cron/update_bad_phishing_sites.cron \
+		${PREFIX}/libexec/MailScanner/update_bad_phishing_sites.cron
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
 		${PREFIX}/libexec/MailScanner/update_virus_scanners
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cron/update_virus_scanners.cron \
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 72ec1e357f17..018c92c62580 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.64.3-1.tar.gz) = 3ecdfc649248edca2519a17a350c4236
-SHA256 (MailScanner-install-4.64.3-1.tar.gz) = 5edc7487a9459764388dd6caf20ef301d504fe6257534b77c8848ba1dc9565dd
-SIZE (MailScanner-install-4.64.3-1.tar.gz) = 7827983
+MD5 (MailScanner-install-4.67.6-1.tar.gz) = 62b47805e462ffd97f32a06922b7b61b
+SHA256 (MailScanner-install-4.67.6-1.tar.gz) = e0c803a6c3b243aa19b7e6bbac009617c02a308bc394eb64615e2148ac5d72e1
+SIZE (MailScanner-install-4.67.6-1.tar.gz) = 8128173
diff --git a/mail/mailscanner/files/CHANGES.port b/mail/mailscanner/files/CHANGES.port
index e44202153691..fda66bfdb1da 100644
--- a/mail/mailscanner/files/CHANGES.port
+++ b/mail/mailscanner/files/CHANGES.port
@@ -1,3 +1,8 @@
+Version 4.67.6
+==============
+- Upgrade to 4.67.6
+- Now works with p5-Mail-Tools Version 2.x again
+
 Version 4.64.3
 ==============
 - Upgrade to 4.64.3
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 5adda87037f1..d3f811289e1e 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -8,6 +8,7 @@ etc/MailScanner/mcp/mcp.spam.assassin.prefs.conf.sample
 etc/MailScanner/rules/EXAMPLES
 etc/MailScanner/rules/README
 etc/MailScanner/rules/spam.whitelist.rules.sample
+etc/MailScanner/phishing.bad.sites.conf.sample
 etc/MailScanner/phishing.safe.sites.conf.sample
 etc/MailScanner/spam.assassin.prefs.conf.sample
 etc/MailScanner/spam.lists.conf.sample
@@ -53,11 +54,12 @@ lib/MailScanner/MailScanner/TNEF.pm
 lib/MailScanner/MailScanner/WorkArea.pm
 lib/MailScanner/MailScanner/ZMDiskStore.pm
 lib/MailScanner/MailScanner/ZMailer.pm
-lib/MailScanner/MailScanner/notes.txt
 libexec/MailScanner/analyse_SpamAssassin_cache
 libexec/MailScanner/clean.SA.cache
 libexec/MailScanner/clean.quarantine
 libexec/MailScanner/update_phishing_sites
+libexec/MailScanner/update_bad_phishing_sites
+libexec/MailScanner/update_bad_phishing_sites.cron
 libexec/MailScanner/update_phishing_sites.cron
 libexec/MailScanner/update_virus_scanners
 libexec/MailScanner/update_virus_scanners.cron
@@ -78,6 +80,8 @@ libexec/MailScanner/command-wrapper.sample
 libexec/MailScanner/css-autoupdate.sample
 libexec/MailScanner/css-wrapper.sample
 libexec/MailScanner/drweb-wrapper.sample
+libexec/MailScanner/esets-wrapper.sample
+libexec/MailScanner/esets-autoupdate.sample
 libexec/MailScanner/etrust-autoupdate.sample
 libexec/MailScanner/etrust-wrapper.sample
 libexec/MailScanner/f-prot-autoupdate.sample