Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Jun 2017 23:12:19 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r443125 - in head/mail/mailscanner: . files
Message-ID:  <201706102312.v5ANCJ5w031049@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Sat Jun 10 23:12:19 2017
New Revision: 443125
URL: https://svnweb.freebsd.org/changeset/ports/443125

Log:
  - Update to 5.0.3
  - Add many recommended Perl modules to dependencies
  - Remove DOCS option (there are no docs now)
  - Since there are no Sophos binaries, remove the Sophos.install.freebsd file
  - Simplify do-install - use COPYTREE_SHARE, COPYTREE_BIN
  
  PR:		217142
  Submitted by:	pkubaj@anongoth.pl
  Approved by:	maintainer(timeout, > 100 days)

Deleted:
  head/mail/mailscanner/files/Sophos.install.freebsd
  head/mail/mailscanner/files/patch-lib_clamav-wrapper
  head/mail/mailscanner/files/pkg-deinstall.in
Modified:
  head/mail/mailscanner/Makefile
  head/mail/mailscanner/distinfo
  head/mail/mailscanner/files/pkg-message.in
  head/mail/mailscanner/pkg-plist

Modified: head/mail/mailscanner/Makefile
==============================================================================
--- head/mail/mailscanner/Makefile	Sat Jun 10 21:59:45 2017	(r443124)
+++ head/mail/mailscanner/Makefile	Sat Jun 10 23:12:19 2017	(r443125)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.85.2
-#PORTREVISION=	0
+PORTVERSION=	5.0.3
 CATEGORIES=	mail
-MASTER_SITES=	https://s3.amazonaws.com/mailscanner/release/v4/tar/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}
+MASTER_SITES=	https://s3.amazonaws.com/msv5/release/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix
 
 MAINTAINER=	kkobb@skylinecorp.com
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
@@ -31,25 +30,47 @@ BUILD_DEPENDS=	\
 	p5-Filesys-Df>=0:sysutils/p5-Filesys-Df \
 	p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
 	p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
-	p5-Sys-SigAction>=0:devel/p5-Sys-SigAction
+	p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
+	p5-Inline>=0:devel/p5-Inline \
+	p5-Inline-C>=0:devel/p5-Inline-C \
+	p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient \
+	p5-Mail-SPF>=0:mail/p5-Mail-SPF \
+	p5-Net-CIDR-Lite>=0:net/p5-Net-CIDR-Lite \
+	p5-Net-DNS-Resolver-Programmable>=0:dns/p5-Net-DNS-Resolver-Programmable \
+	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+	p5-Test-Manifest>=0:devel/p5-Test-Manifest \
+	p5-URI>=0:net/p5-URI \
+	p5-IO-String>=0:devel/p5-IO-String \
+	p5-Business-ISBN>=0:misc/p5-Business-ISBN \
+	p5-Business-ISBN-Data>=0:misc/p5-Business-ISBN-Data \
+	p5-Data-Dump>=0:devel/p5-Data-Dump \
+	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+	p5-IP-Country>=0:net/p5-IP-Country \
+	curl:ftp/curl
 
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		bash:shells/bash \
 		tnef:converters/tnef \
 		wget:ftp/wget
 
-CONFLICTS=	MailScanner-devel-[0-9]*
+CONFLICTS=	${PORTNAME}-devel-[0-9]*
 
-PATCHLEVEL=	3
+PATCHLEVEL=	7
 
 USES=		perl5 shebangfix
-SHEBANG_FILES=	bin/[^acu]* bin/analyse_SpamAssassin_cache bin/clean* \
-		bin/update* \
-		lib/[^M]* lib/${PORTNAME}/[^C]* lib/${PORTNAME}/*.p[ml] \
-		lib/${PORTNAME}.pm lib/${PORTNAME}/CustomFunctions/*
+SHEBANG_FILES=	usr/sbin/${PORTNAME} usr/sbin/ms-create-locks \
+		usr/sbin/ms-peek usr/sbin/ms-perl-check \
+		usr/sbin/ms-sa-cache usr/sbin/ms-update-bad-emails \
+		usr/sbin/ms-upgrade-conf \
+		usr/lib/${PORTNAME}/wrapper/bitdefender-autoupdate \
+		usr/lib/${PORTNAME}/wrapper/clamav-autoupdate \
+		usr/lib/${PORTNAME}/wrapper/generic-autoupdate \
+		usr/lib/${PORTNAME}/wrapper/sophos-autoupdate
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
-SUB_FILES=	MailScanner.8 pkg-message pkg-install pkg-deinstall
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+SUB_FILES=	${PORTNAME}.8 pkg-message pkg-install
 SUB_LIST=	DATADIR=${DATADIR} \
 		PERL=${PERL} \
 		PKGVERSION=${PKGVERSION} \
@@ -57,7 +78,7 @@ SUB_LIST=	DATADIR=${DATADIR} \
 		ETC_FILES="${ETC_FILES}" \
 		MCP_FILES="${MCP_FILES}"
 
-OPTIONS_DEFINE=		SPAMASSASSIN CLAMAV CLAMAVMODULE BDC DOCS
+OPTIONS_DEFINE=		SPAMASSASSIN CLAMAV CLAMAVMODULE BDC
 SPAMASSASSIN_DESC=	Install SpamAssassin
 CLAMAV_DESC=		Install ClamAV
 CLAMAVMODULE_DESC=	Install ClamAV Module
@@ -108,7 +129,7 @@ SUB_LIST+=	WITHOUT_SPAMASSASSIN_SYMLINK=no
 .endif
 
 DOC_FILES=	README
-ETC_FILES=	MailScanner.conf filename.rules.conf \
+ETC_FILES=	${PORTNAME}.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 \
@@ -118,173 +139,70 @@ ETC_FILES=	MailScanner.conf filename.rules.conf \
 MCP_FILES=	mcp.spam.assassin.prefs.conf \
 		10_example.cf v320.pre
 USRLOCAL_FILES_LIB=	\
-		bitdefender-autoupdate f-prot-autoupdate \
-		f-secure-wrapper inoculan-autoupdate \
-		kavdaemonclient-wrapper mcafee-autoupdate \
-		nod32-autoupdate rav-autoupdate \
-		rav-wrapper sophos-autoupdate
+		bitdefender-autoupdate f-secure-autoupdate \
+		f-secure-wrapper sophos-autoupdate
 
 USE_RC_SUBR=	mailscanner mta
 
-post-extract:
-	@cd ${WRKSRC} \
-		&& ${TAR} xzf \
-		   perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz \
-		&& ${MV} MailScanner-${PORTVERSION}-${PATCHLEVEL}/* .
-
 post-patch:
 	${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \
-		${WRKSRC}/lib/clamav-wrapper \
-		${WRKSRC}/lib/trend-autoupdate \
-		${WRKSRC}/lib/bitdefender-wrapper \
-		${WRKSRC}/lib/kaspersky-wrapper \
-		${WRKSRC}/bin/Sophos.install
+		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/clamav-wrapper \
+		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/bitdefender-wrapper
 
 do-build:
 	@${REINPLACE_CMD} \
 		-e 's,/bin/bash,${LOCALBASE}/bin/bash,g' \
 		-e 's,/bin/sed,/usr/bin/sed,g' \
-		-e 's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g' \
-		-e 's,/etc/init.d/MailScanner,${LOCALBASE}/etc/rc.d/mailscanner,g' \
+		-e 's,/etc/${PORTNAME}/${PORTNAME}.conf,${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf,g' \
+		-e 's,/etc/init.d/${PORTNAME},${LOCALBASE}/etc/rc.d/mailscanner,g' \
 		-e 's,/etc/mail/,${LOCALBASE}/etc/mail/,g'		\
-		-e 's,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g' \
-		-e 's,/opt/MailScanner/etc/reports,${DATADIR}/reports,g' \
-		-e 's,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g'	\
-		-e 's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g'	\
-		-e 's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g' \
+		-e 's,/opt/${PORTNAME}/bin,${PREFIX}/libexec/${PORTNAME},g' \
+		-e 's,/opt/${PORTNAME}/etc/reports,${DATADIR}/reports,g' \
+		-e 's,/opt/${PORTNAME}/etc,${PREFIX}/etc/${PORTNAME},g'	\
+		-e 's,/opt/${PORTNAME}/lib,${PREFIX}/lib/${PORTNAME},g'	\
+		-e 's,/opt/${PORTNAME}/var/${PORTNAME}.pid,/var/run/${PORTNAME}.pid,g' \
 		-e 's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g'	\
 		-e 's,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g' \
 		-e 's,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g'	\
 		-e 's,/usr/bin/unzip,${UNZIP_CMD},g'				\
 		-e 's,/usr/bin/wget,${LOCALBASE}/bin/wget,g'		\
 		-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g'		\
-		${WRKSRC}/bin/MailScanner				\
-		${WRKSRC}/bin/mailscanner_create_locks			\
-		${WRKSRC}/bin/processing_messages_alert			\
-		${WRKSRC}/bin/update_virus_scanners			\
-		${WRKSRC}/bin/cron/update_virus_scanners.cron		\
-		${WRKSRC}/bin/update_bad_phishing_emails		\
-		${WRKSRC}/bin/update_phishing_sites			\
-		${WRKSRC}/bin/update_bad_phishing_sites			\
-		${WRKSRC}/bin/cron/update_phishing_sites.cron		\
-		${WRKSRC}/bin/cron/update_bad_phishing_sites.cron	\
-		${WRKSRC}/bin/cron/update_spamassassin.cron		\
-		${WRKSRC}/bin/update_spamassassin			\
-		${WRKSRC}/bin/clean.SA.cache				\
-		${WRKSRC}/lib/MailScanner/ConfigDefs.pl			\
-		${WRKSRC}/lib/MailScanner/SystemDefs.pm			\
-		${WRKSRC}/lib/clamav-wrapper				\
-		${WRKSRC}/lib/sophos-autoupdate
+		${WRKSRC}/usr/sbin/${PORTNAME}				\
+		${WRKSRC}/usr/sbin/ms-create-locks			\
+		${WRKSRC}/usr/lib/${PORTNAME}/init/ms-init		\
 
 	@${REINPLACE_CMD} \
-		-e 's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g' \
+		-e 's,/opt/${PORTNAME}/var/${PORTNAME}.pid,/var/run/${PORTNAME}.pid,g' \
 		-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g' \
-		-e 's,/opt/MailScanner/bin,${PREFIX}/bin,g' \
-		-e 's,/opt/MailScanner/etc/reports,${DATADIR}/reports,g' \
-		-e 's,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g' \
-		-e 's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g' \
+		-e 's,/opt/${PORTNAME}/bin,${PREFIX}/bin,g' \
+		-e 's,/opt/${PORTNAME}/etc/reports,${DATADIR}/reports,g' \
+		-e 's,/opt/${PORTNAME}/etc,${PREFIX}/etc/${PORTNAME},g' \
+		-e 's,/opt/${PORTNAME}/lib,${PREFIX}/lib/${PORTNAME},g' \
 		-e 's,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g' \
 		-e 's,/bin/gunzip,/usr/bin/gunzip,g' \
 		-e 's,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g' \
 		-e 's,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g' \
 		-e 's,/usr/local/share/clamav,/var/db/clamav,g' \
-		${WRKSRC}/etc/MailScanner.conf
+		${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf
 
 	@${REINPLACE_CMD} \
-		-e 's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g' \
+		-e 's,/opt/${PORTNAME}/lib,${PREFIX}/libexec/${PORTNAME},g' \
 		-e 's,/bin/false,/usr/bin/false,' \
-		${WRKSRC}/etc/virus.scanners.conf
+		${WRKSRC}/etc/${PORTNAME}/virus.scanners.conf
 
 .for FILE in ${USRLOCAL_FILES_LIB}
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-		${WRKSRC}/lib/${FILE}
+		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/${FILE}
 .endfor
 	@${FIND} ${WRKSRC} \( -name "*.bak" -or -name "*.orig" \) -delete
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing files in ${PREFIX}/sbin..."
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner
-	${LN} -sf ${PREFIX}/sbin/mailscanner ${STAGEDIR}${PREFIX}/sbin/MailScanner
-	@${ECHO_MSG} " [DONE]"
-	@${ECHO_MSG} -n \
-		">> Installing files in ${PREFIX}/libexec/MailScanner..."
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/MailScanner
-	cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
-		${INSTALL_SCRIPT} {} ${STAGEDIR}${PREFIX}/libexec/MailScanner/{}.sample \;
-	cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
-		${INSTALL_SCRIPT} {} ${STAGEDIR}${PREFIX}/libexec/MailScanner/{}.sample \;
-.for FILE in analyse_SpamAssassin_cache clean.SA.cache clean.quarantine \
-		mailscanner_create_locks processing_messages_alert Quick.Peek \
-		update_bad_phishing_emails update_phishing_sites \
-		update_bad_phishing_sites cron/update_phishing_sites.cron \
-		cron/update_bad_phishing_sites.cron update_virus_scanners \
-		cron/update_virus_scanners.cron update_spamassassin \
-		cron/update_spamassassin.cron
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${FILE} \
-		${STAGEDIR}${PREFIX}/libexec/MailScanner/
-.endfor
-	@${ECHO_MSG} " [DONE]"
-	@${ECHO_MSG} -n ">> Installing files in ${PREFIX}/etc/MailScanner..."
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner
-.for FILE in ${ETC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
-		${STAGEDIR}${PREFIX}/etc/MailScanner/${FILE}.sample
-.endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/rules
-	cd ${WRKSRC}/etc/rules \
-		&& ${INSTALL_DATA} EXAMPLES README \
-			${STAGEDIR}${PREFIX}/etc/MailScanner/rules
-.for RULES in spam.whitelist.rules bounce.rules max.message.size.rules
-	${INSTALL_DATA} ${WRKSRC}/etc/rules/${RULES} \
-		${STAGEDIR}${PREFIX}/etc/MailScanner/rules/${RULES}.sample
-.endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/mcp
-.for FILE in ${MCP_FILES}
-	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
-		${STAGEDIR}${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
-.endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d
-	${INSTALL_DATA} ${WRKSRC}/etc/conf.d/README \
-		${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d/README
-	@${ECHO_MSG} " [DONE]"
-	@${ECHO_MSG} -n ">> Installing files in ${DATADIR}..."
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC}/etc && ${FIND} reports -type d ! -name "*.old" -exec \
-		${MKDIR} ${STAGEDIR}${DATADIR}/{} \;
-	cd ${WRKSRC}/etc \
-	    && ${FIND} reports \( -type d -name "*.old" -prune \) \
-	    -o \( -type f ! \( -name "*.orig" -o -name "*.bak" \) \
-		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{}.sample \; \)
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/upgrade_MailScanner_conf \
-		${STAGEDIR}${DATADIR}
-	${LN} -sf ${DATADIR}/upgrade_MailScanner_conf \
-		${STAGEDIR}${DATADIR}/upgrade_languages_conf
-	@${ECHO_MSG} " [DONE]"
-	@${ECHO_MSG} -n ">> Installing files in ${PREFIX}/lib..."
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
-		${STAGEDIR}${PREFIX}/lib/MailScanner/MailScanner.pm
-	cd ${WRKSRC}/lib/MailScanner \
-		&& ${FIND} * -type f ! -name "*.orig" -exec \
-		${INSTALL_SCRIPT} {} ${STAGEDIR}${PREFIX}/lib/MailScanner/MailScanner/{} \;
-	@${ECHO_MSG} " [DONE]"
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing docs and manpage..."
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${STAGEDIR}${DOCSDIR}
-	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}
-	@${REINPLACE_CMD} \
-		-e 's,%%LOCALBASE%%,${LOCALBASE},'	\
-		-e 's,%%PREFIX%%,${PREFIX},'		\
-		${STAGEDIR}${DOCSDIR}/Sophos.install.freebsd
-	@${RM} ${STAGEDIR}${DOCSDIR}/Sophos.install.freebsd.bak
-.else
-	@${ECHO_MSG} -n ">> Installing manpage..."
-.endif
+	(cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc)
+	(cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin)
+	(cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share)
 	cd ${WRKDIR} && \
 		${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
-	${LN} -sf ${PREFIX}/man/man8/${PORTNAME}.8 \
+	${LN} -sf ${PORTNAME}.8 \
 		${STAGEDIR}${PREFIX}/man/man8/${PORTNAME:tl}.8
 	@${ECHO_MSG} " [DONE]"
 

Modified: head/mail/mailscanner/distinfo
==============================================================================
--- head/mail/mailscanner/distinfo	Sat Jun 10 21:59:45 2017	(r443124)
+++ head/mail/mailscanner/distinfo	Sat Jun 10 23:12:19 2017	(r443125)
@@ -1,2 +1,3 @@
-SHA256 (MailScanner-4.85.2-3.tar.gz) = 8e2ca7be98199b226942a31dd48d4f516c9d86c1d402c5ade2858cbe104d2057
-SIZE (MailScanner-4.85.2-3.tar.gz) = 924177
+TIMESTAMP = 1487170129
+SHA256 (MailScanner-5.0.3-7.nix.tar.gz) = e3de4f372e06001da818fbe8c540f66d3fa21543544abace7f1d805ff85ee0a8
+SIZE (MailScanner-5.0.3-7.nix.tar.gz) = 604345

Modified: head/mail/mailscanner/files/pkg-message.in
==============================================================================
--- head/mail/mailscanner/files/pkg-message.in	Sat Jun 10 21:59:45 2017	(r443124)
+++ head/mail/mailscanner/files/pkg-message.in	Sat Jun 10 23:12:19 2017	(r443125)
@@ -23,9 +23,6 @@
 
 	Either create those directories or change the configuration.
 
-	Sophos users: Please take a look at the Sophos install
-	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd
-
 	*****************************************************************
 	A new optional rc variable called mailscanner_user has been added
 	to the startup script. This is a temporary workaround to address

Modified: head/mail/mailscanner/pkg-plist
==============================================================================
--- head/mail/mailscanner/pkg-plist	Sat Jun 10 21:59:45 2017	(r443124)
+++ head/mail/mailscanner/pkg-plist	Sat Jun 10 23:12:19 2017	(r443125)
@@ -1,565 +1,503 @@
-%%ETCDIR%%/MailScanner.conf.sample
-%%ETCDIR%%/archives.filename.rules.conf.sample
-%%ETCDIR%%/archives.filetype.rules.conf.sample
+%%ETCDIR%%/MailScanner.conf
+%%ETCDIR%%/archives.filename.rules.conf
+%%ETCDIR%%/archives.filetype.rules.conf
 %%ETCDIR%%/conf.d/README
-%%ETCDIR%%/country.domains.conf.sample
-%%ETCDIR%%/filename.rules.conf.sample
-%%ETCDIR%%/filetype.rules.conf.sample
-%%ETCDIR%%/mcp/10_example.cf.sample
-%%ETCDIR%%/mcp/mcp.spam.assassin.prefs.conf.sample
-%%ETCDIR%%/mcp/v320.pre.sample
-%%ETCDIR%%/phishing.bad.sites.conf.sample
-%%ETCDIR%%/phishing.safe.sites.conf.sample
+%%ETCDIR%%/country.domains.conf
+%%ETCDIR%%/defaults
+%%ETCDIR%%/filename.rules.conf
+%%ETCDIR%%/filetype.rules.conf
+%%ETCDIR%%/mcp/10_example.cf
+%%ETCDIR%%/mcp/mcp.spamassassin.conf
+%%ETCDIR%%/phishing.bad.sites.conf
+%%ETCDIR%%/phishing.safe.sites.conf
 %%ETCDIR%%/rules/EXAMPLES
 %%ETCDIR%%/rules/README
-%%ETCDIR%%/rules/bounce.rules.sample
-%%ETCDIR%%/rules/max.message.size.rules.sample
-%%ETCDIR%%/rules/spam.whitelist.rules.sample
-%%ETCDIR%%/spam.assassin.prefs.conf.sample
-%%ETCDIR%%/spam.lists.conf.sample
-%%ETCDIR%%/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/ConfigSQL.pm
-lib/MailScanner/MailScanner/CustomConfig.pm
-lib/MailScanner/MailScanner/CustomFunctions/CustomAction.pm
-lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
-lib/MailScanner/MailScanner/CustomFunctions/GenericSpamScanner.pm
-lib/MailScanner/MailScanner/CustomFunctions/LastSpam.pm
-lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
-lib/MailScanner/MailScanner/CustomFunctions/Ruleset-from-Function.pm
-lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
-lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.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
-lib/MailScanner/MailScanner/MCPMessage.pm
-lib/MailScanner/MailScanner/Mail.pm
-lib/MailScanner/MailScanner/Message.pm
-lib/MailScanner/MailScanner/MessageBatch.pm
-lib/MailScanner/MailScanner/PFDiskStore.pm
-lib/MailScanner/MailScanner/Postfix.pm
-lib/MailScanner/MailScanner/QMDiskStore.pm
-lib/MailScanner/MailScanner/Qmail.pm
-lib/MailScanner/MailScanner/Quarantine.pm
-lib/MailScanner/MailScanner/Queue.pm
-lib/MailScanner/MailScanner/RBLs.pm
-lib/MailScanner/MailScanner/SA.pm
-lib/MailScanner/MailScanner/SMDiskStore.pm
-lib/MailScanner/MailScanner/Sendmail.pm
-lib/MailScanner/MailScanner/SweepContent.pm
-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
-libexec/MailScanner/Quick.Peek
-libexec/MailScanner/analyse_SpamAssassin_cache
-libexec/MailScanner/antivir-autoupdate.sample
-libexec/MailScanner/antivir-wrapper.sample
-libexec/MailScanner/avast-autoupdate.sample
-libexec/MailScanner/avast-wrapper.sample
-libexec/MailScanner/avastd-wrapper.sample
-libexec/MailScanner/avg-autoupdate.sample
-libexec/MailScanner/avg-wrapper.sample
-libexec/MailScanner/bitdefender-autoupdate.sample
-libexec/MailScanner/bitdefender-wrapper.sample
-libexec/MailScanner/clamav-autoupdate.sample
-libexec/MailScanner/clamav-wrapper.sample
-libexec/MailScanner/clean.SA.cache
-libexec/MailScanner/clean.quarantine
-libexec/MailScanner/command-wrapper.sample
-libexec/MailScanner/css-autoupdate.sample
-libexec/MailScanner/css-wrapper.sample
-libexec/MailScanner/drweb-wrapper.sample
-libexec/MailScanner/esets-autoupdate.sample
-libexec/MailScanner/esets-wrapper.sample
-libexec/MailScanner/etrust-autoupdate.sample
-libexec/MailScanner/etrust-wrapper.sample
-libexec/MailScanner/f-prot-6-autoupdate.sample
-libexec/MailScanner/f-prot-6-wrapper.sample
-libexec/MailScanner/f-prot-autoupdate.sample
-libexec/MailScanner/f-prot-wrapper.sample
-libexec/MailScanner/f-secure-autoupdate.sample
-libexec/MailScanner/f-secure-wrapper.sample
-libexec/MailScanner/generic-autoupdate.sample
-libexec/MailScanner/generic-wrapper.sample
-libexec/MailScanner/inoculan-autoupdate.sample
-libexec/MailScanner/inoculan-wrapper.sample
-libexec/MailScanner/inoculate-wrapper.sample
-libexec/MailScanner/kaspersky-autoupdate.sample
-libexec/MailScanner/kaspersky-wrapper.sample
-libexec/MailScanner/kavdaemonclient-wrapper.sample
-libexec/MailScanner/mailscanner_create_locks
-libexec/MailScanner/mcafee-autoupdate.sample
-libexec/MailScanner/mcafee-wrapper.sample
-libexec/MailScanner/mcafee6-autoupdate.sample
-libexec/MailScanner/mcafee6-wrapper.sample
-libexec/MailScanner/nod32-autoupdate.sample
-libexec/MailScanner/nod32-wrapper.sample
-libexec/MailScanner/norman-autoupdate.sample
-libexec/MailScanner/norman-wrapper.sample
-libexec/MailScanner/panda-autoupdate.sample
-libexec/MailScanner/panda-wrapper.sample
-libexec/MailScanner/processing_messages_alert
-libexec/MailScanner/rav-autoupdate.sample
-libexec/MailScanner/rav-wrapper.sample
-libexec/MailScanner/sophos-autoupdate.sample
-libexec/MailScanner/sophos-wrapper.sample
-libexec/MailScanner/symscanengine-autoupdate.sample
-libexec/MailScanner/symscanengine-wrapper.sample
-libexec/MailScanner/trend-autoupdate.sample
-libexec/MailScanner/trend-wrapper.sample
-libexec/MailScanner/update_bad_phishing_emails
-libexec/MailScanner/update_bad_phishing_sites
-libexec/MailScanner/update_bad_phishing_sites.cron
-libexec/MailScanner/update_phishing_sites
-libexec/MailScanner/update_phishing_sites.cron
-libexec/MailScanner/update_spamassassin
-libexec/MailScanner/update_spamassassin.cron
-libexec/MailScanner/update_virus_scanners
-libexec/MailScanner/update_virus_scanners.cron
-libexec/MailScanner/vba32-autoupdate.sample
-libexec/MailScanner/vba32-wrapper.sample
-libexec/MailScanner/vexira-autoupdate.sample
-libexec/MailScanner/vexira-wrapper.sample
+%%ETCDIR%%/rules/bounce.rules
+%%ETCDIR%%/rules/max.message.size.rules
+%%ETCDIR%%/rules/spam.whitelist.rules
+%%ETCDIR%%/spam.lists.conf
+%%ETCDIR%%/spamassassin.conf
+%%ETCDIR%%/virus.scanners.conf
 man/man8/MailScanner.8.gz
 man/man8/mailscanner.8.gz
 sbin/MailScanner
-sbin/mailscanner
-%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.size.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/ca/disinfected.report.txt.sample
-%%DATADIR%%/reports/ca/inline.sig.html.sample
-%%DATADIR%%/reports/ca/inline.sig.txt.sample
-%%DATADIR%%/reports/ca/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/ca/inline.warning.html.sample
-%%DATADIR%%/reports/ca/inline.warning.txt.sample
-%%DATADIR%%/reports/ca/languages.conf.sample
-%%DATADIR%%/reports/ca/languages.conf.strings.sample
-%%DATADIR%%/reports/ca/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/ca/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/ca/rejection.report.txt.sample
-%%DATADIR%%/reports/ca/sender.content.report.txt.sample
-%%DATADIR%%/reports/ca/sender.error.report.txt.sample
-%%DATADIR%%/reports/ca/sender.filename.report.txt.sample
-%%DATADIR%%/reports/ca/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/ca/sender.size.report.txt.sample
-%%DATADIR%%/reports/ca/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/ca/sender.spam.report.txt.sample
-%%DATADIR%%/reports/ca/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/ca/sender.virus.report.txt.sample
-%%DATADIR%%/reports/ca/stored.content.message.txt.sample
-%%DATADIR%%/reports/ca/stored.filename.message.txt.sample
-%%DATADIR%%/reports/ca/stored.size.message.txt.sample
-%%DATADIR%%/reports/ca/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.size.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cy+en/disinfected.report.txt.sample
-%%DATADIR%%/reports/cy+en/inline.sig.html.sample
-%%DATADIR%%/reports/cy+en/inline.sig.txt.sample
-%%DATADIR%%/reports/cy+en/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cy+en/inline.warning.html.sample
-%%DATADIR%%/reports/cy+en/inline.warning.txt.sample
-%%DATADIR%%/reports/cy+en/languages.conf.sample
-%%DATADIR%%/reports/cy+en/languages.conf.strings.sample
-%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/cy+en/rejection.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.size.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.size.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.size.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cz/disinfected.report.txt.sample
-%%DATADIR%%/reports/cz/inline.sig.html.sample
-%%DATADIR%%/reports/cz/inline.sig.txt.sample
-%%DATADIR%%/reports/cz/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cz/inline.warning.html.sample
-%%DATADIR%%/reports/cz/inline.warning.txt.sample
-%%DATADIR%%/reports/cz/languages.conf.sample
-%%DATADIR%%/reports/cz/languages.conf.strings.sample
-%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/cz/rejection.report.txt.sample
-%%DATADIR%%/reports/cz/sender.content.report.txt.sample
-%%DATADIR%%/reports/cz/sender.error.report.txt.sample
-%%DATADIR%%/reports/cz/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/sender.size.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cz/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cz/stored.content.message.txt.sample
-%%DATADIR%%/reports/cz/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cz/stored.size.message.txt.sample
-%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
-%%DATADIR%%/reports/de/deleted.content.message.txt.sample
-%%DATADIR%%/reports/de/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/de/deleted.size.message.txt.sample
-%%DATADIR%%/reports/de/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/de/disinfected.report.txt.sample
-%%DATADIR%%/reports/de/inline.sig.html.sample
-%%DATADIR%%/reports/de/inline.sig.txt.sample
-%%DATADIR%%/reports/de/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/de/inline.warning.html.sample
-%%DATADIR%%/reports/de/inline.warning.txt.sample
-%%DATADIR%%/reports/de/languages.conf.sample
-%%DATADIR%%/reports/de/languages.conf.strings.sample
-%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/de/rejection.report.txt.sample
-%%DATADIR%%/reports/de/sender.content.report.txt.sample
-%%DATADIR%%/reports/de/sender.error.report.txt.sample
-%%DATADIR%%/reports/de/sender.filename.report.txt.sample
-%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/de/sender.size.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/de/sender.virus.report.txt.sample
-%%DATADIR%%/reports/de/stored.content.message.txt.sample
-%%DATADIR%%/reports/de/stored.filename.message.txt.sample
-%%DATADIR%%/reports/de/stored.size.message.txt.sample
-%%DATADIR%%/reports/de/stored.virus.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.size.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/dk/disinfected.report.txt.sample
-%%DATADIR%%/reports/dk/inline.sig.html.sample
-%%DATADIR%%/reports/dk/inline.sig.txt.sample
-%%DATADIR%%/reports/dk/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/dk/inline.warning.html.sample
-%%DATADIR%%/reports/dk/inline.warning.txt.sample
-%%DATADIR%%/reports/dk/languages.conf.sample
-%%DATADIR%%/reports/dk/languages.conf.strings.sample
-%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/dk/rejection.report.txt.sample
-%%DATADIR%%/reports/dk/sender.content.report.txt.sample
-%%DATADIR%%/reports/dk/sender.error.report.txt.sample
-%%DATADIR%%/reports/dk/sender.filename.report.txt.sample
-%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/dk/sender.size.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/dk/sender.virus.report.txt.sample
-%%DATADIR%%/reports/dk/stored.content.message.txt.sample
-%%DATADIR%%/reports/dk/stored.filename.message.txt.sample
-%%DATADIR%%/reports/dk/stored.size.message.txt.sample
-%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
-%%DATADIR%%/reports/en/deleted.content.message.txt.sample
-%%DATADIR%%/reports/en/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/en/deleted.size.message.txt.sample
-%%DATADIR%%/reports/en/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/en/disinfected.report.txt.sample
-%%DATADIR%%/reports/en/inline.sig.html.sample
-%%DATADIR%%/reports/en/inline.sig.txt.sample
-%%DATADIR%%/reports/en/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/en/inline.warning.html.sample
-%%DATADIR%%/reports/en/inline.warning.txt.sample
-%%DATADIR%%/reports/en/languages.conf.sample
-%%DATADIR%%/reports/en/languages.conf.strings.sample
-%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/en/rejection.report.txt.sample
-%%DATADIR%%/reports/en/sender.content.report.txt.sample
-%%DATADIR%%/reports/en/sender.error.report.txt.sample
-%%DATADIR%%/reports/en/sender.filename.report.txt.sample
-%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/en/sender.size.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/en/sender.virus.report.txt.sample
-%%DATADIR%%/reports/en/stored.content.message.txt.sample
-%%DATADIR%%/reports/en/stored.filename.message.txt.sample
-%%DATADIR%%/reports/en/stored.size.message.txt.sample
-%%DATADIR%%/reports/en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/es/deleted.content.message.txt.sample
-%%DATADIR%%/reports/es/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/es/deleted.size.message.txt.sample
-%%DATADIR%%/reports/es/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/es/disinfected.report.txt.sample
-%%DATADIR%%/reports/es/inline.sig.html.sample
-%%DATADIR%%/reports/es/inline.sig.txt.sample
-%%DATADIR%%/reports/es/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/es/inline.warning.html.sample
-%%DATADIR%%/reports/es/inline.warning.txt.sample
-%%DATADIR%%/reports/es/languages.conf.sample
-%%DATADIR%%/reports/es/languages.conf.strings.sample
-%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/es/rejection.report.txt.sample
-%%DATADIR%%/reports/es/sender.content.report.txt.sample
-%%DATADIR%%/reports/es/sender.error.report.txt.sample
-%%DATADIR%%/reports/es/sender.filename.report.txt.sample
-%%DATADIR%%/reports/es/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/es/sender.size.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/es/sender.virus.report.txt.sample
-%%DATADIR%%/reports/es/stored.content.message.txt.sample
-%%DATADIR%%/reports/es/stored.filename.message.txt.sample
-%%DATADIR%%/reports/es/stored.size.message.txt.sample
-%%DATADIR%%/reports/es/stored.virus.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.size.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/fr/disinfected.report.txt.sample
-%%DATADIR%%/reports/fr/inline.sig.html.sample
-%%DATADIR%%/reports/fr/inline.sig.txt.sample
-%%DATADIR%%/reports/fr/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/fr/inline.warning.html.sample
-%%DATADIR%%/reports/fr/inline.warning.txt.sample
-%%DATADIR%%/reports/fr/languages.conf.sample
-%%DATADIR%%/reports/fr/languages.conf.strings.sample
-%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/fr/rejection.report.txt.sample
-%%DATADIR%%/reports/fr/sender.content.report.txt.sample
-%%DATADIR%%/reports/fr/sender.error.report.txt.sample
-%%DATADIR%%/reports/fr/sender.filename.report.txt.sample
-%%DATADIR%%/reports/fr/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/sender.size.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/fr/sender.virus.report.txt.sample
-%%DATADIR%%/reports/fr/stored.content.message.txt.sample
-%%DATADIR%%/reports/fr/stored.filename.message.txt.sample
-%%DATADIR%%/reports/fr/stored.size.message.txt.sample
-%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.size.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/hu/disinfected.report.txt.sample
-%%DATADIR%%/reports/hu/inline.sig.html.sample
-%%DATADIR%%/reports/hu/inline.sig.txt.sample
-%%DATADIR%%/reports/hu/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/hu/inline.warning.html.sample
-%%DATADIR%%/reports/hu/inline.warning.txt.sample
-%%DATADIR%%/reports/hu/languages.conf.sample
-%%DATADIR%%/reports/hu/languages.conf.strings.sample
-%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/hu/rejection.report.txt.sample
-%%DATADIR%%/reports/hu/sender.content.report.txt.sample
-%%DATADIR%%/reports/hu/sender.error.report.txt.sample
-%%DATADIR%%/reports/hu/sender.filename.report.txt.sample
-%%DATADIR%%/reports/hu/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/sender.size.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/hu/sender.virus.report.txt.sample
-%%DATADIR%%/reports/hu/stored.content.message.txt.sample
-%%DATADIR%%/reports/hu/stored.filename.message.txt.sample
-%%DATADIR%%/reports/hu/stored.size.message.txt.sample
-%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
-%%DATADIR%%/reports/it/deleted.content.message.txt.sample
-%%DATADIR%%/reports/it/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/it/deleted.size.message.txt.sample
-%%DATADIR%%/reports/it/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/it/disinfected.report.txt.sample
-%%DATADIR%%/reports/it/inline.sig.html.sample
-%%DATADIR%%/reports/it/inline.sig.txt.sample
-%%DATADIR%%/reports/it/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/it/inline.warning.html.sample
-%%DATADIR%%/reports/it/inline.warning.txt.sample
-%%DATADIR%%/reports/it/languages.conf.sample
-%%DATADIR%%/reports/it/languages.conf.strings.sample
-%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/it/rejection.report.txt.sample
-%%DATADIR%%/reports/it/sender.content.report.txt.sample
-%%DATADIR%%/reports/it/sender.error.report.txt.sample
-%%DATADIR%%/reports/it/sender.filename.report.txt.sample
-%%DATADIR%%/reports/it/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/it/sender.size.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/it/sender.virus.report.txt.sample
-%%DATADIR%%/reports/it/stored.content.message.txt.sample
-%%DATADIR%%/reports/it/stored.filename.message.txt.sample
-%%DATADIR%%/reports/it/stored.size.message.txt.sample
-%%DATADIR%%/reports/it/stored.virus.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.size.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/nl/disinfected.report.txt.sample
-%%DATADIR%%/reports/nl/inline.sig.html.sample
-%%DATADIR%%/reports/nl/inline.sig.txt.sample
-%%DATADIR%%/reports/nl/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/nl/inline.warning.html.sample
-%%DATADIR%%/reports/nl/inline.warning.txt.sample
-%%DATADIR%%/reports/nl/languages.conf.sample
-%%DATADIR%%/reports/nl/languages.conf.strings.sample
-%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/nl/rejection.report.txt.sample
-%%DATADIR%%/reports/nl/sender.content.report.txt.sample
-%%DATADIR%%/reports/nl/sender.error.report.txt.sample
-%%DATADIR%%/reports/nl/sender.filename.report.txt.sample
-%%DATADIR%%/reports/nl/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/sender.size.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/nl/sender.virus.report.txt.sample
-%%DATADIR%%/reports/nl/stored.content.message.txt.sample
-%%DATADIR%%/reports/nl/stored.filename.message.txt.sample
-%%DATADIR%%/reports/nl/stored.size.message.txt.sample
-%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.size.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/pt_br/disinfected.report.txt.sample
-%%DATADIR%%/reports/pt_br/inline.sig.html.sample
-%%DATADIR%%/reports/pt_br/inline.sig.txt.sample
-%%DATADIR%%/reports/pt_br/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/pt_br/inline.warning.html.sample
-%%DATADIR%%/reports/pt_br/inline.warning.txt.sample
-%%DATADIR%%/reports/pt_br/languages.conf.sample
-%%DATADIR%%/reports/pt_br/languages.conf.strings.sample
-%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/pt_br/rejection.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.size.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.virus.report.txt.sample
-%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.size.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.size.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/ro/disinfected.report.txt.sample
-%%DATADIR%%/reports/ro/inline.sig.html.sample
-%%DATADIR%%/reports/ro/inline.sig.txt.sample
-%%DATADIR%%/reports/ro/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/ro/inline.warning.html.sample
-%%DATADIR%%/reports/ro/inline.warning.txt.sample
-%%DATADIR%%/reports/ro/languages.conf.sample
-%%DATADIR%%/reports/ro/languages.conf.strings.sample
-%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/ro/rejection.report.txt.sample
-%%DATADIR%%/reports/ro/sender.content.report.txt.sample
-%%DATADIR%%/reports/ro/sender.error.report.txt.sample
-%%DATADIR%%/reports/ro/sender.filename.report.txt.sample
-%%DATADIR%%/reports/ro/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/sender.size.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/ro/sender.virus.report.txt.sample
-%%DATADIR%%/reports/ro/stored.content.message.txt.sample
-%%DATADIR%%/reports/ro/stored.filename.message.txt.sample
-%%DATADIR%%/reports/ro/stored.size.message.txt.sample
-%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
-%%DATADIR%%/reports/se/deleted.content.message.txt.sample
-%%DATADIR%%/reports/se/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/se/deleted.size.message.txt.sample
-%%DATADIR%%/reports/se/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/se/disinfected.report.txt.sample
-%%DATADIR%%/reports/se/inline.sig.html.sample
-%%DATADIR%%/reports/se/inline.sig.txt.sample
-%%DATADIR%%/reports/se/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/se/inline.warning.html.sample
-%%DATADIR%%/reports/se/inline.warning.txt.sample
-%%DATADIR%%/reports/se/languages.conf.sample
-%%DATADIR%%/reports/se/languages.conf.strings.sample
-%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/se/rejection.report.txt.sample
-%%DATADIR%%/reports/se/sender.content.report.txt.sample
-%%DATADIR%%/reports/se/sender.error.report.txt.sample
-%%DATADIR%%/reports/se/sender.filename.report.txt.sample
-%%DATADIR%%/reports/se/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/se/sender.size.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/se/sender.virus.report.txt.sample
-%%DATADIR%%/reports/se/stored.content.message.txt.sample
-%%DATADIR%%/reports/se/stored.filename.message.txt.sample
-%%DATADIR%%/reports/se/stored.size.message.txt.sample
-%%DATADIR%%/reports/se/stored.virus.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.size.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/sk/disinfected.report.txt.sample
-%%DATADIR%%/reports/sk/inline.sig.html.sample
-%%DATADIR%%/reports/sk/inline.sig.txt.sample
-%%DATADIR%%/reports/sk/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/sk/inline.warning.html.sample
-%%DATADIR%%/reports/sk/inline.warning.txt.sample
-%%DATADIR%%/reports/sk/languages.conf.sample
-%%DATADIR%%/reports/sk/languages.conf.strings.sample
-%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/sk/rejection.report.txt.sample
-%%DATADIR%%/reports/sk/sender.content.report.txt.sample
-%%DATADIR%%/reports/sk/sender.error.report.txt.sample
-%%DATADIR%%/reports/sk/sender.filename.report.txt.sample
-%%DATADIR%%/reports/sk/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/sender.size.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/sk/sender.virus.report.txt.sample
-%%DATADIR%%/reports/sk/stored.content.message.txt.sample
-%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
-%%DATADIR%%/reports/sk/stored.size.message.txt.sample
-%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%DATADIR%%/upgrade_MailScanner_conf
-%%DATADIR%%/upgrade_languages_conf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
-%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
+sbin/ms-check
+sbin/ms-clean-quarantine
+sbin/ms-create-locks
+sbin/ms-cron
+sbin/ms-d2mbox
+sbin/ms-df2mbox
+sbin/ms-msg-alert
+sbin/ms-peek
+sbin/ms-perl-check
+sbin/ms-sa-cache
+sbin/ms-update-bad-emails
+sbin/ms-update-bad-sites
+sbin/ms-update-sa
+sbin/ms-update-safe-sites
+sbin/ms-update-vs
+sbin/ms-upgrade-conf
+%%DATADIR%%/perl/MailScanner.pm
+%%DATADIR%%/perl/MailScanner/Antiword.pm
+%%DATADIR%%/perl/MailScanner/Config.pm
+%%DATADIR%%/perl/MailScanner/ConfigDefs.pl
+%%DATADIR%%/perl/MailScanner/ConfigSQL.pm
+%%DATADIR%%/perl/MailScanner/CustomConfig.pm
+%%DATADIR%%/perl/MailScanner/Exim.pm
+%%DATADIR%%/perl/MailScanner/EximDiskStore.pm
+%%DATADIR%%/perl/MailScanner/FileInto.pm
+%%DATADIR%%/perl/MailScanner/GenericSpam.pm
+%%DATADIR%%/perl/MailScanner/LinksDump.pm
+%%DATADIR%%/perl/MailScanner/Lock.pm
+%%DATADIR%%/perl/MailScanner/Log.pm
+%%DATADIR%%/perl/MailScanner/MCP.pm
+%%DATADIR%%/perl/MailScanner/MCPMessage.pm
+%%DATADIR%%/perl/MailScanner/Mail.pm
+%%DATADIR%%/perl/MailScanner/Message.pm
+%%DATADIR%%/perl/MailScanner/MessageBatch.pm
+%%DATADIR%%/perl/MailScanner/PFDiskStore.pm
+%%DATADIR%%/perl/MailScanner/Postfix.pm
+%%DATADIR%%/perl/MailScanner/QMDiskStore.pm
+%%DATADIR%%/perl/MailScanner/Qmail.pm
+%%DATADIR%%/perl/MailScanner/Quarantine.pm
+%%DATADIR%%/perl/MailScanner/Queue.pm
+%%DATADIR%%/perl/MailScanner/RBLs.pm
+%%DATADIR%%/perl/MailScanner/SA.pm
+%%DATADIR%%/perl/MailScanner/SMDiskStore.pm
+%%DATADIR%%/perl/MailScanner/Sendmail.pm
+%%DATADIR%%/perl/MailScanner/SweepContent.pm
+%%DATADIR%%/perl/MailScanner/SweepOther.pm
+%%DATADIR%%/perl/MailScanner/SweepViruses.pm
+%%DATADIR%%/perl/MailScanner/SystemDefs.pm
+%%DATADIR%%/perl/MailScanner/TNEF.pm
+%%DATADIR%%/perl/MailScanner/Unzip.pm
+%%DATADIR%%/perl/MailScanner/WorkArea.pm
+%%DATADIR%%/perl/MailScanner/ZMDiskStore.pm
+%%DATADIR%%/perl/MailScanner/ZMailer.pm
+%%DATADIR%%/perl/custom/CustomAction.pm
+%%DATADIR%%/perl/custom/GenericSpamScanner.pm
+%%DATADIR%%/perl/custom/LastSpam.pm
+%%DATADIR%%/perl/custom/MyExample.pm
+%%DATADIR%%/perl/custom/Ruleset-from-Function.pm
+%%DATADIR%%/perl/custom/SpamWhitelist.pm
+%%DATADIR%%/perl/custom/ZMRouterDirHash.pm
+%%DATADIR%%/reports/ca/deleted.content.message.txt
+%%DATADIR%%/reports/ca/deleted.filename.message.txt
+%%DATADIR%%/reports/ca/deleted.size.message.txt
+%%DATADIR%%/reports/ca/deleted.virus.message.txt
+%%DATADIR%%/reports/ca/disinfected.report.txt
+%%DATADIR%%/reports/ca/inline.sig.html
+%%DATADIR%%/reports/ca/inline.sig.txt
+%%DATADIR%%/reports/ca/inline.spam.warning.txt
+%%DATADIR%%/reports/ca/inline.warning.html
+%%DATADIR%%/reports/ca/inline.warning.txt
+%%DATADIR%%/reports/ca/languages.conf
+%%DATADIR%%/reports/ca/languages.conf.strings
+%%DATADIR%%/reports/ca/recipient.mcp.report.txt
+%%DATADIR%%/reports/ca/recipient.spam.report.txt
+%%DATADIR%%/reports/ca/rejection.report.txt
+%%DATADIR%%/reports/ca/sender.content.report.txt
+%%DATADIR%%/reports/ca/sender.error.report.txt
+%%DATADIR%%/reports/ca/sender.filename.report.txt
+%%DATADIR%%/reports/ca/sender.mcp.report.txt
+%%DATADIR%%/reports/ca/sender.size.report.txt
+%%DATADIR%%/reports/ca/sender.spam.rbl.report.txt
+%%DATADIR%%/reports/ca/sender.spam.report.txt
+%%DATADIR%%/reports/ca/sender.spam.sa.report.txt
+%%DATADIR%%/reports/ca/sender.virus.report.txt
+%%DATADIR%%/reports/ca/stored.content.message.txt
+%%DATADIR%%/reports/ca/stored.filename.message.txt
+%%DATADIR%%/reports/ca/stored.size.message.txt
+%%DATADIR%%/reports/ca/stored.virus.message.txt
+%%DATADIR%%/reports/cy+en/deleted.content.message.txt
+%%DATADIR%%/reports/cy+en/deleted.filename.message.txt
+%%DATADIR%%/reports/cy+en/deleted.size.message.txt
+%%DATADIR%%/reports/cy+en/deleted.virus.message.txt
+%%DATADIR%%/reports/cy+en/disinfected.report.txt
+%%DATADIR%%/reports/cy+en/inline.sig.html
+%%DATADIR%%/reports/cy+en/inline.sig.txt
+%%DATADIR%%/reports/cy+en/inline.spam.warning.txt
+%%DATADIR%%/reports/cy+en/inline.warning.html
+%%DATADIR%%/reports/cy+en/inline.warning.txt
+%%DATADIR%%/reports/cy+en/languages.conf
+%%DATADIR%%/reports/cy+en/languages.conf.strings
+%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt
+%%DATADIR%%/reports/cy+en/recipient.spam.report.txt

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706102312.v5ANCJ5w031049>