Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 May 2007 16:29:35 +0200 (CEST)
From:      Jan-Peter Koopmann <j.koopmann@seceidos.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/113089: [MAINTAINER] mail/MailScanner-devel: update to 4.60.5
Message-ID:  <200705281429.l4SETZVT071231@services.intern.seceidos.de>
Resent-Message-ID: <200705281430.l4SEU41a098339@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         113089
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner-devel: update to 4.60.5
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 28 14:30:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Jan-Peter Koopmann
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan  5 10:56:46 CET
>Description:
- Update to 4.60.5

Former port was not working anymore

Added file(s):
- files/MailScanner.8
- files/mailscanner.in
- files/mta.in
- files/patch-bin-cron-sa-update.cron
- files/patch-bin-cron-update_phishing_sites.cron
- files/patch-bin-cron-update_virus_scanners.cron
- files/patch-lib-clamav-wrapper
- files/rcwarning.txt

Removed file(s):
- files/mailscanner.sh
- files/mta.sh
- files/patch-docs:man:MailScanner.8
- files/patch-docs:man:MailScanner.8.html
- files/patch-docs:man:MailScanner.conf.5
- files/patch-docs:man:MailScanner.conf.5.html
- files/patch-lib:clamav-wrapper

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- MailScanner-devel-4.60.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner-devel/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile	16 Jan 2007 18:21:00 -0000	1.29
+++ Makefile	28 May 2007 14:29:11 -0000
@@ -2,14 +2,13 @@
 # Date created:				17 March 2003
 # Whom:					Jan-Peter Koopmann <j.koopmann@seceidos.de>
 #
-# $FreeBSD: ports/mail/mailscanner-devel/Makefile,v 1.29 2007/01/16 18:21:00 bsam Exp $
+# $FreeBSD: ports/mail/mailscanner/Makefile,v 1.61 2007/04/08 10:40:04 stefan Exp $
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.45.1
-PORTREVISION=	1
+PORTVERSION=	4.60.5
 CATEGORIES=	mail
-MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
+MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
 
@@ -19,6 +18,7 @@
 BUILD_DEPENDS=	\
 	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+	${SITE_PERL}/${PERL_ARCH}/Bundle/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
@@ -28,18 +28,27 @@
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 	${SITE_PERL}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+	${SITE_PERL}/Net/Ident.pm:${PORTSDIR}/net/p5-Net-Ident \
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-	${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+	${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
+	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
+	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+	${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} \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
-		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
-		${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo \
-		${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
-		${LOCALBASE}/bin/unace:${PORTSDIR}/archivers/unace \
-		${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
+		bash:${PORTSDIR}/shells/bash \
+		tnef:${PORTSDIR}/converters/tnef \
+		wget:${PORTSDIR}/ftp/wget
+
+OPTIONS=	SPAMASSASSIN "Install SpamAssassin" on \
+		CLAMAV "Install ClamAV" on \
+		CLAMAVMODULE "Install ClamAV Module" off \
+		BDC "Install BitDefender" off
 
 CONFLICTS=	MailScanner-[0-9]*
 
@@ -51,17 +60,59 @@
 SUB_FILES=	pkg-message
 
 MAN8=		MailScanner.8
-MAN5=		MailScanner.conf.5
-MLINKS=		MailScanner.8 mailscanner.8 \
-		MailScanner.conf.5 mailscanner.conf.5
+MLINKS=		MailScanner.8 mailscanner.8
 
 .include <bsd.port.pre.mk>
 
-DOC_FILES=	INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README
+.if ${PERL_LEVEL} < 500600
+IGNORE=		dependency requires newer Perl
+.endif
+
+.if defined(WITH_SPAMASSASSIN)
+RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+PLIST_SUB+=	SPAMASSASSIN=""
+.else
+PLIST_SUB+=	SPAMASSASSIN="@comment "
+.endif
+
+# backwards compatibility
+.if defined(NO_SPAMASSASSIN_SYMLINK)
+WITHOUT_SPAMASSASSIN_SYMLINK=${NO_SPAMASSASSIN_SYMLINK}
+.endif
+
+.if defined(WITHOUT_SPAMASSASSIN_SYMLINK)
+PLIST_SUB+=	SPAMASSASSIN_SYMLINK="@comment "
+.else
+PLIST_SUB+=	SPAMASSASSIN_SYMLINK=""
+.endif
+
+.if !defined(WITHOUT_CLAMAV)
+RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
+.endif
+
+.if defined(WITH_CLAMAVMODULE)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mail/ClamAV.pm:${PORTSDIR}/mail/p5-Mail-ClamAV
+.endif
+
+.if defined(WITH_CLAMAV)||defined(WITH_CLAMAVMODULE)
+RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip \
+		unrar:${PORTSDIR}/archivers/unrar \
+		zoo:${PORTSDIR}/archivers/zoo \
+		unarj:${PORTSDIR}/archivers/unarj \
+		unace:${PORTSDIR}/archivers/unace \
+		lha:${PORTSDIR}/archivers/lha
+.endif
+
+.if defined(WITH_BDC)
+RUN_DEPENDS+=	bdc:${PORTSDIR}/security/bdc
+.endif
+
+DOC_FILES=	INSTALL.FreeBSD INSTALL.OpenBSD README
 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.safe.sites.conf \
+		country.domains.conf
 MCP_FILES=	mcp.spam.assassin.prefs.conf \
 		10_example.cf
 USRLOCAL_FILES_LIB=	\
@@ -71,6 +122,9 @@
 		nod32-autoupdate rav-autoupdate \
 		rav-wrapper sophos-autoupdate
 
+USE_RC_SUBR=	mailscanner mta
+SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
+
 post-extract:
 	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
 
@@ -87,6 +141,7 @@
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
 		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;' \
 		${WRKSRC}/etc/MailScanner.conf
 	${PERL} -pi -e \
@@ -97,6 +152,28 @@
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/bin/update_virus_scanners
 	${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_virus_scanners.cron
+	${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/bin,${PREFIX}/libexec/MailScanner,g; \
+		s,%%RC_SUBR%%,${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,%%RC_SUBR%%,${RC_SUBR},g;' \
+		${WRKSRC}/bin/cron/sa-update.cron
+	${PERL} -pi -e \
+		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \
+		${WRKSRC}/bin/clean.SA.cache
+	${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; \
@@ -121,19 +198,38 @@
 .endfor
 
 do-install:
-	# Step 1: Install libexec files
+	#
+	# Step 1: Install bin files
+	#
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/sbin/mailscanner
+	${LN} -s ${LOCALBASE}/sbin/mailscanner ${PREFIX}/sbin/MailScanner
+	#
+	# Step 2: Install libexec files
 	#
 	${MKDIR} ${PREFIX}/libexec/MailScanner
 	${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/libexec/MailScanner
 	cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
 	cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/analyse_SpamAssassin_cache \
+		${PREFIX}/libexec/MailScanner/analyse_SpamAssassin_cache
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/clean.SA.cache \
+		${PREFIX}/libexec/MailScanner/clean.SA.cache
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/clean.quarantine \
+		${PREFIX}/libexec/MailScanner/clean.quarantine
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_phishing_sites \
+		${PREFIX}/libexec/MailScanner/update_phishing_sites
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/cron/update_phishing_sites.cron \
+		${PREFIX}/libexec/MailScanner/update_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
 	#
-	# Step 2: Install etc files
+	# Step 3: Install etc files
 	#
 	${MKDIR} ${PREFIX}/etc/MailScanner
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
@@ -153,16 +249,18 @@
 		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
 .endfor
 	#
-	# Step 3: Install files in share
+	# Step 4: Install files in share
 	#
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/etc && ${FIND} reports -type d ! -name "*.old" -exec \
 		${MKDIR} ${DATADIR}/{} \;
+	# cd ${WRKSRC}/etc && ${FIND} reports -type f ! \( -name "*.orig" -exec ...
 	cd ${WRKSRC}/etc && ${FIND} reports \( -type d -name "*.old" -prune \) \
-		-o \( -type f ! -name "*.orig" -exec ${INSTALL_DATA} {} ${DATADIR}/{}.sample \; \)
+		-o \( -type f ! \( -name "*.orig" -o -name "*.bak" \) \
+		-exec ${INSTALL_DATA} {} ${DATADIR}/{}.sample \; \)
 	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
 	#
-	# Step 4: Install lib
+	# Step 5: Install lib
 	#
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
@@ -171,35 +269,25 @@
 	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/lib/MailScanner/MailScanner/{} \;
 	#
-	# Step 5: Install Start/Stop scripts
-	#
-	${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
-		${PREFIX}/etc/rc.d/mailscanner.sh.sample
-	${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
-	#
 	# Step 6: Docs & Manpages
 	#
+	# Manpage
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
-	cd ${WRKSRC}/docs && \
-		${FIND} * -type d -exec ${MKDIR} ${DOCSDIR}/{} \; && \
-		${FIND} * -type f ! -name "*.orig" -exec \
-			${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.endif
-	cd ${WRKSRC}/docs/man && \
-		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
-		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 	# Sophos install script
 	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
+.endif
+	cd ${FILESDIR} && \
+		${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8
 	${PERL} -pi -e \
 		's,%%LOCALBASE%%,${LOCALBASE},g; \
 		s,%%PREFIX%%,${PREFIX},g;' \
 		${DOCSDIR}/Sophos.install.freebsd
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
-	@${WRKSRC}/bin/upgrade_MailScanner_conf \
+	@${PERL} ${WRKSRC}/bin/upgrade_MailScanner_conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.sample > \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} \
@@ -218,7 +306,7 @@
 	@for LANG_DIR in ${DATADIR}/reports/*; do \
 		if [ -f $${LANG_DIR}/languages.conf ]; then \
 			${ECHO} -n Upgrading $${LANG_DIR}/languages.conf... Please wait...; \
-			${WRKSRC}/bin/upgrade_languages_conf \
+			${PERL} ${WRKSRC}/bin/upgrade_languages_conf \
 				$${LANG_DIR}/languages.conf \
 				$${LANG_DIR}/languages.conf.sample > \
 				$${LANG_DIR}/languages.conf.new.${PORTVERSION} \
@@ -234,15 +322,31 @@
 	done
 	@${CAT} ${PKGMESSAGE}
 
-renew-wrapper: install
+post-install:
+.if defined(WITH_SPAMASSASSIN) && !defined(WITHOUT_SPAMASSASSIN_SYMLINK)
+	@if [ ! -r ${PREFIX}/etc/mail/spamassassin/mailscanner.cf ]; then \
+		${ECHO} ${LN} -s ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ${PREFIX}/etc/mail/spamassassin/mailscanner.cf; \
+		${LN} -s ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ${PREFIX}/etc/mail/spamassassin/mailscanner.cf; \
+	else \
+		${ECHO} "File ${PREFIX}/etc/mail/spamassassin/mailscanner.cf already exists!"; \
+	fi;
+.endif
+	# Display warning about new start/stop scripts
+	@${CAT} ${FILESDIR}/rcwarning.txt
+.if !defined(BATCH)
+	@${ECHO} Press ENTER to continue...
+	@read a
+.endif
+
+renew-wrapper: configure
 	# Renew virus wrapper scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-wrapper ${PREFIX}/libexec/MailScanner
 
-renew-autoupdate: install
+renew-autoupdate: configure
 	# Renew autoupdate scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-autoupdate ${PREFIX}/libexec/MailScanner
 
-renew-reports: install
+renew-reports: configure
 	# Renew reports
 	cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
 		-exec ${INSTALL_DATA} {} ${DATADIR}/reports/en/{}  \;
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner-devel/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	22 Jan 2006 12:50:25 -0000	1.21
+++ distinfo	28 May 2007 14:29:11 -0000
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.45.1-1.tar.gz) = 3fc88ee10dbd010ded7d72877dd7e9d4
-SHA256 (MailScanner-install-4.45.1-1.tar.gz) = da1d9be9c3bd001c579c5e1516fc1935749c489ae8ac70744dd00fda092ca6f1
-SIZE (MailScanner-install-4.45.1-1.tar.gz) = 5423515
+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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner-devel/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist	31 Aug 2005 13:18:44 -0000	1.17
+++ pkg-plist	28 May 2007 14:29:12 -0000
@@ -1,4 +1,5 @@
-@comment $FreeBSD: ports/mail/mailscanner-devel/pkg-plist,v 1.17 2005/08/31 13:18:44 garga Exp $
+@comment $FreeBSD: ports/mail/mailscanner/pkg-plist,v 1.33 2007/02/10 12:56:36 miwi Exp $
+etc/MailScanner/country.domains.conf.sample
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
@@ -11,8 +12,6 @@
 etc/MailScanner/spam.assassin.prefs.conf.sample
 etc/MailScanner/spam.lists.conf.sample
 etc/MailScanner/virus.scanners.conf.sample
-etc/rc.d/mailscanner.sh.sample
-etc/rc.d/mta.sh.sample
 lib/MailScanner/MailScanner.pm
 lib/MailScanner/MailScanner/BinHex.pm
 lib/MailScanner/MailScanner/Config.pm
@@ -22,6 +21,9 @@
 lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
 lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
 lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.pm
+lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
+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/GenericSpam.pm
@@ -51,15 +53,26 @@
 lib/MailScanner/MailScanner/ZMDiskStore.pm
 lib/MailScanner/MailScanner/ZMailer.pm
 lib/MailScanner/MailScanner/notes.txt
-libexec/MailScanner/MailScanner
+libexec/MailScanner/analyse_SpamAssassin_cache
+libexec/MailScanner/clean.SA.cache
+libexec/MailScanner/clean.quarantine
+libexec/MailScanner/update_phishing_sites
+libexec/MailScanner/update_phishing_sites.cron
+libexec/MailScanner/update_virus_scanners
+libexec/MailScanner/update_virus_scanners.cron
+libexec/MailScanner/sa-update.cron
 libexec/MailScanner/antivir-autoupdate.sample
 libexec/MailScanner/antivir-wrapper.sample
+libexec/MailScanner/avast-wrapper.sample
+libexec/MailScanner/avastd-wrapper.sample
+libexec/MailScanner/avast-autoupdate.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/clamd-wrapper.sample
 libexec/MailScanner/command-wrapper.sample
 libexec/MailScanner/css-autoupdate.sample
 libexec/MailScanner/css-wrapper.sample
@@ -94,9 +107,11 @@
 libexec/MailScanner/symscanengine-wrapper.sample
 libexec/MailScanner/trend-autoupdate.sample
 libexec/MailScanner/trend-wrapper.sample
-libexec/MailScanner/update_virus_scanners
 libexec/MailScanner/vexira-autoupdate.sample
 libexec/MailScanner/vexira-wrapper.sample
+sbin/mailscanner
+sbin/MailScanner
+%%DATADIR%%/reports/ca/rejection.report.txt.sample
 %%DATADIR%%/reports/ca/deleted.content.message.txt.sample
 %%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
@@ -120,7 +135,9 @@
 %%DATADIR%%/reports/ca/stored.content.message.txt.sample
 %%DATADIR%%/reports/ca/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ca/stored.virus.message.txt.sample
-@exec mkdir -p %D/%%DATADIR%%/reports/cat
+%%DATADIR%%/reports/ca/deleted.size.message.txt.sample
+%%DATADIR%%/reports/ca/sender.size.report.txt.sample
+%%DATADIR%%/reports/ca/stored.size.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.virus.message.txt.sample
@@ -134,6 +151,7 @@
 %%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
+%%DATADIR%%/reports/cy+en/rejection.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
@@ -144,12 +162,13 @@
 %%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
 %%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cz.tar.gz.sample
+%%DATADIR%%/reports/cy+en/deleted.size.message.txt.sample
+%%DATADIR%%/reports/cy+en/sender.size.report.txt.sample
+%%DATADIR%%/reports/cy+en/stored.size.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.content.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/cz/disinfected.report.txt.sample
-%%DATADIR%%/reports/cz/filename.rules.txt.sample
 %%DATADIR%%/reports/cz/inline.sig.html.sample
 %%DATADIR%%/reports/cz/inline.sig.txt.sample
 %%DATADIR%%/reports/cz/inline.spam.warning.txt.sample
@@ -159,6 +178,7 @@
 %%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/cz/sender.content.report.txt.sample
+%%DATADIR%%/reports/cz/rejection.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
@@ -169,6 +189,9 @@
 %%DATADIR%%/reports/cz/stored.content.message.txt.sample
 %%DATADIR%%/reports/cz/stored.filename.message.txt.sample
 %%DATADIR%%/reports/cz/stored.virus.message.txt.sample
+%%DATADIR%%/reports/cz/deleted.size.message.txt.sample
+%%DATADIR%%/reports/cz/sender.size.report.txt.sample
+%%DATADIR%%/reports/cz/stored.size.message.txt.sample
 %%DATADIR%%/reports/de/README.1ST.sample
 %%DATADIR%%/reports/de/deleted.content.message.txt.sample
 %%DATADIR%%/reports/de/deleted.filename.message.txt.sample
@@ -183,6 +206,7 @@
 %%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/de/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/de/sender.content.report.txt.sample
+%%DATADIR%%/reports/de/rejection.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
@@ -193,6 +217,9 @@
 %%DATADIR%%/reports/de/stored.content.message.txt.sample
 %%DATADIR%%/reports/de/stored.filename.message.txt.sample
 %%DATADIR%%/reports/de/stored.virus.message.txt.sample
+%%DATADIR%%/reports/de/deleted.size.message.txt.sample
+%%DATADIR%%/reports/de/sender.size.report.txt.sample
+%%DATADIR%%/reports/de/stored.size.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.content.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
@@ -206,6 +233,7 @@
 %%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/dk/sender.content.report.txt.sample
+%%DATADIR%%/reports/dk/rejection.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
@@ -216,6 +244,9 @@
 %%DATADIR%%/reports/dk/stored.content.message.txt.sample
 %%DATADIR%%/reports/dk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/dk/stored.virus.message.txt.sample
+%%DATADIR%%/reports/dk/deleted.size.message.txt.sample
+%%DATADIR%%/reports/dk/sender.size.report.txt.sample
+%%DATADIR%%/reports/dk/stored.size.message.txt.sample
 %%DATADIR%%/reports/en/deleted.content.message.txt.sample
 %%DATADIR%%/reports/en/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/en/deleted.virus.message.txt.sample
@@ -229,6 +260,7 @@
 %%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/en/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/en/sender.content.report.txt.sample
+%%DATADIR%%/reports/en/rejection.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
@@ -239,6 +271,9 @@
 %%DATADIR%%/reports/en/stored.content.message.txt.sample
 %%DATADIR%%/reports/en/stored.filename.message.txt.sample
 %%DATADIR%%/reports/en/stored.virus.message.txt.sample
+%%DATADIR%%/reports/en/deleted.size.message.txt.sample
+%%DATADIR%%/reports/en/sender.size.report.txt.sample
+%%DATADIR%%/reports/en/stored.size.message.txt.sample
 %%DATADIR%%/reports/es/deleted.content.message.txt.sample
 %%DATADIR%%/reports/es/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/es/deleted.virus.message.txt.sample
@@ -251,6 +286,7 @@
 %%DATADIR%%/reports/es/languages.conf.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
@@ -262,6 +298,9 @@
 %%DATADIR%%/reports/es/stored.content.message.txt.sample
 %%DATADIR%%/reports/es/stored.filename.message.txt.sample
 %%DATADIR%%/reports/es/stored.virus.message.txt.sample
+%%DATADIR%%/reports/es/deleted.size.message.txt.sample
+%%DATADIR%%/reports/es/sender.size.report.txt.sample
+%%DATADIR%%/reports/es/stored.size.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.content.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
@@ -274,6 +313,7 @@
 %%DATADIR%%/reports/fr/languages.conf.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
@@ -285,6 +325,9 @@
 %%DATADIR%%/reports/fr/stored.content.message.txt.sample
 %%DATADIR%%/reports/fr/stored.filename.message.txt.sample
 %%DATADIR%%/reports/fr/stored.virus.message.txt.sample
+%%DATADIR%%/reports/fr/deleted.size.message.txt.sample
+%%DATADIR%%/reports/fr/sender.size.report.txt.sample
+%%DATADIR%%/reports/fr/stored.size.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.content.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
@@ -297,6 +340,7 @@
 %%DATADIR%%/reports/hu/languages.conf.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
@@ -308,6 +352,9 @@
 %%DATADIR%%/reports/hu/stored.content.message.txt.sample
 %%DATADIR%%/reports/hu/stored.filename.message.txt.sample
 %%DATADIR%%/reports/hu/stored.virus.message.txt.sample
+%%DATADIR%%/reports/hu/deleted.size.message.txt.sample
+%%DATADIR%%/reports/hu/sender.size.report.txt.sample
+%%DATADIR%%/reports/hu/stored.size.message.txt.sample
 %%DATADIR%%/reports/it/deleted.content.message.txt.sample
 %%DATADIR%%/reports/it/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/it/deleted.virus.message.txt.sample
@@ -320,6 +367,7 @@
 %%DATADIR%%/reports/it/languages.conf.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
@@ -331,6 +379,9 @@
 %%DATADIR%%/reports/it/stored.content.message.txt.sample
 %%DATADIR%%/reports/it/stored.filename.message.txt.sample
 %%DATADIR%%/reports/it/stored.virus.message.txt.sample
+%%DATADIR%%/reports/it/deleted.size.message.txt.sample
+%%DATADIR%%/reports/it/sender.size.report.txt.sample
+%%DATADIR%%/reports/it/stored.size.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.content.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
@@ -343,6 +394,7 @@
 %%DATADIR%%/reports/nl/languages.conf.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
@@ -354,6 +406,9 @@
 %%DATADIR%%/reports/nl/stored.content.message.txt.sample
 %%DATADIR%%/reports/nl/stored.filename.message.txt.sample
 %%DATADIR%%/reports/nl/stored.virus.message.txt.sample
+%%DATADIR%%/reports/nl/deleted.size.message.txt.sample
+%%DATADIR%%/reports/nl/sender.size.report.txt.sample
+%%DATADIR%%/reports/nl/stored.size.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.virus.message.txt.sample
@@ -366,6 +421,7 @@
 %%DATADIR%%/reports/pt_br/languages.conf.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
@@ -377,6 +433,9 @@
 %%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
 %%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
 %%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
+%%DATADIR%%/reports/pt_br/deleted.size.message.txt.sample
+%%DATADIR%%/reports/pt_br/sender.size.report.txt.sample
+%%DATADIR%%/reports/pt_br/stored.size.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.content.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
@@ -389,6 +448,7 @@
 %%DATADIR%%/reports/ro/languages.conf.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
@@ -400,6 +460,9 @@
 %%DATADIR%%/reports/ro/stored.content.message.txt.sample
 %%DATADIR%%/reports/ro/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ro/stored.virus.message.txt.sample
+%%DATADIR%%/reports/ro/deleted.size.message.txt.sample
+%%DATADIR%%/reports/ro/sender.size.report.txt.sample
+%%DATADIR%%/reports/ro/stored.size.message.txt.sample
 %%DATADIR%%/reports/se/README.sample
 %%DATADIR%%/reports/se/deleted.content.message.txt.sample
 %%DATADIR%%/reports/se/deleted.filename.message.txt.sample
@@ -413,6 +476,7 @@
 %%DATADIR%%/reports/se/languages.conf.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
@@ -424,6 +488,9 @@
 %%DATADIR%%/reports/se/stored.content.message.txt.sample
 %%DATADIR%%/reports/se/stored.filename.message.txt.sample
 %%DATADIR%%/reports/se/stored.virus.message.txt.sample
+%%DATADIR%%/reports/se/deleted.size.message.txt.sample
+%%DATADIR%%/reports/se/sender.size.report.txt.sample
+%%DATADIR%%/reports/se/stored.size.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.content.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
@@ -436,6 +503,7 @@
 %%DATADIR%%/reports/sk/languages.conf.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
@@ -447,127 +515,18 @@
 %%DATADIR%%/reports/sk/stored.content.message.txt.sample
 %%DATADIR%%/reports/sk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%PORTDOCS%%%%DOCSDIR%%/Book.Dec04-Aug05.pdf
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/FreeBSD.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%DATADIR%%/reports/sk/deleted.size.message.txt.sample
+%%DATADIR%%/reports/sk/sender.size.report.txt.sample
+%%DATADIR%%/reports/sk/stored.size.message.txt.sample
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.port
+%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
-%%PORTDOCS%%%%DOCSDIR%%/MailScannerFlyer.pdf
-%%PORTDOCS%%%%DOCSDIR%%/QuickInstall.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
-%%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
-%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
-%%PORTDOCS%%%%DOCSDIR%%/building.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs.html
-%%PORTDOCS%%%%DOCSDIR%%/donations.shtml
-%%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
-%%PORTDOCS%%%%DOCSDIR%%/downloads.shtml
-%%PORTDOCS%%%%DOCSDIR%%/ecs.css
-%%PORTDOCS%%%%DOCSDIR%%/ellen2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/faq.shtml
-%%PORTDOCS%%%%DOCSDIR%%/images/JulianField1_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/bigmailscannerlogo.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/smallmailscannerlogo.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField3.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField4.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField5.jpg
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.new.html
-%%PORTDOCS%%%%DOCSDIR%%/index.old.html
-%%PORTDOCS%%%%DOCSDIR%%/install/ClamAVModule.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/OS-virus-scan-web.htm
-%%PORTDOCS%%%%DOCSDIR%%/install/README.trend
-%%PORTDOCS%%%%DOCSDIR%%/install/SAVI.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/codestatus.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/conf.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/exim-old.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/exim.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/filesnscripts.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/gcc.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/index.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/linux.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/mailscanner.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/mcafee.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.61
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.63
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.3
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.4
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.3
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.4
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.61
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.63
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.3
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.4
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
-%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/install/tcp
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch3.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch4.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/osborne.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/other.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/perl.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/postfix.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/sendmail.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/solaris9.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/sophos.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/spamassassin.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/tnef.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/zmailer.shtml
-%%PORTDOCS%%%%DOCSDIR%%/introduction.shtml
-%%PORTDOCS%%%%DOCSDIR%%/last-spam-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/mailscanner_trans.gif
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8.html
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/mrtg.shtml
-%%PORTDOCS%%%%DOCSDIR%%/newinv4.shtml
-%%PORTDOCS%%%%DOCSDIR%%/nextversion.shtml
-%%PORTDOCS%%%%DOCSDIR%%/oldnews.shtml
-%%PORTDOCS%%%%DOCSDIR%%/osdir.png
-%%PORTDOCS%%%%DOCSDIR%%/performance.shtml
-%%PORTDOCS%%%%DOCSDIR%%/phishing3.png
-%%PORTDOCS%%%%DOCSDIR%%/phishingcartoon.gif
-%%PORTDOCS%%%%DOCSDIR%%/poetry.shtml
-%%PORTDOCS%%%%DOCSDIR%%/poweredby.google.gif
-%%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif
-%%PORTDOCS%%%%DOCSDIR%%/phishing.html
-%%PORTDOCS%%%%DOCSDIR%%/phishing.jpg
-%%PORTDOCS%%%%DOCSDIR%%/phishing2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/phishingnet.info/index.html
-%%PORTDOCS%%%%DOCSDIR%%/phishingnet.info/PhishingNet.gif
-%%PORTDOCS%%%%DOCSDIR%%/pressreleases.html
-%%PORTDOCS%%%%DOCSDIR%%/presentations.html
-%%PORTDOCS%%%%DOCSDIR%%/press.html
-%%PORTDOCS%%%%DOCSDIR%%/qmail/qmail-queue.zip
-%%PORTDOCS%%%%DOCSDIR%%/readme.shtml
-%%PORTDOCS%%%%DOCSDIR%%/reject.html
-%%PORTDOCS%%%%DOCSDIR%%/sobig.html
-%%PORTDOCS%%%%DOCSDIR%%/store.html
-%%PORTDOCS%%%%DOCSDIR%%/support.html
-%%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/users.shtml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/qmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/tcp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/mcp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/phishingnet.info
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%SPAMASSASSIN%%%%SPAMASSASSIN_SYMLINK%%@exec [ -e %D/etc/mail/spamassassin/mailscanner.cf ] ||  ln -s %D/etc/MailScanner/spam.assassin.prefs.conf %D/etc/mail/spamassassin/mailscanner.cf
+%%SPAMASSASSIN%%%%SPAMASSASSIN_SYMLINK%%@unexec [ -L %D/etc/mail/spamassassin/mailscanner.cf ] &&  rm -f %D/etc/mail/spamassassin/mailscanner.cf
 @dirrm %%DATADIR%%/reports/sk
 @dirrm %%DATADIR%%/reports/se
 @dirrm %%DATADIR%%/reports/ro
@@ -582,7 +541,6 @@
 @dirrm %%DATADIR%%/reports/de
 @dirrm %%DATADIR%%/reports/cz
 @dirrm %%DATADIR%%/reports/cy+en
-@dirrm %%DATADIR%%/reports/cat
 @dirrm %%DATADIR%%/reports/ca
 @dirrm %%DATADIR%%/reports
 @dirrm %%DATADIR%%
Index: files/MailScanner.8
===================================================================
RCS file: files/MailScanner.8
diff -N files/MailScanner.8
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/MailScanner.8	28 May 2007 14:29:12 -0000
@@ -0,0 +1,12 @@
+.TH "MailScanner" "8" "4.52.2" "Julian Field" "Mail"
+.SH "NAME"
+.LP 
+MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
+.SH "SEE ALSO"
+.LP 
+Please see http://www.mailscanner.info for current documentation. All current configuration options can be found at 
+.br 
+
+.br 
+http://www.mailscanner.info/MailScanner.conf.index.html
+
Index: files/README.FreeBSD.port
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner-devel/files/README.FreeBSD.port,v
retrieving revision 1.3
diff -u -r1.3 README.FreeBSD.port
--- files/README.FreeBSD.port	14 Jul 2004 08:58:35 -0000	1.3
+++ files/README.FreeBSD.port	28 May 2007 14:29:12 -0000
@@ -1,17 +1,14 @@
 The MailScanner port is using the original MailScanner tarball from 
-www.mailscanner.info. This tarball puts all the MailScanner files in 
-subdirectories
+www.mailscanner.info. Unfortunatly the tarball consists of MailScanner
+and perl modules etc. MailScanner depends on. The port is not using
+Julians install.sh or the provided modules. All modules that MailScanner
+depends on are installed via ports as well.
 
-bin	MailScanner binary / MailScanner start script etc.
-etc	MailScanner config files / rules / report templates
-lib	Virus wrapper and autoupdate scripts / MailScanner Perl libraries
-docs	Documentation
-var	pid file
-
-In order to make this FreeBSD compliant the port installs those files
+In order to make the installation FreeBSD compliant the port installs files
 in the following directories:
 
-/usr/local/libexec/MailScanner	MailScanner binary, virus wrapper/autoupdate
+/usr/local/sbin			MailScanner binary
+/usr/local/libexec/MailScanner	virus wrapper/autoupdate, cron-scripts etc.
 /usr/local/lib/MailScanner	MailScanner Perl libraries
 /usr/local/share/MailScanner	MailScanner report templates
 /usr/local/share/doc/MailScanner	Documentation
@@ -20,22 +17,23 @@
 
 The port installs two start/stop scripts in /usr/local/etc/rc.d:
 
-mailscanner.sh.sample
-mta.sh.sample
+mailscanner.sh
+mta.sh
 
-My suggestion is to use these scripts instead of the usual FreeBSD MTA startup
+My suggestion is to use mta.sh instead of the usual FreeBSD MTA startup
 process. This of course means that you will have to disable MTA startup 
 in rc.conf completely. Put this in your rc.conf:
 
 sendmail_enable="NONE"
 
-Then adjust sendmail.sh or exim.sh to your configuration. Have a look at the
-MailScanner manpage for MTA setup hints.
+Please have a look at the provided start scripts for settings you have to
+make in rc.conf.
 
 When upgrading the port it will try to look for new options/variables in
 MailScanner.conf using Julians upgrade_MailScanner_conf script. If it finds
 changes it will create a newly merged MailScanner.conf and copy it to
-/usr/local/etc/MailScanner/MailScanner.conf.new.PORTVERSION.
+/usr/local/etc/MailScanner/MailScanner.conf.new.PORTVERSION. Moreover the 
+port will try to update all your languages conf files.
 
 
 If you have suggestions for this port please let me know and drop me an e-mail at
Index: files/Sophos.install.freebsd
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner-devel/files/Sophos.install.freebsd,v
retrieving revision 1.3
diff -u -r1.3 Sophos.install.freebsd
--- files/Sophos.install.freebsd	31 Jan 2004 23:54:55 -0000	1.3
+++ files/Sophos.install.freebsd	28 May 2007 14:29:12 -0000
@@ -1,6 +1,6 @@
 !%%LOCALBASE%%/bin/bash
 #
-# $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
+# $Id: Sophos.install.freebsd,v 1.3 2004/01/31 23:43:16 sergei Exp $
 #
 # Run this script to install Sophos in the right place, with the right
 # options for the MailScanner.
Index: files/mailscanner.in
===================================================================
RCS file: files/mailscanner.in
diff -N files/mailscanner.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/mailscanner.in	28 May 2007 14:29:12 -0000
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+# PROVIDE: mailscanner
+# REQUIRE: mta
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable mailscanner:
+# mailscanner_enable (bool):      Set to "NO" by default.
+#                                 Set it to "YES" to enable mailscanner
+# mailscanner_configfile (path):  Set to "%%PREFIX%%/etc/MailScanner/MailScanner.conf" by default.
+# mailscanner_pidfile (path):     Set to "/var/run/MailScanner.pid" by default.
+#
+
+. %%RC_SUBR%%
+
+name="mailscanner"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${mailscanner_enable="NO"}
+: ${mailscanner_configfile="%%PREFIX%%/etc/MailScanner/MailScanner.conf"}
+: ${mailscanner_pidfile="/var/run/MailScanner.pid"}
+
+command="%%PREFIX%%/sbin/mailscanner"
+pidfile=${mailscanner_pidfile}
+command_args="${mailscanner_configfile}"
+
+required_files="${mailscanner_configfile}"
+
+_ms_start_precmd() {
+	# Quietly try to raise the open_files limit
+	#
+	ulimit -n 2000 >/dev/null 2>&1
+}
+
+start_precmd=_ms_start_precmd
+
+procname="MailScanner"
+
+run_rc_command "$1"
+
Index: files/mailscanner.sh
===================================================================
RCS file: files/mailscanner.sh
diff -N files/mailscanner.sh
--- files/mailscanner.sh	18 Jan 2004 22:04:06 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-msbindir=/usr/local/libexec/MailScanner
-process=MailScanner
-config=/usr/local/etc/MailScanner/MailScanner.conf
-PIDFILE=/var/run/MailScanner.pid
-
-start_ms()
-{
-    pid=`ps -axww |
-         grep '[ ]'$msbindir/$process |
-         awk '{print $1}'`
-
-    if [ "x$pid" = "x" ]; then
-	# Quietly try to raise the open_files limit
-	ulimit -n 2000 >/dev/null 2>&1
-	# Restart it
-	PATH=${msbindir}:$PATH
-	echo Starting MailScanner...
-	cd $msbindir
-	$process $config
-    else
-	echo MailScanner running with pid $pid  
-    fi
-}
-
-stop_ms()
-{
-    echo Stopping MailScanner...
-    kill -TERM -- -`cat $PIDFILE` 2>/dev/null
-    sleep 5
-}
-
-_action=${1:-start}
-
-case ${_action} in
-start)
-	start_ms
-	;;
-
-stop)
-	stop_ms
-	;;
-
-restart)
-	stop_ms
-	start_ms
-	;;
-
-*)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
-	exit 64
-	;;
-esac
-exit 0
Index: files/mta.in
===================================================================
RCS file: files/mta.in
diff -N files/mta.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/mta.in	28 May 2007 14:29:12 -0000
@@ -0,0 +1,151 @@
+#!/bin/sh
+#
+# mta.sh - start multiple MTA instances, e.g. for MailScanner
+
+# PROVIDE: mta
+# REQUIRE: LOGIN cleanvar
+# BEFORE:
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable mta at boot-up time:
+# mta_enable (bool):      Set to "NO" by default.
+#                         Set it to "YES" to enable mta
+# mta_type (str):         Type of MTA (sendmail, exim, unknown), defaults to "sendmail"
+# mta_profiles (string):  Undefined by default. Define your profiles here.
+# mta_flags (str):        Set to "" by default.
+#                         Extra flags passed to start command.
+# mta_program (str):      Path to program, defaults depending on $mta_type
+#			  either to "/usr/sbin/sendmail" or "/usr/local/sbin/exim"
+# mta_configfile (str):   Config file, defaults depending on $mta_type either
+#			  to "/etc/mail/sendmail.cf" or "/usr/local/etc/exim/configure"
+# mta_pidfile (str):      PID file, defaults depending on $mta_type either
+#			  to "/var/run/sendmail.pid" or "/var/run/exim.pid"
+#
+#
+# ATTENTION: All of the above entries are necessary in order for mta.sh to work correctly!
+#
+
+#
+# Examples:
+#
+# Exim, 2 instances (for MailScanner):
+#
+# mta_enable="YES"
+# mta_type="exim"
+# mta_profiles="incoming outgoing"
+# mta_incoming_configfile="/usr/local/etc/exim/configure.in"
+# mta_incoming_flags="-bd"
+# mta_incoming_pidfile="/var/run/exim_in.pid"
+# mta_outgoing_configfile="/usr/local/etc/exim/configure.out"
+# mta_outgoing_flags="-q15m"
+# mta_outgoing_pidfile="/var/run/exim_out.pid"
+#
+# Sendmail, 3 instances (for MailScanner):
+#
+# mta_enable="YES"
+# mta_type="sendmail"
+# mta_profiles="incoming outgoing submitqueue"
+# mta_incoming_flags="-L sm-mta-in -bd -OPrivacyOptions=noetrn -OQueueDirectory=/var/spool/mqueue.in -ODeliveryMode=queueonly"
+# mta_incoming_pidfile="/var/run/sendmail_in.pid"
+# mta_incoming_configfile="/etc/mail/sendmail.cf"
+# mta_outgoing_flags="-L sm-mta-out -q15m"
+# mta_outgoing_pidfile="/var/run/sendmail_out.pid"
+# mta_outgoing_configfile="/etc/mail/sendmail.cf"
+# mta_submitqueue_flags="-L sm-msp-queue -Ac -q15m"
+# mta_submitqueue_pidfile="/var/spool/clientmqueue/sm-client.pid"
+# mta_submitqueue_configfile="/etc/mail/submit.cf"
+
+PATH=$PATH:/sbin:/usr/sbin; export PATH
+
+. %%RC_SUBR%%
+
+name="mta"
+rcvar=`set_rcvar`
+
+_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%"
+
+load_rc_config $name
+
+: ${mta_enable="NO"}
+: ${mta_type="sendmail"}
+: ${mta_flags=""}
+
+case "${mta_type}" in
+
+	sendmail)
+		_mta_program="/usr/sbin/sendmail"
+		_mta_configfile="/etc/mail/sendmail.cf"
+		_mta_pidfile="/var/run/sendmail.pid"
+		;;
+
+	exim)
+		_mta_program="/usr/local/sbin/exim"
+		_mta_configfile="/usr/local/etc/exim/configure"
+		_mta_pidfile="/var/run/exim.pid"
+		;;
+esac
+
+: ${mta_program=${_mta_program}}
+: ${mta_configfile=${_mta_configfile}}
+: ${mta_pidfile=${_mta_pidfile}}
+
+# support SIGHUP to reparse configuration file
+extra_commands="reload"
+
+# command and arguments
+command="${mta_program}"
+
+if [ -n "${2}" -o -n "$profile" ]; then
+	profile=${profile-$2}
+	export profile
+	if [ "x${mta_profiles}" != "x" ]; then
+		eval mta_configfile=\${mta_${profile}_configfile}
+		[ "x${mta_configfile}" = "x" ] && {
+			echo "You must define a configuration file (mta_${profile}_configfile)"
+			exit 1
+		}
+		eval mta_enable=\${mta_${profile}_enable:-YES}
+		eval mta_flags=\${mta_${profile}_flags:-${mta_flags}}
+		eval mta_configfile=\${mta_${profile}_configfile:-${mta_configfile}}
+		eval mta_pidfile=\${mta_${profile}_pidfile:-${mta_pidfile}}
+		pidfile="${_pidprefix}.${profile}.pid"
+	else
+		echo "$_mta_rc_script: extra argument ignored"
+	fi
+else
+	if [ "x${mta_profiles}" != "x" ]; then
+	for profile in ${mta_profiles}; do
+		echo "===> mta profile: ${profile}"
+		$_mta_rc_script $1 $profile
+		retcode=$?
+		if [ "$?" -ne 0 ]; then
+			failed="${profile} ({$retcode}) ${failed}"
+		else
+			success="${profile} ${success}"
+		fi
+	done
+	exit 0
+	fi
+fi
+
+
+pidfile=${mta_pidfile}
+required_files="${mta_configfile}"
+
+# select correct command arguments
+case "${mta_type}" in
+
+	sendmail)
+		command_args="-C'${mta_configfile}' -OPidFile='${pidfile}'"
+		;;
+
+	exim)
+		command_args="-C '${mta_configfile}' -oP '${pidfile}'"
+		;;
+
+	*)
+		command_args=""
+		;;
+esac
+run_rc_command "$1"
Index: files/mta.sh
===================================================================
RCS file: files/mta.sh
diff -N files/mta.sh
--- files/mta.sh	28 Jul 2004 17:54:28 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-outgoing_queue_time=15m
-mta=sendmail
-
-case "$mta" in
-	exim)
-		program=/usr/local/sbin/exim
-
-		if [ -f /usr/local/etc/exim/configure.in ]; then
-			incoming_config=/usr/local/etc/exim/configure.in
-		else
-			incoming_config=/usr/local/etc/exim/configure
-		fi
-
-		outgoing_config=/usr/local/etc/exim/configure.out
-
-		inpidfile=/var/run/exim_in.pid
-		outpidfile=/var/run/exim_out.pid
-		subpidfile=
-
-		incoming_args="-C ${incoming_config} -oP ${inpidfile} -bd"
-		outgoing_args="-C ${outgoing_config} -oP ${outpidfile} -q${outgoing_queue_time}"
-		submitqueue_args=
-		;;
-
-	sendmail)
-		program=/usr/sbin/sendmail
-
-		incoming_queue=/var/spool/mqueue.in
-
-		submit_queue_time=${outgoing_queue_time}
-
-		inpidfile=/var/run/sendmail_in.pid
-		outpidfile=/var/run/sendmail_out.pid
-		subpidfile=/var/spool/clientmqueue/sm-client.pid
-
-		incoming_args="-L sm-mta-in -bd \
-				-OPrivacyOptions=noetrn \
-				-OQueueDirectory=${incoming_queue} \
-				-ODeliveryMode=queueonly \
-				-OPidFile=${inpidfile}"
-		outgoing_args="-L sm-mta-out -q${outgoing_queue_time} \
-				-OPidFile=${outpidfile}"
-		submitqueue_args="-L sm-msp-queue -Ac -q${submit_queue_time} \
-				-OPidFile=${subpidfile}"
-		;;
-
-	*)
-		echo "ERROR: I don't know the MTA '$mta'. Check your settings." >&2
-		exit 2
-		;;
-esac
-
-start_mta()
-{
-	echo -n " `basename ${program}`(incoming)"
-	${program} ${incoming_args}
-
-	echo -n " `basename ${program}`(outgoing)"
-	${program} ${outgoing_args}
-}
-
-start_mspq ()
-{
-	if [ "${submitqueue_args}" ]; then
-		echo -n " `basename ${program}`(submitqueue)"
-		${program} ${submitqueue_args}
-	fi
-}
-
-stop_mta()
-{
-	echo "Stopping `basename ${program}` (incoming)"
-	kill -TERM `head -1 ${inpidfile}` 2>/dev/null
-
-	echo "Stopping `basename ${program}` (outgoing)"
-	kill -TERM `head -1 ${outpidfile}` 2>/dev/null
-}
-
-stop_mspq ()
-{
-	if [ "${submitqueue_args}" ]; then
-		echo "Stopping `basename ${program}` (submitqueue)"
-		kill -TERM `head -1 ${subpidfile}` 2>/dev/null
-	fi
-}
-
-
-_action=${1:-start}
-
-case ${_action} in
-start)
-        start_mta
-	start_mspq
-        ;;
-
-stop)
-        stop_mta
-	stop_mspq
-        ;;
-
-restart)
-	stop_mta
-	stop_mspq
-	sleep 5
-	start_mta
-	start_mspq
-	;;
-
-*)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
-	exit 64
-	;;
-esac
-exit 0
-
Index: files/patch-bin-cron-sa-update.cron
===================================================================
RCS file: files/patch-bin-cron-sa-update.cron
diff -N files/patch-bin-cron-sa-update.cron
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-bin-cron-sa-update.cron	28 May 2007 14:29:12 -0000
@@ -0,0 +1,41 @@
+--- ../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
++
++. %%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
Index: files/patch-bin-cron-update_phishing_sites.cron
===================================================================
RCS file: files/patch-bin-cron-update_phishing_sites.cron
diff -N files/patch-bin-cron-update_phishing_sites.cron
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-bin-cron-update_phishing_sites.cron	28 May 2007 14:29:12 -0000
@@ -0,0 +1,38 @@
+--- ../MailScanner-install-4.50.15.orig/bin/cron/update_phishing_sites.cron	Wed Feb 15 20:02:33 2006
++++ bin/cron/update_phishing_sites.cron	Wed Feb 15 20:14:45 2006
+@@ -1,20 +1,24 @@
+ #!/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
+-if [ -f /etc/sysconfig/MailScanner ] ; then
+-        . /etc/sysconfig/MailScanner
+-fi
+-export UPDATEMAXDELAY
++# 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
++
++. %%RC_SUBR%%
++
++name="mailscanner"
++rcvar=`set_rcvar`
++
++load_rc_config $name
++
++: ${mailscanner_updatemaxdelay="600"}
+ 
+ [ -x /opt/MailScanner/bin/update_phishing_sites ] || exit 0
+-if [ "x$UPDATEMAXDELAY" = "x0" ]; then
++if [ "x${mailscanner_updatemaxdelay}" = "x0" ]; then
+   :
+ else
+-  logger -p mail.info -t update.phishing.sites Delaying cron job up to $UPDATEMAXDELAY seconds
+-  perl -e "sleep int(rand($UPDATEMAXDELAY));"
++  logger -p mail.info -t update.phishing.sites Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
++  perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
+ fi
+ exec /opt/MailScanner/bin/update_phishing_sites > /dev/null 2>&1
+ exit 0
Index: files/patch-bin-cron-update_virus_scanners.cron
===================================================================
RCS file: files/patch-bin-cron-update_virus_scanners.cron
diff -N files/patch-bin-cron-update_virus_scanners.cron
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-bin-cron-update_virus_scanners.cron	28 May 2007 14:29:12 -0000
@@ -0,0 +1,38 @@
+--- ../MailScanner-install-4.50.15.orig/bin/cron/update_virus_scanners.cron	Wed Feb 15 20:02:33 2006
++++ bin/cron/update_virus_scanners.cron	Wed Feb 15 20:11:17 2006
+@@ -1,20 +1,24 @@
+ #!/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=600
+-if [ -f /etc/sysconfig/MailScanner ] ; then
+-        . /etc/sysconfig/MailScanner
+-fi
+-export UPDATEMAXDELAY
++# 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
++
++. %%RC_SUBR%%
++
++name="mailscanner"
++rcvar=`set_rcvar`
++
++load_rc_config $name
++
++: ${mailscanner_updatemaxdelay="600"}
+ 
+ [ -x /opt/MailScanner/bin/update_virus_scanners ] || exit 0
+-if [ "x$UPDATEMAXDELAY" = "x0" ]; then
++if [ "x${mailscanner_updatemaxdelay}" = "x0" ]; then
+   :
+ else
+-  logger -p mail.info -t update.virus.scanners Delaying cron job up to $UPDATEMAXDELAY seconds
+-  perl -e "sleep int(rand($UPDATEMAXDELAY));"
++  logger -p mail.info -t update.virus.scanners Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
++  perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
+ fi
+ exec /opt/MailScanner/bin/update_virus_scanners
+ exit 0
Index: files/patch-docs:man:MailScanner.8
===================================================================
RCS file: files/patch-docs:man:MailScanner.8
diff -N files/patch-docs:man:MailScanner.8
--- files/patch-docs:man:MailScanner.8	31 Aug 2005 13:18:44 -0000	1.20
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
---- ../MailScanner-install-4.45.1.orig/docs/man/MailScanner.8	Thu Aug 25 11:41:50 2005
-+++ docs/man/MailScanner.8	Thu Aug 25 11:47:48 2005
-@@ -1,4 +1,4 @@
--.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.45.1" "Julian Field" "Mail"
- .SH "NAME"
- .LP 
- MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
Index: files/patch-docs:man:MailScanner.8.html
===================================================================
RCS file: files/patch-docs:man:MailScanner.8.html
diff -N files/patch-docs:man:MailScanner.8.html
--- files/patch-docs:man:MailScanner.8.html	31 Aug 2005 13:18:44 -0000	1.16
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
---- ../MailScanner-install-4.45.1.orig/docs/man/MailScanner.8.html	Thu Aug 25 11:41:50 2005
-+++ docs/man/MailScanner.8.html	Thu Aug 25 11:47:51 2005
-@@ -1,5 +1,5 @@
- <!-- Creator     : groff version 1.19 -->
--<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
-+<!-- CreationDate: Thu Aug 25 11:47:32 2005 -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">;
- <html>
Index: files/patch-docs:man:MailScanner.conf.5
===================================================================
RCS file: files/patch-docs:man:MailScanner.conf.5
diff -N files/patch-docs:man:MailScanner.conf.5
--- files/patch-docs:man:MailScanner.conf.5	31 Aug 2005 13:18:44 -0000	1.20
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,110 +0,0 @@
---- ../MailScanner-install-4.45.1.orig/docs/man/MailScanner.conf.5	Thu Aug 25 11:41:50 2005
-+++ docs/man/MailScanner.conf.5	Thu Aug 25 11:47:54 2005
-@@ -1,4 +1,4 @@
--.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.45.1" "Julian Field" "Mail"
- .SH "NAME"
- .LP 
- MailScanner.conf \- Main configuration for MailScanner
-@@ -326,6 +326,16 @@
- .br 
- If more messages are found in the queue than this, then switch to an "accelerated" mode of processing messages. This will cause it to stop scanning messages in strict date order, but in the order it finds them in the queue. If your queue is bigger than this size a lot of the time, then some messages could be greatly delayed. So treat this option as "in emergency only".
- 
-+
-+.TP 
-+\fBScan Messages\fR
-+Default: yes
-+.br 
-+
-+.br 
-+If this is set to yes, then email messages passing through MailScanner will be processed and checked, and all the other options in this file will be used to control what checks are made on the message. If this is set to no, then email messages will NOT be processed or checked *at all*, and so any viruses or other problems will be ignored.
-+
-+
- .TP 
- \fBMaximum Attachments Per Message\fR
- Default: 200
-@@ -853,6 +863,15 @@
- There is no point quarantining most viruses these days, so if you set this to "no" then no infections listed in your "Silent Viruses" setting will be quarantined, even if you have chosen to quarantine infections in general. This is currently set to "yes" so the behaviour is the same as it was in in previous versions. This can also be the filename of a ruleset.
- 
- .TP 
-+\fBQuarantine Modified Body\fR
-+Default: no
-+.br 
-+
-+.br 
-+Do you want to store copies of messages which have been disarmed by having their HTML modified at all? This can also be the filename of a ruleset.
-+
-+
-+.TP 
- \fBQuarantine Whole Message\fR
- Default: no
- .br 
-@@ -1701,12 +1720,64 @@
- .br 
- 
- .br 
--# The Bayesian database rebuild and expiry may take a 2 or 3 minutes
--# to complete. During this time you can either wait, or simply
--# disable SpamAssassin checks until it has completed.
--WaitDuringBayesRebuild = no
-+The Bayesian database rebuild and expiry may take a 2 or 3 minutes to complete. During this time you can either wait, or simply disable SpamAssassin checks until it has completed.
-+
-+
-+
-+.SH "Custom Spam Scanner Plugin"
-+.TP 
-+\fBUse Custom Spam Scanner\fR
-+Default: no
-+.br 
-+
-+.br 
-+Use the Custom Spam Scanner. This is code you will have to write yourself, a function called "GenericSpamScanner" stored in the file "MailScanner/lib/MailScanner/CustomFunctions/GenericSpamScanner.pm". A sample function is given in the correct file in the distribution. This sample function also includes code to show you how to make it run an external program to produce a spam score. This can also be the filename of a ruleset. The function will be passed
-+.br 
-+.RS 7
-+.IP  \(bu 4
-+$IP		\- the numeric IP address of the system on the remote end of the SMTP connections
-+.IP  \(bu 4
-+$From	\- the address of the envelope sender of the message
-+.IP  \(bu 4
-+$To		\- a perl reference to the envelope recipients of the message
-+.IP  \(bu 4
-+$Message	\- a perl reference to the list of line of the message
-+.RE
-+.br 
-+
-+
-+.TP 
-+\fBMax Custom Spam Scanner Size\fR
-+Default: 20000
-+.br 
-+
-+.br 
-+How much of the message should be passed tot he Custom Spam Scanner. Most spam tools only need the first 20kbytes of the message to determine if it is spam or not. Passing more than is necessary only slows things down. This can also be the filename of a ruleset.
- 
-+.TP 
-+\fBCustom Spam Scanner Timeout\fR
-+Default: 20
-+.br 
- 
-+.br 
-+How long should the custom spam scanner take to run? If it takes more seconds than this, then it should be considered to have crashed and should be killed. This stops denial\-of\-service attacks.
-+
-+
-+.TP 
-+\fBMax Custom Spam Scanner Timeouts\fR
-+Default: 10
-+.br 
-+
-+.br 
-+If the Custom Spam Scanner times out more times in a row than this, then it will be marked as "unavailable" until MailScanner next re\-starts itself.
-+
-+.TP 
-+\fBCustom Spam Scanner Timeout History\fR
-+Default: 20
-+.br 
-+
-+.br 
-+The total number of Custom Spam Scanner attempts during which "Max Custom Spam Scanner Timeouts" will cause the Custom Spam Scanner to be marked as "unavailable". See the previous comment for more information. The default values of 10 and 20 mean that 10 timeouts in any sequence of 20 attempts will trigger the behaviour described above, until the next periodic restart (see "Restart Every").
- .SH "What to do with spam"
- .TP 
- \fBSpam Actions\fR
Index: files/patch-docs:man:MailScanner.conf.5.html
===================================================================
RCS file: files/patch-docs:man:MailScanner.conf.5.html
diff -N files/patch-docs:man:MailScanner.conf.5.html
--- files/patch-docs:man:MailScanner.conf.5.html	31 Aug 2005 13:18:44 -0000	1.17
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,320 +0,0 @@
---- ../MailScanner-install-4.45.1.orig/docs/man/MailScanner.conf.5.html	Thu Aug 25 11:41:50 2005
-+++ docs/man/MailScanner.conf.5.html	Thu Aug 25 11:48:02 2005
-@@ -1,5 +1,5 @@
- <!-- Creator     : groff version 1.19 -->
--<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
-+<!-- CreationDate: Thu Aug 25 11:47:32 2005 -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">;
- <html>
-@@ -34,6 +34,7 @@
- <a href="#Definitions of virus scanners and spam detectors">Definitions of virus scanners and spam detectors</a><br>
- <a href="#Spam detection and spam lists (DNS blocklists)">Spam detection and spam lists (DNS blocklists)</a><br>
- <a href="#SpamAssassin">SpamAssassin</a><br>
-+<a href="#Custom Spam Scanner Plugin">Custom Spam Scanner Plugin</a><br>
- <a href="#What to do with spam">What to do with spam</a><br>
- <a href="#System logging">System logging</a><br>
- <a href="#Advanced SpamAssassin Settings">Advanced SpamAssassin Settings</a><br>
-@@ -953,6 +954,30 @@
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="89%">
-+<p><b>Scan Messages</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: yes</p>
-+<!-- INDENTATION -->
-+<p>If this is set to yes, then email messages passing
-+through MailScanner will be processed and checked, and all
-+the other options in this file will be used to control what
-+checks are made on the message. If this is set to no, then
-+email messages will NOT be processed or checked *at all*,
-+and so any viruses or other problems will be ignored.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
- <p><b>Maximum Attachments Per Message</b></p></td>
- </table>
- <!-- INDENTATION -->
-@@ -2523,6 +2548,27 @@
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="89%">
-+<p><b>Quarantine Modified Body</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: no</p>
-+<!-- INDENTATION -->
-+<p>Do you want to store copies of messages which have been
-+disarmed by having their HTML modified at all? This can also
-+be the filename of a ruleset.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
- <p><b>Quarantine Whole Message</b></p></td>
- </table>
- <!-- INDENTATION -->
-@@ -4909,10 +4955,239 @@
- <td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
--<p># The Bayesian database rebuild and expiry may take a 2
--or 3 minutes # to complete. During this time you can either
--wait, or simply # disable SpamAssassin checks until it has
--completed. WaitDuringBayesRebuild = no</p>
-+<p>The Bayesian database rebuild and expiry may take a 2 or
-+3 minutes to complete. During this time you can either wait,
-+or simply disable SpamAssassin checks until it has
-+completed.</p>
-+</td>
-+</table>
-+<a name="Custom Spam Scanner Plugin"></a>
-+<h2>Custom Spam Scanner Plugin</h2>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Use Custom Spam Scanner</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: no</p>
-+<!-- INDENTATION -->
-+<p>Use the Custom Spam Scanner. This is code you will have
-+to write yourself, a function called
-+&quot;GenericSpamScanner&quot; stored in the file
-+&quot;MailScanner/lib/MailScanner/CustomFunctions/GenericSpamScanner.pm&quot;.
-+A sample function is given in the correct file in the
-+distribution. This sample function also includes code to
-+show you how to make it run an external program to produce a
-+spam score. This can also be the filename of a ruleset. The
-+function will be passed</p>
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="5" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%">
-+
-+<p>&bull;</p>
-+</td>
-+<td width="5%"></td>
-+<td width="4%">
-+
-+<p>$IP</p>
-+</td>
-+<td width="68%">
-+</td>
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%"></td>
-+<td width="5%"></td>
-+<td width="4%">
-+</td>
-+<td width="68%">
-+
-+<p>&minus; the numeric IP address of the system on the
-+remote end of the SMTP connections</p>
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="7" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%">
-+
-+<p>&bull;</p>
-+</td>
-+<td width="5%"></td>
-+<td width="7%">
-+
-+<p>$From</p>
-+</td>
-+<td width="2%"></td>
-+<td width="8%">
-+
-+<p>&minus; the address of the envelope sender of the
-+message</p>
-+</td>
-+<td width="55%">
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="6" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%">
-+
-+<p>&bull;</p>
-+</td>
-+<td width="5%"></td>
-+<td width="9%">
-+
-+<p>$To</p>
-+</td>
-+<td width="8%"></td>
-+<td width="55%">
-+</td>
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%"></td>
-+<td width="5%"></td>
-+<td width="9%">
-+</td>
-+<td width="8%">
-+
-+<p>&minus; a perl reference to the envelope recipients of
-+the message</p>
-+</td>
-+<td width="55%">
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="5" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%">
-+
-+<p>&bull;</p>
-+</td>
-+<td width="5%"></td>
-+<td width="12%">
-+
-+<p>$Message</p>
-+</td>
-+<td width="60%">
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>&minus; a perl reference to the list of line of the
-+message</p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Max Custom Spam Scanner Size</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: 20000</p>
-+<!-- INDENTATION -->
-+<p>How much of the message should be passed tot he Custom
-+Spam Scanner. Most spam tools only need the first 20kbytes
-+of the message to determine if it is spam or not. Passing
-+more than is necessary only slows things down. This can also
-+be the filename of a ruleset.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Custom Spam Scanner Timeout</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: 20</p>
-+<!-- INDENTATION -->
-+<p>How long should the custom spam scanner take to run? If
-+it takes more seconds than this, then it should be
-+considered to have crashed and should be killed. This stops
-+denial&minus;of&minus;service attacks.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Max Custom Spam Scanner Timeouts</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: 10</p>
-+<!-- INDENTATION -->
-+<p>If the Custom Spam Scanner times out more times in a row
-+than this, then it will be marked as &quot;unavailable&quot;
-+until MailScanner next re&minus;starts itself.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Custom Spam Scanner Timeout History</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: 20</p>
-+<!-- INDENTATION -->
-+<p>The total number of Custom Spam Scanner attempts during
-+which &quot;Max Custom Spam Scanner Timeouts&quot; will
-+cause the Custom Spam Scanner to be marked as
-+&quot;unavailable&quot;. See the previous comment for more
-+information. The default values of 10 and 20 mean that 10
-+timeouts in any sequence of 20 attempts will trigger the
-+behaviour described above, until the next periodic restart
-+(see &quot;Restart Every&quot;).</p>
- </td>
- </table>
- <a name="What to do with spam"></a>
Index: files/patch-lib-clamav-wrapper
===================================================================
RCS file: files/patch-lib-clamav-wrapper
diff -N files/patch-lib-clamav-wrapper
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-lib-clamav-wrapper	28 May 2007 14:29:12 -0000
@@ -0,0 +1,40 @@
+--- ../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
+@@ -51,6 +51,9 @@
+ 
+ # You may want to check this script for bash-isms
+ 
++PATH=$PATH:/usr/local/bin
++export PATH
++
+ 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
Index: files/patch-lib:clamav-wrapper
===================================================================
RCS file: files/patch-lib:clamav-wrapper
diff -N files/patch-lib:clamav-wrapper
--- files/patch-lib:clamav-wrapper	2 Mar 2004 17:29:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$FreeBSD: ports/mail/mailscanner-devel/files/patch-lib:clamav-wrapper,v 1.1 2004/03/02 17:29:42 glewis Exp $
-
---- ../MailScanner-4.27.5.orig/lib/clamav-wrapper	Thu Feb 26 15:25:51 2004
-+++ lib/clamav-wrapper	Thu Feb 26 15:26:23 2004
-@@ -51,6 +51,9 @@
- 
- # You may want to check this script for bash-isms
- 
-+PATH=$PATH:/usr/local/bin
-+export PATH
-+
- TempDir="/tmp/clamav.$$"
- ClamUser="clamav"
- ClamGroup="clamav"
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner-devel/files/pkg-message.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-message.in
--- files/pkg-message.in	10 May 2005 17:28:05 -0000	1.1
+++ files/pkg-message.in	28 May 2007 14:29:12 -0000
@@ -31,7 +31,14 @@
 	to update your virus-wrappers, autoupdates, reports and
 	languages.conf
 
+	The english languages.conf is updated automatically. For all
+	other versions use the update_languages_conf tool found
+	in the work directory of this port.
+
 	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
+
 *************************************************************************
Index: files/rcwarning.txt
===================================================================
RCS file: files/rcwarning.txt
diff -N files/rcwarning.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/rcwarning.txt	28 May 2007 14:29:12 -0000
@@ -0,0 +1,18 @@
+*************************************************************************
+	    _  _____ _____ _____ _   _ _____ ___ ___  _   _ 	
+	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |
+	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |
+	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |
+	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|
+							
+
+  The MailScanner port uses new start/stop scripts according to rc.subr 
+  standard. Your old scripts will be overwritten after you press ENTER.
+  To start mailscanner and your mta, please put the correct statements in 
+  your rc.conf. For examples/syntax please look at mailscanner.sh and
+  mta.sh in your rc.d directory.
+
+  Please: Also have a look at CHANGES.port in your MailScanner 
+  doc dir (see above).
+ 
+*************************************************************************
--- MailScanner-devel-4.60.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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