svn commit: r564727 - in head: . mail/mailscanner mail/mailscanner/files

Chris Rees crees at FreeBSD.org
Mon Feb 8 17:01:30 UTC 2021 

Author: crees
Date: Mon Feb  8 17:01:28 2021
New Revision: 564727
URL: https://svnweb.freebsd.org/changeset/ports/564727

Log:
  Update to 5.4.3-3
  
  Several changes in virus detection code
  
  Output to stdout/stderr when running in foreground mode
  
  ... and much more:
  
  https://raw.githubusercontent.com/MailScanner/v5/3c2329/changelog

Deleted:
  head/mail/mailscanner/files/CHANGES.port
Modified:
  head/UPDATING
  head/mail/mailscanner/Makefile
  head/mail/mailscanner/distinfo
  head/mail/mailscanner/files/mailscanner.in
  head/mail/mailscanner/files/mta.in
  head/mail/mailscanner/files/pkg-message.in
  head/mail/mailscanner/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/UPDATING	Mon Feb  8 17:01:28 2021	(r564727)
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20210208:
+  AFFECTS: users of mail/mailscanner
+  AUTHOR: crees at FreeBSD.org
+
+  The clamavmodule has finally been removed after a long deprecation
+  period.  Please remove all references to it in your mailscanner.conf as
+  it will now count as a syntax error and may stop MailScanner starting!
+
 20210204:
   AFFECTS: users of www/unit
   AUTHOR: osa at FreeBSD.org

Modified: head/mail/mailscanner/Makefile
==============================================================================
--- head/mail/mailscanner/Makefile	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/mail/mailscanner/Makefile	Mon Feb  8 17:01:28 2021	(r564727)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	MailScanner
-PORTVERSION=	5.1.2
-PORTREVISION=	3
+DISTVERSION=	5.3.4-3
+DISTVERSIONSUFFIX= .nix
 CATEGORIES=	mail
-MASTER_SITES=	https://s3.amazonaws.com/msv5/release/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix
+MASTER_SITES=	https://github.com/MailScanner/v5/releases/download/${DISTVERSION}/
 
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
@@ -58,13 +57,11 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
-PATCHLEVEL=	1
-
 USES=		perl5 shebangfix
 SHEBANG_GLOB=	* usr/lib/MailScanner/init/* usr/lib/MailScanner/wrapper/* \
 		usr/sbin/* usr/share/MailScanner/perl/MailScanner/*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C,-[0-9]+,,}
 SUB_FILES=	MailScanner.8 pkg-message pkg-install
 SUB_LIST=	DATADIR=${DATADIR} \
 		PERL=${PERL} \
@@ -128,7 +125,8 @@ USE_RC_SUBR=	mailscanner mta
 
 post-patch:
 	${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \
-		${WRKSRC}/usr/lib/MailScanner/wrapper/*-wrapper
+	    ${WRKSRC}/usr/lib/MailScanner/wrapper/bitdefender-wrapper \
+	    ${WRKSRC}/usr/lib/MailScanner/wrapper/clamav-wrapper
 
 do-build:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
@@ -162,7 +160,7 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}/${PREFIX}/sbin)
-	${LN} -sf ${PREFIX}/sbin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner
+	${RLN} ${STAGEDIR}${PREFIX}/sbin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d \
 		${STAGEDIR}${PREFIX}/etc/MailScanner/rules

Modified: head/mail/mailscanner/distinfo
==============================================================================
--- head/mail/mailscanner/distinfo	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/mail/mailscanner/distinfo	Mon Feb  8 17:01:28 2021	(r564727)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540495845
-SHA256 (MailScanner-5.1.2-1.nix.tar.gz) = 086406f8631d5293c533f904ef9ed3de1864df1f1ce6bbbc6f5572d2f6644c1a
-SIZE (MailScanner-5.1.2-1.nix.tar.gz) = 663063
+TIMESTAMP = 1612803181
+SHA256 (MailScanner-5.3.4-3.nix.tar.gz) = bd8b211a4292a4e2a089cb2312dea00e32da3c55af507017c93a1ce8f2ffe505
+SIZE (MailScanner-5.3.4-3.nix.tar.gz) = 661889

Modified: head/mail/mailscanner/files/mailscanner.in
==============================================================================
--- head/mail/mailscanner/files/mailscanner.in	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/mail/mailscanner/files/mailscanner.in	Mon Feb  8 17:01:28 2021	(r564727)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: mailscanner
 # REQUIRE: mta
 # KEYWORD: shutdown
@@ -20,10 +22,11 @@
 
 name="mailscanner"
 rcvar=mailscanner_enable
+desc="Virus and spam filter"
 
 load_rc_config $name
 
-: ${mailscanner_enable="NO"}
+: ${mailscanner_enable:="NO"}
 
 required_files=${mailscanner_configfile:-"%%PREFIX%%/etc/MailScanner/MailScanner.conf"}
 pidfile=${mailscanner_pidfile:-"/var/run/MailScanner.pid"}

Modified: head/mail/mailscanner/files/mta.in
==============================================================================
--- head/mail/mailscanner/files/mta.in	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/mail/mailscanner/files/mta.in	Mon Feb  8 17:01:28 2021	(r564727)
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# $FreeBSD$
+#
 # mta - start multiple MTA instances, e.g. for MailScanner
 
 # PROVIDE: mta mail
@@ -62,13 +64,14 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH
 
 name="mta"
 rcvar=mta_enable
+desc="MailScanner MTA start script"
 
 _mta_rc_script="%%PREFIX%%/etc/rc.d/mta"
 
 load_rc_config $name
 
-: ${mta_enable="NO"}
-: ${mta_type="sendmail"}
+: ${mta_enable:=NO}
+: ${mta_type:=sendmail}
 
 case "${mta_type}" in
 
@@ -100,10 +103,10 @@ if [ -n "${2}" -o -n "$profile" ]; then
 	export profile
 	if [ "x${mta_profiles}" != "x" ]; then
 		eval mta_configfile=\${mta_${profile}_configfile}
-		[ "x${mta_configfile}" = "x" ] && {
+		if [ -z "${mta_configfile}" ]; then
 			echo "You must define a configuration file (mta_${profile}_configfile)"
 			exit 1
-		}
+		fi
 		eval mta_enable=\${mta_${profile}_enable:-YES}
 		eval mta_flags=\${mta_${profile}_flags:-${mta_flags}}
 		eval mta_configfile=\${mta_${profile}_configfile:-${mta_configfile}}

Modified: head/mail/mailscanner/files/pkg-message.in
==============================================================================
--- head/mail/mailscanner/files/pkg-message.in	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/mail/mailscanner/files/pkg-message.in	Mon Feb  8 17:01:28 2021	(r564727)
@@ -1,11 +1,6 @@
 [
 { type: install
   message: <<EOM
-	    _  _____ _____ _____ _   _ _____ ___ ___  _   _
-	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |
-	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |
-	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |
-	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|
 
 	See %%PREFIX%%/share/doc/MailScanner/README.FreeBSD.port,
 	http://www.mailscanner.info, the man pages MailScanner and

Modified: head/mail/mailscanner/pkg-plist
==============================================================================
--- head/mail/mailscanner/pkg-plist	Mon Feb  8 16:52:01 2021	(r564726)
+++ head/mail/mailscanner/pkg-plist	Mon Feb  8 17:01:28 2021	(r564727)
@@ -88,6 +88,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/ca/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/ca/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/ca/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/ca/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/ca/inline.sig.html.sample
 @sample %%DATADIR%%/reports/ca/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/ca/inline.spam.warning.txt.sample
@@ -116,6 +118,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/cy+en/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/cy+en/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/cy+en/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/cy+en/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/cy+en/inline.sig.html.sample
 @sample %%DATADIR%%/reports/cy+en/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/cy+en/inline.spam.warning.txt.sample
@@ -144,6 +148,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/cz/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/cz/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/cz/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/cz/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/cz/inline.sig.html.sample
 @sample %%DATADIR%%/reports/cz/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/cz/inline.spam.warning.txt.sample
@@ -172,6 +178,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/de/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/de/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/de/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/de/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/de/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/de/inline.sig.html.sample
 @sample %%DATADIR%%/reports/de/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/de/inline.spam.warning.txt.sample
@@ -200,6 +208,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/dk/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/dk/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/dk/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/dk/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/dk/inline.sig.html.sample
 @sample %%DATADIR%%/reports/dk/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/dk/inline.spam.warning.txt.sample
@@ -228,6 +238,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/en/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/en/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/en/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/en/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/en/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/en/inline.sig.html.sample
 @sample %%DATADIR%%/reports/en/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/en/inline.spam.warning.txt.sample
@@ -256,6 +268,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/en_uk/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/en_uk/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/en_uk/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/en_uk/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/en_uk/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/en_uk/inline.sig.html.sample
 @sample %%DATADIR%%/reports/en_uk/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/en_uk/inline.spam.warning.txt.sample
@@ -284,6 +298,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/es/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/es/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/es/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/es/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/es/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/es/inline.sig.html.sample
 @sample %%DATADIR%%/reports/es/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/es/inline.spam.warning.txt.sample
@@ -312,6 +328,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/fr/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/fr/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/fr/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/fr/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/fr/inline.sig.html.sample
 @sample %%DATADIR%%/reports/fr/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/fr/inline.spam.warning.txt.sample
@@ -340,6 +358,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/hu/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/hu/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/hu/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/hu/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/hu/inline.sig.html.sample
 @sample %%DATADIR%%/reports/hu/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/hu/inline.spam.warning.txt.sample
@@ -368,6 +388,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/it/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/it/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/it/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/it/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/it/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/it/inline.sig.html.sample
 @sample %%DATADIR%%/reports/it/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/it/inline.spam.warning.txt.sample
@@ -396,6 +418,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/nl/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/nl/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/nl/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/nl/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/nl/inline.sig.html.sample
 @sample %%DATADIR%%/reports/nl/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/nl/inline.spam.warning.txt.sample
@@ -424,6 +448,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/pt_br/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/pt_br/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/pt_br/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/pt_br/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/pt_br/inline.sig.html.sample
 @sample %%DATADIR%%/reports/pt_br/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/pt_br/inline.spam.warning.txt.sample
@@ -452,6 +478,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/ro/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/ro/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/ro/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/ro/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/ro/inline.sig.html.sample
 @sample %%DATADIR%%/reports/ro/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/ro/inline.spam.warning.txt.sample
@@ -480,6 +508,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/se/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/se/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/se/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/se/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/se/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/se/inline.sig.html.sample
 @sample %%DATADIR%%/reports/se/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/se/inline.spam.warning.txt.sample
@@ -508,6 +538,8 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/sk/deleted.size.message.txt.sample
 @sample %%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
 @sample %%DATADIR%%/reports/sk/disinfected.report.txt.sample
+ at sample %%DATADIR%%/reports/sk/inline.external.warning.html.sample
+ at sample %%DATADIR%%/reports/sk/inline.external.warning.txt.sample
 @sample %%DATADIR%%/reports/sk/inline.sig.html.sample
 @sample %%DATADIR%%/reports/sk/inline.sig.txt.sample
 @sample %%DATADIR%%/reports/sk/inline.spam.warning.txt.sample
@@ -542,11 +574,14 @@ lib/MailScanner/wrapper/clamav-autoupdate
 lib/MailScanner/wrapper/clamav-wrapper
 lib/MailScanner/wrapper/drweb-wrapper
 lib/MailScanner/wrapper/esets-wrapper
+lib/MailScanner/wrapper/esets-wrapper-README
+lib/MailScanner/wrapper/f-prot-6-autoupdate
 lib/MailScanner/wrapper/f-secure-autoupdate
 lib/MailScanner/wrapper/f-secure-wrapper
 lib/MailScanner/wrapper/generic-autoupdate
 lib/MailScanner/wrapper/generic-wrapper
 lib/MailScanner/wrapper/kaspersky-wrapper
+lib/MailScanner/wrapper/kse-autoupdate
 lib/MailScanner/systemd/ms-milter
 lib/MailScanner/systemd/ms-systemd
 lib/MailScanner/wrapper/sophos-autoupdate

More information about the svn-ports-all mailing list