summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING8
-rw-r--r--mail/mailscanner/Makefile16
-rw-r--r--mail/mailscanner/distinfo6
-rw-r--r--mail/mailscanner/files/CHANGES.port204
-rw-r--r--mail/mailscanner/files/mailscanner.in5
-rw-r--r--mail/mailscanner/files/mta.in11
-rw-r--r--mail/mailscanner/files/pkg-message.in5
-rw-r--r--mail/mailscanner/pkg-plist35
8 files changed, 64 insertions, 226 deletions
diff --git a/UPDATING b/UPDATING
index 45e187d39ad6..7cab06a2b6bd 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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@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@FreeBSD.org
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 9e5fb0b23e4c..70e4ace0ca87 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -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@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
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 1c7275519835..212852e828eb 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -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
diff --git a/mail/mailscanner/files/CHANGES.port b/mail/mailscanner/files/CHANGES.port
deleted file mode 100644
index 2a6bcfec405a..000000000000
--- a/mail/mailscanner/files/CHANGES.port
+++ /dev/null
@@ -1,204 +0,0 @@
-Version 4.85.2_3
-==============
-- Upgrade to 4.85.2-3
-
-Version 4.84.6
-==============
-- Upgrade to 4.84.6
-- Added some patches for tmp file bugs
- reported/provided by brad@comstyle.com
- from the OpenBSD port and GitHub repository.
-
-Version 4.84.6
-==============
-- Upgrade to 4.84.6
-- Added some patches for tmp file bugs
- reported/provided by brad@comstyle.com
- from the OpenBSD port and GitHub repository.
-
-Version 4.84.5_3 (not bumped)
-================
-- Use OptionsNG
-- Remove deprecated header information
-- Removed check for perl versions that are deprecated to install and
- scheduled for removal from the ports tree.
-
-Version 4.84.5_3
-================
-- Added FreeBSD required mktemp options
-
-Version 4.84.5_2
-================
-- Fixed creation of mailscanner.cf symlink
-
-Version 4.84.5_1
-================
-- Added patch for TNEF.pm bug
-- Fixed creation of mailscanner.cf symlink
-- Minor doc updates
-
-Version 4.84.5
-==============
-- Upgrade to 4.84.5
-
-Version 4.83.5
-==============
-- Upgrade to 4.83.5
-- Remove extra config file targets-- config files are handled automatically
- in pkg-(de)?install scripts now.
-
-Version 4.83.4
-==============
-- Upgrade to 4.83.4
-
-Version 4.83.2
-==============
-- Upgrade to 4.83.2
-- Update mta init script so it starts MTAs after other init scripts
- (milters, etc) that should start before "mail".
-
-Version 4.82.6
-==============
-- Upgrade to 4.82.6
-
-Version 4.81.4
-==============
-- Upgrade to 4.81.4
-- Added dependency for p5-Sys-SigAction port
-
-Version 4.75.11
-===============
-- Upgrade to 4.75.11
-
-Version 4.67.6
-==============
-- Upgrade to 4.67.6
-- Now works with p5-Mail-Tools Version 2.x again
-
-Version 4.64.3
-==============
-- Upgrade to 4.64.3
-
-Version 4.62.9
-==============
-- Upgrade to 4.62.9
-- update_spamassassin and update_spamassassin.cron are untouched again. I
- currently do not have enough time to get this running the FreeBSD way.
- Patches are welcome.
-
-Version 4.61.7
-==============
-- Upgrade to 4.61.7
-- Attention: update_spamassassin and update_spamassassin.cron are rewritten to fit
- FreeBSD. Untested. If you are using non-standard directories or FreeBSD < 6 you will
- have to check update_spamassassin.
-
-Version 4.60.8_2
-================
-- Fixed error in auto-zip: If a message contained 2 different attachments
- with exactly the same filename, the auto-zip feature would fail and
- MailScanner would die.
-
-Version 4.60.8
-==============
-- update to 4.60.8
-
-Version 4.59.4_2
-================
-- update to 4.59.4
-
-Version 4.58.9_2
-================
-- clamav-wrapper contained options unarj, unace and zoo. unace
- seems to be dead and the other options are corrected to be
- arj and unzoo.
-
-Version 4.58.9
-================
-- Upgrade to MailScanner 4.58
-- fix: CHANGES.port was not installed anymore
-- startscripts now honor RC_SUBR_SUFFIX
-
-Version 4.57.6_1
-================
-- Upgrade to MailScanner 4.57
-
-Version 4.56.8_1
-================
-- fixed problem with upgrade_mailscanner_config
-
-Version 4.56.8
-==============
-- Upgrade to MailScanner 4.56
-
-Version 4.55.10
-===============
-- Upgrade to MailScanner 4.55
-- As Julian removed the documentation from the tarball I did the same in the port.
- Manpage and html docs removed as well. All documentation can now be found on
- the web.
-
-Version 4.54.6_1
-=================
-- Path to gunzip in MailScanner.conf fixed
-
-Version 4.54.6
-=================
-- Upgrade to MailScanner 4.54
-- Download location changed
-- added sysutils/p5-Sys-Hostname-Long dependency
-
-Version 4.53.8
-=================
-- 4.53.7 contained a bug in scanning of phishing mails. This resulted in scanning loops
-
-Version 4.53.7
-=================
-- Upgrade to MailScanner 4.53
-- changed some patch-names
-- created sa-update.cron in libexece/MailScanner to periodically run sa-update
-
-Version 4.52.2_1
-=================
-- fixed bug in mta.sh script
-- fixed rc.subr reference in update_phishing_sites.cron and
- update_virus_scanners.cron --> now dynamically rewritten to correct
- location
-- Exim 4.61 changed queue file format which was incompatible with 4.52.2 --> patched
-
-Version 4.52.2
-=================
-- Upgrade to MailScanner 4.52
-
-Version 4.51.5
-=================
-- Some changes in FreeBSD 6.1 resulted in problems in the mta.sh script.
- Fixed.
-- Upgrade to MailScanenr 4.51
-
-Version 4.50.15_1
-=================
-- The MailScanner binary is now put into /usr/local/sbin allowing for
- easy use of the command-line options for debugging etc.
-- From this version on all ports will contain this Change Log.
-- The following scripts are now installed by the port as well (into
- /usr/local/libexec/MailScanner):
- - analyse_SpamAssassin_cache
- - clean.SA.cache (use this for manual clean or in crontab)
- - clean.quarantine (use this for manual clean or in crontab)
- - update_phishing_sites (use this for manual updates)
- - update_phishing_sites.cron (use this in crontab)
- - update_virus_scanners.cron (ise this in crontab)
-- The latter two can/should be used in your crontab for updating those
- components. These scripts introduce a random delay for updating (can
- be configured in rc.conf).
-- Fixed a small bug in mailscanner.sh script. Status/Stop was not
- always working.
-
-Version 4.50.15
-===============
-- Upgrade to MailScanner 4.50.15-1
-- Start/Stop scripts are now rc.subr compliant. Please adjust your config!
-- The port now optionally installs Spamassassin, ClamAV and Bitdefender.
-- make renew-wrapper, renew-autoupdate and renew-reports now depend on
- configure instead of on install allowing their usage after a portupgrade.
diff --git a/mail/mailscanner/files/mailscanner.in b/mail/mailscanner/files/mailscanner.in
index 172237aa2e77..d28c012b65a6 100644
--- a/mail/mailscanner/files/mailscanner.in
+++ b/mail/mailscanner/files/mailscanner.in
@@ -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"}
diff --git a/mail/mailscanner/files/mta.in b/mail/mailscanner/files/mta.in
index 789b0cbc1130..e7948e7ef4af 100644
--- a/mail/mailscanner/files/mta.in
+++ b/mail/mailscanner/files/mta.in
@@ -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}}
diff --git a/mail/mailscanner/files/pkg-message.in b/mail/mailscanner/files/pkg-message.in
index 8345cb8bc8bc..fccaa39c6f6f 100644
--- a/mail/mailscanner/files/pkg-message.in
+++ b/mail/mailscanner/files/pkg-message.in
@@ -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
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 956cdd852044..32c3251c48cc 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -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
+@sample %%DATADIR%%/reports/ca/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/cy+en/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/cz/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/de/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/dk/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/en/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/en_uk/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/es/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/fr/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/hu/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/it/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/nl/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/pt_br/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/ro/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/se/inline.external.warning.html.sample
+@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
+@sample %%DATADIR%%/reports/sk/inline.external.warning.html.sample
+@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