From c87ff60d4a001ad0dfde62d1b256cf4ac44dbb73 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 8 Aug 2019 18:09:22 +0200 Subject: [PATCH] adapt clamav.conf.in to new upstream version The new version of clamav has changed a few options, which we ship in our config template - see [0] for the details. This patch changes all affected options to the new names and additionally expands the Description of 'archiveblockencrypted' to reflect that the option is used for both archives _and_ documents. [0] https://blog.clamav.net/2018/12/clamav-01010-has-been-released.html Signed-off-by: Stoiko Ivanov --- src/PMG/Config.pm | 2 +- src/templates/clamd.conf.in | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index a62d9e4..52dd7d0 100755 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -331,7 +331,7 @@ sub properties { default => 'database.clamav.net', }, archiveblockencrypted => { - description => "Whether to block encrypted archives. Mark encrypted archives as viruses.", + description => "Whether to block encrypted archives and documents. Mark encrypted archives and documents as viruses.", type => 'boolean', default => 0, }, diff --git a/src/templates/clamd.conf.in b/src/templates/clamd.conf.in index 9f119b9..e165e4c 100644 --- a/src/templates/clamd.conf.in +++ b/src/templates/clamd.conf.in @@ -5,9 +5,9 @@ User clamav ScanMail true ScanArchive true [% IF pmg.clamav.archiveblockencrypted %] -ArchiveBlockEncrypted true +AlertEncrypted true [% ELSE %] -ArchiveBlockEncrypted false +AlertEncrypted false [% END %] MaxRecursion [% pmg.clamav.archivemaxrec %] MaxFiles [% pmg.clamav.archivemaxfiles %] @@ -34,7 +34,7 @@ ScanPE true ScanOLE2 true ScanHTML true ScanPDF true -DetectBrokenExecutables true +AlertBrokenExecutables true ExitOnOOM false LeaveTemporaryFiles false AlgorithmicDetection true @@ -42,8 +42,8 @@ ScanELF true IdleTimeout 30 PhishingSignatures true PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false +AlertPhishingSSLMismatch false +AlertPhishingCloak false DetectPUA false ScanPartialMessages false HeuristicScanPrecedence false -- 2.39.2