diff -Nur --no-dereference smeserver-clamav-2.7.0.old/createlinks smeserver-clamav-2.7.0/createlinks
--- smeserver-clamav-2.7.0.old/createlinks	2021-04-07 16:27:19.431000000 -0400
+++ smeserver-clamav-2.7.0/createlinks	2021-04-07 16:59:42.030000000 -0400
@@ -10,7 +10,7 @@
 
 foreach (qw(
             /etc/freshclam.conf
-            /etc/clamd.d/clamd.conf
+            /etc/clamd.d/scan.conf
             /etc/logrotate.d/clamd
             /etc/logrotate.d/clamav-update
             /etc/logrotate.d/freshclam
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ArchiveBlockEncrypted smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ArchiveBlockEncrypted
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ArchiveBlockEncrypted	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ArchiveBlockEncrypted	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-ArchiveBlockEncrypted { $clamav{ArchiveBlockEncrypted} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ConcurrentDatabaseReload smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ConcurrentDatabaseReload
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ConcurrentDatabaseReload	2020-12-14 04:56:03.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ConcurrentDatabaseReload	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-# Enable for 0.103.x
-# This takes a LOT more ram as it has have the DBs loaded twice
-# Maybe we should check the memory limit before we allow enabling?
-ConcurrentDatabaseReload { $clamav{ConcurrentDatabaseReload} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/DatabaseDirectory smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/DatabaseDirectory
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/DatabaseDirectory	2020-12-07 14:40:30.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/DatabaseDirectory	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-DatabaseDirectory /var/lib/clamav
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Debug smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Debug
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Debug	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Debug	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-Debug { $clamav{Debug} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/FixStaleSocket smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/FixStaleSocket
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/FixStaleSocket	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/FixStaleSocket	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-FixStaleSocket yes
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Foreground smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Foreground
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Foreground	2020-12-07 18:49:32.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Foreground	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-Foreground no
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/HeuristicScanPrecedence smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/HeuristicScanPrecedence
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/HeuristicScanPrecedence	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/HeuristicScanPrecedence	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-HeuristicScanPrecedence { $clamav{HeuristicScanPrecedence} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/IdleTimeout smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/IdleTimeout
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/IdleTimeout	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/IdleTimeout	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-{
-# Waiting for a new job will timeout after this time (seconds).
-    "IdleTimeout $clamav{IdleTimeout}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LeaveTemporaryFiles smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LeaveTemporaryFiles
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LeaveTemporaryFiles	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LeaveTemporaryFiles	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LeaveTemporaryFiles { $clamav{LeaveTemporaryFiles} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocket smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocket
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocket	2020-12-11 05:10:34.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocket	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LocalSocket /run/clamd/clamd.socket
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocketMode smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocketMode
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocketMode	2020-12-11 17:56:44.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocketMode	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LocalSocketMode 666
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogClean smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogClean
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogClean	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogClean	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LogClean { $clamav{LogClean} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogFile smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogFile
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogFile	2020-12-07 13:35:36.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogFile	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LogFile /var/log/clamd/current
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogTime smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogTime
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogTime	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogTime	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LogTime { $clamav{LogTime} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogVerbose smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogVerbose
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogVerbose	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogVerbose	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-LogVerbose { $clamav{LogVerbose} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxConnectionQueueLength smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxConnectionQueueLength
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxConnectionQueueLength	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxConnectionQueueLength	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-{
-# Maximum length the queue of pending connections may grow to.
-    "MaxConnectionQueueLength $clamav{MaxConnectionQueueLength}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxDirectoryRecursion smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxDirectoryRecursion
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxDirectoryRecursion	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxDirectoryRecursion	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-{
-# Maximal depth directories are scanned at.
-    "MaxDirectoryRecursion $clamav{MaxDirectoryRecursion}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFiles smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFiles
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFiles	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFiles	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-{
-# Number of files to be scanned within an archive.
-# Value of 0 disables the limit.
-    "MaxFiles $clamav{MaxFiles}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFileSize smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFileSize
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFileSize	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFileSize	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-{
-# Files in archives larger than this limit won't be scanned.
-# Value of 0 disables the limit.
-    "MaxFileSize $clamav{MaxFileSize}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxRecursion smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxRecursion
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxRecursion	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxRecursion	1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-{
-# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
-# file, all files within it will also be scanned. This options specifies how
-# deep the process should be continued.
-# Value of 0 disables the limit.
-    "MaxRecursion $clamav{MaxRecursion}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxThreads smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxThreads
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxThreads	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxThreads	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-{
-# Maximal number of threads running at the same time.
-    "MaxThreads $clamav{MaxThreads}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/PidFile smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/PidFile
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/PidFile	2020-12-11 07:19:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/PidFile	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-PidFile /run/clamd/clamd.pid
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ReadTimeout smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ReadTimeout
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ReadTimeout	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ReadTimeout	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-{
-# Waiting for data from a client socket will timeout after this time (seconds).
-# Value of 0 disables the timeout.
-    "ReadTimeout $clamav{ReadTimeout}";
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanArchive smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanArchive
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanArchive	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanArchive	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-ScanArchive { $clamav{ScanArchive} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanHTML smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanHTML
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanHTML	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanHTML	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-ScanHTML { $clamav{ScanHTML} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanMail smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanMail
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanMail	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanMail	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-ScanMail { $clamav{ScanMail} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanOLE2 smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanOLE2
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanOLE2	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanOLE2	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-ScanOLE2 { $clamav{ScanOLE2} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanPE smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanPE
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanPE	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanPE	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-ScanPE { $clamav{ScanPE} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/SelfCheck smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/SelfCheck
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/SelfCheck	2020-12-10 08:18:03.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/SelfCheck	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-# Perform internal sanity check (database integrity and freshness).
-SelfCheck { $clamav{SelfCheck} || '600' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/StreamMaxLength smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/StreamMaxLength
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/StreamMaxLength	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/StreamMaxLength	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-# Close the connection if this limit is exceeded.
-StreamMaxLength { $clamav{StreamMaxLength} || '25M' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPAddr smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPAddr
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPAddr	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPAddr	1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-{
-# TCP address.
-# By default we bind to INADDR_ANY, probably not wise.
-# Enable the following to provide some degree of protection
-# from the outside world.
-    $clamav{TCPAddr} ? "TCPAddr $clamav{TCPAddr}" : '#TCPAddr 127.0.0.1';
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPSocket smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPSocket
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPSocket	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPSocket	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-{
-# TCP port address.
-    $clamav{TCPSocket} ? "TCPSocket $clamav{TCPSocket}" : '#TCPSocket 3310';
-}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TemporaryDirectory smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TemporaryDirectory
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TemporaryDirectory	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TemporaryDirectory	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-TemporaryDirectory /var/tmp
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/User smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/User
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/User	2020-12-03 07:24:21.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/User	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-User clamscan
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ArchiveBlockEncrypted smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ArchiveBlockEncrypted
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ArchiveBlockEncrypted	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ArchiveBlockEncrypted	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+ArchiveBlockEncrypted { $clamav{ArchiveBlockEncrypted} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ConcurrentDatabaseReload smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ConcurrentDatabaseReload
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ConcurrentDatabaseReload	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ConcurrentDatabaseReload	2020-12-14 04:56:03.000000000 -0500
@@ -0,0 +1,4 @@
+# Enable for 0.103.x
+# This takes a LOT more ram as it has have the DBs loaded twice
+# Maybe we should check the memory limit before we allow enabling?
+ConcurrentDatabaseReload { $clamav{ConcurrentDatabaseReload} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/DatabaseDirectory smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/DatabaseDirectory
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/DatabaseDirectory	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/DatabaseDirectory	2020-12-07 14:40:30.000000000 -0500
@@ -0,0 +1 @@
+DatabaseDirectory /var/lib/clamav
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Debug smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Debug
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Debug	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Debug	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+Debug { $clamav{Debug} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/FixStaleSocket smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/FixStaleSocket
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/FixStaleSocket	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/FixStaleSocket	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+FixStaleSocket yes
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Foreground smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Foreground
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Foreground	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Foreground	2020-12-07 18:49:32.000000000 -0500
@@ -0,0 +1 @@
+Foreground no
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/HeuristicScanPrecedence smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/HeuristicScanPrecedence
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/HeuristicScanPrecedence	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/HeuristicScanPrecedence	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+HeuristicScanPrecedence { $clamav{HeuristicScanPrecedence} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/IdleTimeout smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/IdleTimeout
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/IdleTimeout	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/IdleTimeout	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,4 @@
+{
+# Waiting for a new job will timeout after this time (seconds).
+    "IdleTimeout $clamav{IdleTimeout}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LeaveTemporaryFiles smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LeaveTemporaryFiles
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LeaveTemporaryFiles	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LeaveTemporaryFiles	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+LeaveTemporaryFiles { $clamav{LeaveTemporaryFiles} || 'no' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocket smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocket
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocket	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocket	2020-12-11 05:10:34.000000000 -0500
@@ -0,0 +1 @@
+LocalSocket /run/clamd/clamd.socket
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocketMode smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocketMode
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocketMode	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocketMode	2020-12-11 17:56:44.000000000 -0500
@@ -0,0 +1 @@
+LocalSocketMode 666
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogClean smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogClean
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogClean	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogClean	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+LogClean { $clamav{LogClean} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogFile smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogFile
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogFile	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogFile	2020-12-07 13:35:36.000000000 -0500
@@ -0,0 +1 @@
+LogFile /var/log/clamd/current
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogTime smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogTime
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogTime	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogTime	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+LogTime { $clamav{LogTime} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogVerbose smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogVerbose
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogVerbose	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogVerbose	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+LogVerbose { $clamav{LogVerbose} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxConnectionQueueLength smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxConnectionQueueLength
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxConnectionQueueLength	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxConnectionQueueLength	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,4 @@
+{
+# Maximum length the queue of pending connections may grow to.
+    "MaxConnectionQueueLength $clamav{MaxConnectionQueueLength}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxDirectoryRecursion smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxDirectoryRecursion
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxDirectoryRecursion	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxDirectoryRecursion	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,4 @@
+{
+# Maximal depth directories are scanned at.
+    "MaxDirectoryRecursion $clamav{MaxDirectoryRecursion}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFiles smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFiles
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFiles	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFiles	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,5 @@
+{
+# Number of files to be scanned within an archive.
+# Value of 0 disables the limit.
+    "MaxFiles $clamav{MaxFiles}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFileSize smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFileSize
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFileSize	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFileSize	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,5 @@
+{
+# Files in archives larger than this limit won't be scanned.
+# Value of 0 disables the limit.
+    "MaxFileSize $clamav{MaxFileSize}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxRecursion smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxRecursion
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxRecursion	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxRecursion	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,7 @@
+{
+# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
+# file, all files within it will also be scanned. This options specifies how
+# deep the process should be continued.
+# Value of 0 disables the limit.
+    "MaxRecursion $clamav{MaxRecursion}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxThreads smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxThreads
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxThreads	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxThreads	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,4 @@
+{
+# Maximal number of threads running at the same time.
+    "MaxThreads $clamav{MaxThreads}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/PidFile smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/PidFile
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/PidFile	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/PidFile	2020-12-11 07:19:01.000000000 -0500
@@ -0,0 +1 @@
+PidFile /run/clamd/clamd.pid
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ReadTimeout smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ReadTimeout
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ReadTimeout	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ReadTimeout	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,5 @@
+{
+# Waiting for data from a client socket will timeout after this time (seconds).
+# Value of 0 disables the timeout.
+    "ReadTimeout $clamav{ReadTimeout}";
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanArchive smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanArchive
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanArchive	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanArchive	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+ScanArchive { $clamav{ScanArchive} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanHTML smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanHTML
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanHTML	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanHTML	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+ScanHTML { $clamav{ScanHTML} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanMail smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanMail
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanMail	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanMail	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+ScanMail { $clamav{ScanMail} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanOLE2 smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanOLE2
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanOLE2	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanOLE2	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+ScanOLE2 { $clamav{ScanOLE2} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanPE smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanPE
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanPE	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanPE	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+ScanPE { $clamav{ScanPE} || 'yes' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/SelfCheck smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/SelfCheck
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/SelfCheck	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/SelfCheck	2020-12-10 08:18:03.000000000 -0500
@@ -0,0 +1,2 @@
+# Perform internal sanity check (database integrity and freshness).
+SelfCheck { $clamav{SelfCheck} || '600' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/StreamMaxLength smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/StreamMaxLength
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/StreamMaxLength	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/StreamMaxLength	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,2 @@
+# Close the connection if this limit is exceeded.
+StreamMaxLength { $clamav{StreamMaxLength} || '25M' }
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPAddr smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPAddr
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPAddr	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPAddr	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,7 @@
+{
+# TCP address.
+# By default we bind to INADDR_ANY, probably not wise.
+# Enable the following to provide some degree of protection
+# from the outside world.
+    $clamav{TCPAddr} ? "TCPAddr $clamav{TCPAddr}" : '#TCPAddr 127.0.0.1';
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPSocket smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPSocket
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPSocket	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPSocket	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1,4 @@
+{
+# TCP port address.
+    $clamav{TCPSocket} ? "TCPSocket $clamav{TCPSocket}" : '#TCPSocket 3310';
+}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TemporaryDirectory smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TemporaryDirectory
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TemporaryDirectory	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TemporaryDirectory	2020-12-02 11:37:01.000000000 -0500
@@ -0,0 +1 @@
+TemporaryDirectory /var/tmp
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/User smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/User
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/clamd.d/scan.conf/User	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/User	2020-12-03 07:24:21.000000000 -0500
@@ -0,0 +1 @@
+User clamscan
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/freshclam.conf/NotifyClamd smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/freshclam.conf/NotifyClamd
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/freshclam.conf/NotifyClamd	2020-12-02 11:37:01.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/freshclam.conf/NotifyClamd	2021-04-07 16:57:42.772000000 -0400
@@ -1 +1 @@
-NotifyClamd /etc/clamd.d/clamd.conf
+NotifyClamd /etc/clamd.d/scan.conf
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/logrotate.d/clamd/clamd.logrotate smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/logrotate.d/clamd/clamd.logrotate
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/logrotate.d/clamd/clamd.logrotate	2020-12-09 06:12:50.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/logrotate.d/clamd/clamd.logrotate	2021-04-07 16:58:18.559000000 -0400
@@ -1,10 +1,10 @@
-# Hmmm....
+# 
     /var/log/clamd/current \{
     monthly
     notifempty
     missingok
 
     postrotate
-        pkill -u clamscan -HUP -f '/usr/sbin/clamd -c /etc/clamd.d/clamd.conf >/dev/null 2>&1 || :
+        pkill -u clamscan -HUP -f '/usr/sbin/clamd -c /etc/clamd.d/scan.conf >/dev/null 2>&1 || :
     endscript
 \}
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates.metadata/etc/clamd.d/clamd.conf smeserver-clamav-2.7.0/root/etc/e-smith/templates.metadata/etc/clamd.d/clamd.conf
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates.metadata/etc/clamd.d/clamd.conf	2020-12-07 05:14:53.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates.metadata/etc/clamd.d/clamd.conf	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-PERMS=0644
\ Pas de fin de ligne à la fin du fichier
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/e-smith/templates.metadata/etc/clamd.d/scan.conf smeserver-clamav-2.7.0/root/etc/e-smith/templates.metadata/etc/clamd.d/scan.conf
--- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates.metadata/etc/clamd.d/scan.conf	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/etc/e-smith/templates.metadata/etc/clamd.d/scan.conf	2020-12-07 05:14:53.000000000 -0500
@@ -0,0 +1 @@
+PERMS=0644
\ Pas de fin de ligne à la fin du fichier
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/etc/profile.d/clamd.sh smeserver-clamav-2.7.0/root/etc/profile.d/clamd.sh
--- smeserver-clamav-2.7.0.old/root/etc/profile.d/clamd.sh	2021-04-07 16:27:19.455000000 -0400
+++ smeserver-clamav-2.7.0/root/etc/profile.d/clamd.sh	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-# Don't define aliases in plain Bourne shell
-[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
-alias clamdtop='clamdtop /run/clamd/clamd.socket'
-
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/sbin/clamdscan smeserver-clamav-2.7.0/root/sbin/clamdscan
--- smeserver-clamav-2.7.0.old/root/sbin/clamdscan	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-clamav-2.7.0/root/sbin/clamdscan	2021-04-07 16:55:27.398000000 -0400
@@ -0,0 +1,18 @@
+#!/bin/bash
+# wrapper for clamdscan to force the --fdpass parameter to avoir failure because of 
+# no permission to access
+allargs=$@
+toadd=" --fdpass "
+#parse args
+while [ "$#" -gt 0 ]; do
+        case "$1" in
+            --fdpass) toadd=""  ;;
+            --stream) toadd=""   ;;
+        esac
+        shift
+done
+
+
+#we return to systemd systemctl command unless this is one of the command we want to handle
+/usr/bin/clamdscan $toadd ${allargs[*]}
+
diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/usr/lib/systemd/system/clamd.service smeserver-clamav-2.7.0/root/usr/lib/systemd/system/clamd.service
--- smeserver-clamav-2.7.0.old/root/usr/lib/systemd/system/clamd.service	2021-04-07 16:27:19.434000000 -0400
+++ smeserver-clamav-2.7.0/root/usr/lib/systemd/system/clamd.service	2021-04-07 16:58:48.875000000 -0400
@@ -8,8 +8,8 @@
 [Service]
 Type = forking
 ExecStartPre=/sbin/e-smith/service-status clamd
-ExecStartPre=-/sbin/e-smith/expand-template /etc/clamd.d/clamd.conf
-ExecStart=/usr/sbin/clamd -c /etc/clamd.d/clamd.conf
+ExecStartPre=-/sbin/e-smith/expand-template /etc/clamd.d/scan.conf
+ExecStart=/usr/sbin/clamd -c /etc/clamd.d/scan.conf
 # Reload the database
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart=on-failure