- Update to 4.75.11

PR:		ports/131518
Submitted by:	Kevin Kobb <kkobb@skylinecorp.com>
Approved by:	maintainer timeout on older patch in the PR

5 files changed, 48 insertions, 42 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 21867804fc10..36dd276d5202 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.67.6
-PORTREVISION=	4
+PORTVERSION=	4.75.11
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -39,7 +38,8 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate \
 	${SITE_PERL}/${PERL_ARCH}/Filesys/Df.pm:${PORTSDIR}/sysutils/p5-Filesys-Df \
 	${SITE_PERL}/Sys/Hostname/Long.pm:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-	${SITE_PERL}/${PERL_ARCH}/IO/Handle.pm:${PORTSDIR}/devel/p5-IO
+	${SITE_PERL}/${PERL_ARCH}/IO/Handle.pm:${PORTSDIR}/devel/p5-IO \
+	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite
 
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		bash:${PORTSDIR}/shells/bash \
@@ -112,7 +112,7 @@ ETC_FILES=	MailScanner.conf filename.rules.conf \
 		phishing.bad.sites.conf \
 		country.domains.conf
 MCP_FILES=	mcp.spam.assassin.prefs.conf \
-		10_example.cf
+		10_example.cf v320.pre
 USRLOCAL_FILES_LIB=	\
 		bitdefender-autoupdate f-prot-autoupdate \
 		f-secure-wrapper inoculan-autoupdate \
@@ -129,9 +129,13 @@ post-extract:
 do-build:
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
-		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
+		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \
 		${WRKSRC}/bin/MailScanner
 	${PERL} -pi -e \
+		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g;' \
+		${WRKSRC}/bin/mailscanner_create_locks
+	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
@@ -140,14 +144,17 @@ do-build:
 		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
 		s,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g; \
 		s,/bin/gunzip,/usr/bin/gunzip,g; \
-		s,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g;' \
+		s,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g; \
+		s,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g; \
+		s,/usr/local/share/clamav,/var/db/clamav,g;' \
 		${WRKSRC}/etc/MailScanner.conf
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
 		s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
-		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
+		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \
 		${WRKSRC}/bin/update_virus_scanners
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
@@ -179,11 +186,11 @@ do-build:
 		${WRKSRC}/bin/cron/update_spamassassin.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
-                s,/etc/init.d/MailScanner,${LOCALBASE}/etc/rc.d/mailscanner,g; \
+		s,/etc/init.d/MailScanner,${LOCALBASE}/etc/rc.d/mailscanner,g; \
 		s,/etc/mail/,${LOCALBASE}/etc/mail/,g; \
 		s,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g; \
 		s,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g;' \
-                ${WRKSRC}/bin/update_spamassassin
+		${WRKSRC}/bin/update_spamassassin
 	${PERL} -pi -e \
 		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \
 		${WRKSRC}/bin/clean.SA.cache
@@ -232,6 +239,8 @@ do-install:
 		${PREFIX}/libexec/MailScanner/clean.SA.cache
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/clean.quarantine \
 		${PREFIX}/libexec/MailScanner/clean.quarantine
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/mailscanner_create_locks \
+		${PREFIX}/libexec/MailScanner/mailscanner_create_locks
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_phishing_sites \
 		${PREFIX}/libexec/MailScanner/update_phishing_sites
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_sites \
@@ -262,6 +271,10 @@ do-install:
 		${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/rules/bounce.rules \
+		${PREFIX}/etc/MailScanner/rules/bounce.rules.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/rules/max.message.size.rules \
+		${PREFIX}/etc/MailScanner/rules/max.message.size.rules.sample
 	${MKDIR} ${PREFIX}/etc/MailScanner/mcp
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner/mcp
 .for FILE in ${MCP_FILES}
@@ -377,11 +390,21 @@ initial-config: renew-wrapper renew-autoupdate renew-reports
 		${PREFIX}/etc/MailScanner
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
+	${INSTALL_DATA} ${WRKSRC}/etc/rules/bounce.rules \
+		${PREFIX}/etc/MailScanner/rules/bounce.rules
+	${INSTALL_DATA} ${WRKSRC}/etc/rules/max.message.size.rules \
+		${PREFIX}/etc/MailScanner/rules/max.message.size.rules
+.for FILE in ${MCP_FILES}
+	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
+		${PREFIX}/etc/MailScanner/mcp/${FILE}
+.endfor
 	@${ECHO} "******************************************************************************"
 	@${ECHO} "The provided default configuration requires several directories to be created:"
 	@${ECHO} "/var/spool/MailScanner/incoming"
+	@${ECHO} "/var/spool/MailScanner/incoming/Locks"
 	@${ECHO} "/var/spool/MailScanner/quarantine"
 	@${ECHO} "/var/spool/mqueue"
+	@${ECHO} "/var/spool/mqueue.in"
 	@${ECHO} "Either create those directories or change the configuration."
 	@${ECHO} "******************************************************************************"
 
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 018c92c62580..bfd4629198fb 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-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
+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
diff --git a/mail/mailscanner/files/CHANGES.port b/mail/mailscanner/files/CHANGES.port
index fda66bfdb1da..19871223abdc 100644
--- a/mail/mailscanner/files/CHANGES.port
+++ b/mail/mailscanner/files/CHANGES.port
@@ -1,3 +1,7 @@
+Version 4.75.11
+===============
+- Upgrade to 4.75.11
+
 Version 4.67.6
 ==============
 - Upgrade to 4.67.6
diff --git a/mail/mailscanner/files/patch-lib-clamav-wrapper b/mail/mailscanner/files/patch-lib-clamav-wrapper
index 834da1acea73..058f57976b17 100644
--- a/mail/mailscanner/files/patch-lib-clamav-wrapper
+++ b/mail/mailscanner/files/patch-lib-clamav-wrapper
@@ -1,5 +1,5 @@
---- ../MailScanner-install-4.58.9.orig/lib/clamav-wrapper	Fri Mar 30 11:55:30 2007
-+++ lib/clamav-wrapper	Fri Mar 30 11:55:54 2007
+--- ./lib/clamav-wrapper.orig	2009-03-27 09:07:39.000000000 -0400
++++ ./lib/clamav-wrapper	2009-03-27 09:08:46.000000000 -0400
 @@ -51,6 +51,9 @@
  
  # You may want to check this script for bash-isms
@@ -10,31 +10,3 @@
  TempDir="/tmp/clamav.$$"
  ClamUser="clamav"
  ClamGroup="clamav"
-@@ -98,23 +101,19 @@
- # LESS COMMON unpackers, which probably aren't installed by default
- # (hence disabled)
- # Uncomment ONE of the following lines if you have unrar installed
--#ExtraScanOptions="$ExtraScanOptions --unrar"  
-+ExtraScanOptions="$ExtraScanOptions --unrar"  
- #ExtraScanOptions="$ExtraScanOptions --unrar=/path/to/unrar" 
- 
- # Uncomment ONE of the following lines if you have unarj installed
--#ExtraScanOptions="$ExtraScanOptions --unarj"  
-+ExtraScanOptions="$ExtraScanOptions --arj"  
- #ExtraScanOptions="$ExtraScanOptions --unarj=/path/to/unarj" 
- 
--# Uncomment ONE of the following lines if you have unace installed
--#ExtraScanOptions="$ExtraScanOptions --unace"  
--#ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace" 
--
- # Uncomment ONE of the following lines if you have lha installed
--#ExtraScanOptions="$ExtraScanOptions --lha"  
-+ExtraScanOptions="$ExtraScanOptions --lha"  
- #ExtraScanOptions="$ExtraScanOptions --lha=/path/to/lha" 
- 
- # Uncomment ONE of the following lines if you have zoo installed
--#ExtraScanOptions="$ExtraScanOptions --zoo"  
-+ExtraScanOptions="$ExtraScanOptions --unzoo"  
- #ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo" 
- 
- # Now increase the allowed expansion size of zip files
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index d3f811289e1e..14eff5f28220 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -5,8 +5,11 @@ etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
 etc/MailScanner/mcp/10_example.cf.sample
 etc/MailScanner/mcp/mcp.spam.assassin.prefs.conf.sample
+etc/MailScanner/mcp/v320.pre.sample
 etc/MailScanner/rules/EXAMPLES
 etc/MailScanner/rules/README
+etc/MailScanner/rules/bounce.rules.sample
+etc/MailScanner/rules/max.message.size.rules.sample
 etc/MailScanner/rules/spam.whitelist.rules.sample
 etc/MailScanner/phishing.bad.sites.conf.sample
 etc/MailScanner/phishing.safe.sites.conf.sample
@@ -14,6 +17,7 @@ etc/MailScanner/spam.assassin.prefs.conf.sample
 etc/MailScanner/spam.lists.conf.sample
 etc/MailScanner/virus.scanners.conf.sample
 lib/MailScanner/MailScanner.pm
+lib/MailScanner/MailScanner/Antiword.pm
 lib/MailScanner/MailScanner/BinHex.pm
 lib/MailScanner/MailScanner/Config.pm
 lib/MailScanner/MailScanner/ConfigDefs.pl
@@ -57,6 +61,7 @@ lib/MailScanner/MailScanner/ZMailer.pm
 libexec/MailScanner/analyse_SpamAssassin_cache
 libexec/MailScanner/clean.SA.cache
 libexec/MailScanner/clean.quarantine
+libexec/MailScanner/mailscanner_create_locks
 libexec/MailScanner/update_phishing_sites
 libexec/MailScanner/update_bad_phishing_sites
 libexec/MailScanner/update_bad_phishing_sites.cron
@@ -114,6 +119,8 @@ libexec/MailScanner/symscanengine-autoupdate.sample
 libexec/MailScanner/symscanengine-wrapper.sample
 libexec/MailScanner/trend-autoupdate.sample
 libexec/MailScanner/trend-wrapper.sample
+libexec/MailScanner/vba32-autoupdate.sample
+libexec/MailScanner/vba32-wrapper.sample
 libexec/MailScanner/vexira-autoupdate.sample
 libexec/MailScanner/vexira-wrapper.sample
 sbin/mailscanner