- Sync with mail/mailscanner which was newer

6 files changed, 135 insertions, 97 deletions

diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index 39790e1e5525..785d44585359 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.60.5
-PORTREVISION=	6
+PORTVERSION=	4.79.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
-PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	pgollucci@FreeBSD.org
@@ -33,20 +31,20 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 	${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
-RUN_DEPENDS=	${BUILD_DEPENDS} \
+	${SITE_PERL}/Sys/Hostname/Long.pm:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
+	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite
+
+RUN_DEPENDS+=	${BUILD_DEPENDS} \
 		bash:${PORTSDIR}/shells/bash \
 		tnef:${PORTSDIR}/converters/tnef \
 		wget:${PORTSDIR}/ftp/wget
 
-IGNORE=	Use mail/mailscanner instead
-
 OPTIONS=	SPAMASSASSIN "Install SpamAssassin" on \
 		CLAMAV "Install ClamAV" on \
 		CLAMAVMODULE "Install ClamAV Module" off \
 		BDC "Install BitDefender" off
 
-CONFLICTS=	MailScanner-[0-9]*
+CONFLICTS=	MailScanner-devel-[0-9]*
 
 PATCHLEVEL=	1
 
@@ -101,12 +99,14 @@ 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 \
+		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 \
@@ -117,14 +117,22 @@ USRLOCAL_FILES_LIB=	\
 USE_RC_SUBR=	mailscanner mta
 
 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 \
 		'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/bin,${PREFIX}/libexec/MailScanner,g; \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		${WRKSRC}/bin/processing_messages_alert
+	${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; \
@@ -133,14 +141,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; \
@@ -150,19 +161,40 @@ 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; \
+		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%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_phishing_sites.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
-		s,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g; \
+		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
+		s,%%RC_SUBR%%,/etc/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%%,/etc/rc.subr,g;' \
-		${WRKSRC}/bin/cron/sa-update.cron
+		${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/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
 	${PERL} -pi -e \
-		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \
+		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g; \
+		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \
 		${WRKSRC}/bin/clean.SA.cache
 	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
@@ -209,16 +241,30 @@ 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/processing_messages_alert \
+		${PREFIX}/libexec/MailScanner/processing_messages_alert
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/Quick.Peek \
+		${PREFIX}/libexec/MailScanner/Quick.Peek
+	${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 \
+		${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 \
 		${PREFIX}/libexec/MailScanner/update_virus_scanners.cron
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/cron/sa-update.cron \
-		${PREFIX}/libexec/MailScanner/sa-update.cron
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_spamassassin \
+		${PREFIX}/libexec/MailScanner/update_spamassassin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/cron/update_spamassassin.cron \
+		${PREFIX}/libexec/MailScanner/update_spamassassin.cron
 	#
 	# Step 3: Install etc files
 	#
@@ -233,12 +279,19 @@ 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}
 	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
 		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
 .endfor
+	${MKDIR} ${PREFIX}/etc/MailScanner/conf.d
+	${INSTALL_DATA} ${WRKSRC}/etc/conf.d/README \
+		${PREFIX}/etc/MailScanner/conf.d/README
 	#
 	# Step 4: Install files in share
 	#
@@ -347,11 +400,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-devel/distinfo b/mail/mailscanner-devel/distinfo
index d4a87e92323c..8fc30ee444d8 100644
--- a/mail/mailscanner-devel/distinfo
+++ b/mail/mailscanner-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.60.5-1.tar.gz) = cf1e87131f90ff7f43e1f4c1d787a245
-SHA256 (MailScanner-install-4.60.5-1.tar.gz) = 1ec3fd536e05f5da0b1551cc57664bb4379e049e8243e0ed112e33325c53b994
-SIZE (MailScanner-install-4.60.5-1.tar.gz) = 7704758
+MD5 (MailScanner-install-4.79.10-1.tar.gz) = 85aada093503e1b8f4b3350f46aa4ad7
+SHA256 (MailScanner-install-4.79.10-1.tar.gz) = bb7715d3d2d73b5f33849f6c9addf3480d7c6f345d70065cf80dfd663fbe8645
+SIZE (MailScanner-install-4.79.10-1.tar.gz) = 9116976
diff --git a/mail/mailscanner-devel/files/patch-bin-cron-sa-update.cron b/mail/mailscanner-devel/files/patch-bin-cron-sa-update.cron
deleted file mode 100644
index 7370a7effc24..000000000000
--- a/mail/mailscanner-devel/files/patch-bin-cron-sa-update.cron
+++ /dev/null
@@ -1,41 +0,0 @@
---- ../MailScanner-install-4.53.7.orig/bin/cron/sa-update.cron	Thu May  4 07:40:53 2006
-+++ bin/cron/sa-update.cron	Thu May  4 07:42:12 2006
-@@ -1,22 +1,27 @@
- #!/bin/bash
- 
--# 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 virus updates round the clock. 1800 seconds = 30 minutes.
-+# Set this to 0 to disable it
-+
-+. /etc/rc.subr
-+
-+name="mailscanner"
-+rcvar=`set_rcvar`
-+
-+load_rc_config $name
-+
-+: ${mailscanner_updatemaxdelay="600"}
-+
- SAUPDATE=/usr/bin/sa-update
--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_updatemaxdelay}" = "x0" ]; then
-   :
- else
--  logger -p mail.info -t sa-update Delaying cron job up to $UPDATEMAXDELAY seconds
--  perl -e "sleep int(rand($UPDATEMAXDELAY));"
-+  logger -p mail.info -t sa-update Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
-+  perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
- fi
- exec $SAUPDATE
- exit 0
diff --git a/mail/mailscanner-devel/files/patch-lib-clamav-wrapper b/mail/mailscanner-devel/files/patch-lib-clamav-wrapper
index 834da1acea73..058f57976b17 100644
--- a/mail/mailscanner-devel/files/patch-lib-clamav-wrapper
+++ b/mail/mailscanner-devel/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-devel/files/pkg-message.in b/mail/mailscanner-devel/files/pkg-message.in
index 1a6f8229db45..54730653fc61 100644
--- a/mail/mailscanner-devel/files/pkg-message.in
+++ b/mail/mailscanner-devel/files/pkg-message.in
@@ -38,7 +38,27 @@
 	Sophos users: Please take a look at the Sophos install
 	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd
 
-	Please also always look at the port changelog at
-	%%PREFIX%%/share/doc/MailScanner/CHANGES.port
+	*****************************************************************
+	A new optional rc variable called mailscanner_user has been added
+	to the startup script. This is a temporary workaround to address
+	any possible taint mode problems that may still be present in the
+	code.
+	
+	Taint mode related problems can usually be identified from
+	undeliverable reports containing the following error:
+	
+	"MailScanner: Message attempted to kill MailScanner"
+
+	If you changed the "Run As User" variable in MailScanner.conf
+	and wish to disable taint mode, you MUST also set the same value
+	in /etc/rc.conf.
+
+	i.e. mailscanner_user="postfix"
+
+	To re-enable taint mode, simply remove the variable from rc.conf.
+	
+	The new variable uses su to start the master perl script as the
+	specified user, this effectively disables perl's taint mode.
+	*****************************************************************
 
 *************************************************************************
diff --git a/mail/mailscanner-devel/pkg-plist b/mail/mailscanner-devel/pkg-plist
index 1a63932c14db..ccb54b049d4f 100644
--- a/mail/mailscanner-devel/pkg-plist
+++ b/mail/mailscanner-devel/pkg-plist
@@ -1,22 +1,31 @@
 @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
 etc/MailScanner/filetype.rules.conf.sample
+etc/MailScanner/conf.d/README
 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
 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
 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
@@ -26,7 +35,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
@@ -49,18 +60,25 @@ 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
-lib/MailScanner/MailScanner/notes.txt
 libexec/MailScanner/analyse_SpamAssassin_cache
 libexec/MailScanner/clean.SA.cache
 libexec/MailScanner/clean.quarantine
+libexec/MailScanner/mailscanner_create_locks
+libexec/MailScanner/processing_messages_alert
+libexec/MailScanner/Quick.Peek
+libexec/MailScanner/update_bad_phishing_emails
 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
-libexec/MailScanner/sa-update.cron
+libexec/MailScanner/update_spamassassin
+libexec/MailScanner/update_spamassassin.cron
 libexec/MailScanner/antivir-autoupdate.sample
 libexec/MailScanner/antivir-wrapper.sample
 libexec/MailScanner/avast-wrapper.sample
@@ -72,15 +90,18 @@ libexec/MailScanner/bitdefender-autoupdate.sample
 libexec/MailScanner/bitdefender-wrapper.sample
 libexec/MailScanner/clamav-autoupdate.sample
 libexec/MailScanner/clamav-wrapper.sample
-libexec/MailScanner/clamd-wrapper.sample
 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
 libexec/MailScanner/f-prot-wrapper.sample
+libexec/MailScanner/f-prot-6-wrapper.sample
+libexec/MailScanner/f-prot-6-autoupdate.sample
 libexec/MailScanner/f-secure-autoupdate.sample
 libexec/MailScanner/f-secure-wrapper.sample
 libexec/MailScanner/generic-autoupdate.sample
@@ -107,6 +128,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
@@ -547,6 +570,7 @@ sbin/MailScanner
 @dirrm lib/MailScanner/MailScanner/CustomFunctions
 @dirrm lib/MailScanner/MailScanner
 @dirrm lib/MailScanner
+@dirrm etc/MailScanner/conf.d
 @dirrm etc/MailScanner/mcp
 @dirrm etc/MailScanner/rules
 @dirrm etc/MailScanner