/[smeserver]/rpms/smeserver-clamav/sme10/smeserver-clamav-2.7.0-bz11520-clamd2scan.conf.patch
ViewVC logotype

Annotation of /rpms/smeserver-clamav/sme10/smeserver-clamav-2.7.0-bz11520-clamd2scan.conf.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Wed Apr 7 21:05:45 2021 UTC (3 years, 7 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-clamav-2_7_0-8_el7_sme, smeserver-clamav-2_7_0-7_el7_sme, smeserver-clamav-2_7_0-6_el7_sme 
* Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-6.sme
- fix issues with non epel standard scan.conf [SME: 11520]
  move clamd.conf to scan.conf
  remove alias for clamtop
  add a wrapper for clamdscan to force --fdpass
1 jpp 1.1 diff -Nur --no-dereference smeserver-clamav-2.7.0.old/createlinks smeserver-clamav-2.7.0/createlinks
2     --- smeserver-clamav-2.7.0.old/createlinks 2021-04-07 16:27:19.431000000 -0400
3     +++ smeserver-clamav-2.7.0/createlinks 2021-04-07 16:59:42.030000000 -0400
4     @@ -10,7 +10,7 @@
5    
6     foreach (qw(
7     /etc/freshclam.conf
8     - /etc/clamd.d/clamd.conf
9     + /etc/clamd.d/scan.conf
10     /etc/logrotate.d/clamd
11     /etc/logrotate.d/clamav-update
12     /etc/logrotate.d/freshclam
13     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
14     --- 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
15     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ArchiveBlockEncrypted 1969-12-31 19:00:00.000000000 -0500
16     @@ -1 +0,0 @@
17     -ArchiveBlockEncrypted { $clamav{ArchiveBlockEncrypted} || 'no' }
18     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
19     --- 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
20     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ConcurrentDatabaseReload 1969-12-31 19:00:00.000000000 -0500
21     @@ -1,4 +0,0 @@
22     -# Enable for 0.103.x
23     -# This takes a LOT more ram as it has have the DBs loaded twice
24     -# Maybe we should check the memory limit before we allow enabling?
25     -ConcurrentDatabaseReload { $clamav{ConcurrentDatabaseReload} || 'no' }
26     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
27     --- 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
28     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/DatabaseDirectory 1969-12-31 19:00:00.000000000 -0500
29     @@ -1 +0,0 @@
30     -DatabaseDirectory /var/lib/clamav
31     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
32     --- 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
33     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Debug 1969-12-31 19:00:00.000000000 -0500
34     @@ -1 +0,0 @@
35     -Debug { $clamav{Debug} || 'no' }
36     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
37     --- 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
38     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/FixStaleSocket 1969-12-31 19:00:00.000000000 -0500
39     @@ -1 +0,0 @@
40     -FixStaleSocket yes
41     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
42     --- 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
43     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/Foreground 1969-12-31 19:00:00.000000000 -0500
44     @@ -1 +0,0 @@
45     -Foreground no
46     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
47     --- 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
48     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/HeuristicScanPrecedence 1969-12-31 19:00:00.000000000 -0500
49     @@ -1 +0,0 @@
50     -HeuristicScanPrecedence { $clamav{HeuristicScanPrecedence} || 'no' }
51     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
52     --- 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
53     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/IdleTimeout 1969-12-31 19:00:00.000000000 -0500
54     @@ -1,4 +0,0 @@
55     -{
56     -# Waiting for a new job will timeout after this time (seconds).
57     - "IdleTimeout $clamav{IdleTimeout}";
58     -}
59     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
60     --- 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
61     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LeaveTemporaryFiles 1969-12-31 19:00:00.000000000 -0500
62     @@ -1 +0,0 @@
63     -LeaveTemporaryFiles { $clamav{LeaveTemporaryFiles} || 'no' }
64     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
65     --- 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
66     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocket 1969-12-31 19:00:00.000000000 -0500
67     @@ -1 +0,0 @@
68     -LocalSocket /run/clamd/clamd.socket
69     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
70     --- 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
71     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LocalSocketMode 1969-12-31 19:00:00.000000000 -0500
72     @@ -1 +0,0 @@
73     -LocalSocketMode 666
74     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
75     --- 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
76     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogClean 1969-12-31 19:00:00.000000000 -0500
77     @@ -1 +0,0 @@
78     -LogClean { $clamav{LogClean} || 'yes' }
79     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
80     --- 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
81     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogFile 1969-12-31 19:00:00.000000000 -0500
82     @@ -1 +0,0 @@
83     -LogFile /var/log/clamd/current
84     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
85     --- 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
86     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogTime 1969-12-31 19:00:00.000000000 -0500
87     @@ -1 +0,0 @@
88     -LogTime { $clamav{LogTime} || 'yes' }
89     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
90     --- 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
91     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/LogVerbose 1969-12-31 19:00:00.000000000 -0500
92     @@ -1 +0,0 @@
93     -LogVerbose { $clamav{LogVerbose} || 'yes' }
94     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
95     --- 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
96     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxConnectionQueueLength 1969-12-31 19:00:00.000000000 -0500
97     @@ -1,4 +0,0 @@
98     -{
99     -# Maximum length the queue of pending connections may grow to.
100     - "MaxConnectionQueueLength $clamav{MaxConnectionQueueLength}";
101     -}
102     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
103     --- 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
104     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxDirectoryRecursion 1969-12-31 19:00:00.000000000 -0500
105     @@ -1,4 +0,0 @@
106     -{
107     -# Maximal depth directories are scanned at.
108     - "MaxDirectoryRecursion $clamav{MaxDirectoryRecursion}";
109     -}
110     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
111     --- 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
112     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFiles 1969-12-31 19:00:00.000000000 -0500
113     @@ -1,5 +0,0 @@
114     -{
115     -# Number of files to be scanned within an archive.
116     -# Value of 0 disables the limit.
117     - "MaxFiles $clamav{MaxFiles}";
118     -}
119     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
120     --- 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
121     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxFileSize 1969-12-31 19:00:00.000000000 -0500
122     @@ -1,5 +0,0 @@
123     -{
124     -# Files in archives larger than this limit won't be scanned.
125     -# Value of 0 disables the limit.
126     - "MaxFileSize $clamav{MaxFileSize}";
127     -}
128     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
129     --- 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
130     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxRecursion 1969-12-31 19:00:00.000000000 -0500
131     @@ -1,7 +0,0 @@
132     -{
133     -# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
134     -# file, all files within it will also be scanned. This options specifies how
135     -# deep the process should be continued.
136     -# Value of 0 disables the limit.
137     - "MaxRecursion $clamav{MaxRecursion}";
138     -}
139     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
140     --- 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
141     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/MaxThreads 1969-12-31 19:00:00.000000000 -0500
142     @@ -1,4 +0,0 @@
143     -{
144     -# Maximal number of threads running at the same time.
145     - "MaxThreads $clamav{MaxThreads}";
146     -}
147     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
148     --- 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
149     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/PidFile 1969-12-31 19:00:00.000000000 -0500
150     @@ -1 +0,0 @@
151     -PidFile /run/clamd/clamd.pid
152     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
153     --- 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
154     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ReadTimeout 1969-12-31 19:00:00.000000000 -0500
155     @@ -1,5 +0,0 @@
156     -{
157     -# Waiting for data from a client socket will timeout after this time (seconds).
158     -# Value of 0 disables the timeout.
159     - "ReadTimeout $clamav{ReadTimeout}";
160     -}
161     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
162     --- 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
163     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanArchive 1969-12-31 19:00:00.000000000 -0500
164     @@ -1 +0,0 @@
165     -ScanArchive { $clamav{ScanArchive} || 'yes' }
166     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
167     --- 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
168     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanHTML 1969-12-31 19:00:00.000000000 -0500
169     @@ -1 +0,0 @@
170     -ScanHTML { $clamav{ScanHTML} || 'yes' }
171     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
172     --- 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
173     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanMail 1969-12-31 19:00:00.000000000 -0500
174     @@ -1 +0,0 @@
175     -ScanMail { $clamav{ScanMail} || 'yes' }
176     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
177     --- 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
178     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanOLE2 1969-12-31 19:00:00.000000000 -0500
179     @@ -1 +0,0 @@
180     -ScanOLE2 { $clamav{ScanOLE2} || 'yes' }
181     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
182     --- 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
183     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/ScanPE 1969-12-31 19:00:00.000000000 -0500
184     @@ -1 +0,0 @@
185     -ScanPE { $clamav{ScanPE} || 'yes' }
186     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
187     --- 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
188     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/SelfCheck 1969-12-31 19:00:00.000000000 -0500
189     @@ -1,2 +0,0 @@
190     -# Perform internal sanity check (database integrity and freshness).
191     -SelfCheck { $clamav{SelfCheck} || '600' }
192     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
193     --- 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
194     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/StreamMaxLength 1969-12-31 19:00:00.000000000 -0500
195     @@ -1,2 +0,0 @@
196     -# Close the connection if this limit is exceeded.
197     -StreamMaxLength { $clamav{StreamMaxLength} || '25M' }
198     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
199     --- 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
200     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPAddr 1969-12-31 19:00:00.000000000 -0500
201     @@ -1,7 +0,0 @@
202     -{
203     -# TCP address.
204     -# By default we bind to INADDR_ANY, probably not wise.
205     -# Enable the following to provide some degree of protection
206     -# from the outside world.
207     - $clamav{TCPAddr} ? "TCPAddr $clamav{TCPAddr}" : '#TCPAddr 127.0.0.1';
208     -}
209     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
210     --- 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
211     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TCPSocket 1969-12-31 19:00:00.000000000 -0500
212     @@ -1,4 +0,0 @@
213     -{
214     -# TCP port address.
215     - $clamav{TCPSocket} ? "TCPSocket $clamav{TCPSocket}" : '#TCPSocket 3310';
216     -}
217     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
218     --- 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
219     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/TemporaryDirectory 1969-12-31 19:00:00.000000000 -0500
220     @@ -1 +0,0 @@
221     -TemporaryDirectory /var/tmp
222     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
223     --- 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
224     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/clamd.conf/User 1969-12-31 19:00:00.000000000 -0500
225     @@ -1 +0,0 @@
226     -User clamscan
227     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
228     --- 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
229     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ArchiveBlockEncrypted 2020-12-02 11:37:01.000000000 -0500
230     @@ -0,0 +1 @@
231     +ArchiveBlockEncrypted { $clamav{ArchiveBlockEncrypted} || 'no' }
232     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
233     --- 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
234     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ConcurrentDatabaseReload 2020-12-14 04:56:03.000000000 -0500
235     @@ -0,0 +1,4 @@
236     +# Enable for 0.103.x
237     +# This takes a LOT more ram as it has have the DBs loaded twice
238     +# Maybe we should check the memory limit before we allow enabling?
239     +ConcurrentDatabaseReload { $clamav{ConcurrentDatabaseReload} || 'no' }
240     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
241     --- 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
242     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/DatabaseDirectory 2020-12-07 14:40:30.000000000 -0500
243     @@ -0,0 +1 @@
244     +DatabaseDirectory /var/lib/clamav
245     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
246     --- 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
247     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Debug 2020-12-02 11:37:01.000000000 -0500
248     @@ -0,0 +1 @@
249     +Debug { $clamav{Debug} || 'no' }
250     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
251     --- 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
252     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/FixStaleSocket 2020-12-02 11:37:01.000000000 -0500
253     @@ -0,0 +1 @@
254     +FixStaleSocket yes
255     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
256     --- 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
257     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/Foreground 2020-12-07 18:49:32.000000000 -0500
258     @@ -0,0 +1 @@
259     +Foreground no
260     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
261     --- 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
262     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/HeuristicScanPrecedence 2020-12-02 11:37:01.000000000 -0500
263     @@ -0,0 +1 @@
264     +HeuristicScanPrecedence { $clamav{HeuristicScanPrecedence} || 'no' }
265     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
266     --- 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
267     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/IdleTimeout 2020-12-02 11:37:01.000000000 -0500
268     @@ -0,0 +1,4 @@
269     +{
270     +# Waiting for a new job will timeout after this time (seconds).
271     + "IdleTimeout $clamav{IdleTimeout}";
272     +}
273     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
274     --- 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
275     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LeaveTemporaryFiles 2020-12-02 11:37:01.000000000 -0500
276     @@ -0,0 +1 @@
277     +LeaveTemporaryFiles { $clamav{LeaveTemporaryFiles} || 'no' }
278     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
279     --- 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
280     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocket 2020-12-11 05:10:34.000000000 -0500
281     @@ -0,0 +1 @@
282     +LocalSocket /run/clamd/clamd.socket
283     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
284     --- 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
285     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LocalSocketMode 2020-12-11 17:56:44.000000000 -0500
286     @@ -0,0 +1 @@
287     +LocalSocketMode 666
288     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
289     --- 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
290     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogClean 2020-12-02 11:37:01.000000000 -0500
291     @@ -0,0 +1 @@
292     +LogClean { $clamav{LogClean} || 'yes' }
293     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
294     --- 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
295     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogFile 2020-12-07 13:35:36.000000000 -0500
296     @@ -0,0 +1 @@
297     +LogFile /var/log/clamd/current
298     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
299     --- 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
300     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogTime 2020-12-02 11:37:01.000000000 -0500
301     @@ -0,0 +1 @@
302     +LogTime { $clamav{LogTime} || 'yes' }
303     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
304     --- 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
305     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/LogVerbose 2020-12-02 11:37:01.000000000 -0500
306     @@ -0,0 +1 @@
307     +LogVerbose { $clamav{LogVerbose} || 'yes' }
308     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
309     --- 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
310     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxConnectionQueueLength 2020-12-02 11:37:01.000000000 -0500
311     @@ -0,0 +1,4 @@
312     +{
313     +# Maximum length the queue of pending connections may grow to.
314     + "MaxConnectionQueueLength $clamav{MaxConnectionQueueLength}";
315     +}
316     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
317     --- 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
318     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxDirectoryRecursion 2020-12-02 11:37:01.000000000 -0500
319     @@ -0,0 +1,4 @@
320     +{
321     +# Maximal depth directories are scanned at.
322     + "MaxDirectoryRecursion $clamav{MaxDirectoryRecursion}";
323     +}
324     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
325     --- 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
326     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFiles 2020-12-02 11:37:01.000000000 -0500
327     @@ -0,0 +1,5 @@
328     +{
329     +# Number of files to be scanned within an archive.
330     +# Value of 0 disables the limit.
331     + "MaxFiles $clamav{MaxFiles}";
332     +}
333     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
334     --- 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
335     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxFileSize 2020-12-02 11:37:01.000000000 -0500
336     @@ -0,0 +1,5 @@
337     +{
338     +# Files in archives larger than this limit won't be scanned.
339     +# Value of 0 disables the limit.
340     + "MaxFileSize $clamav{MaxFileSize}";
341     +}
342     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
343     --- 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
344     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxRecursion 2020-12-02 11:37:01.000000000 -0500
345     @@ -0,0 +1,7 @@
346     +{
347     +# Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
348     +# file, all files within it will also be scanned. This options specifies how
349     +# deep the process should be continued.
350     +# Value of 0 disables the limit.
351     + "MaxRecursion $clamav{MaxRecursion}";
352     +}
353     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
354     --- 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
355     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/MaxThreads 2020-12-02 11:37:01.000000000 -0500
356     @@ -0,0 +1,4 @@
357     +{
358     +# Maximal number of threads running at the same time.
359     + "MaxThreads $clamav{MaxThreads}";
360     +}
361     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
362     --- 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
363     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/PidFile 2020-12-11 07:19:01.000000000 -0500
364     @@ -0,0 +1 @@
365     +PidFile /run/clamd/clamd.pid
366     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
367     --- 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
368     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ReadTimeout 2020-12-02 11:37:01.000000000 -0500
369     @@ -0,0 +1,5 @@
370     +{
371     +# Waiting for data from a client socket will timeout after this time (seconds).
372     +# Value of 0 disables the timeout.
373     + "ReadTimeout $clamav{ReadTimeout}";
374     +}
375     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
376     --- 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
377     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanArchive 2020-12-02 11:37:01.000000000 -0500
378     @@ -0,0 +1 @@
379     +ScanArchive { $clamav{ScanArchive} || 'yes' }
380     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
381     --- 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
382     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanHTML 2020-12-02 11:37:01.000000000 -0500
383     @@ -0,0 +1 @@
384     +ScanHTML { $clamav{ScanHTML} || 'yes' }
385     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
386     --- 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
387     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanMail 2020-12-02 11:37:01.000000000 -0500
388     @@ -0,0 +1 @@
389     +ScanMail { $clamav{ScanMail} || 'yes' }
390     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
391     --- 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
392     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanOLE2 2020-12-02 11:37:01.000000000 -0500
393     @@ -0,0 +1 @@
394     +ScanOLE2 { $clamav{ScanOLE2} || 'yes' }
395     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
396     --- 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
397     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/ScanPE 2020-12-02 11:37:01.000000000 -0500
398     @@ -0,0 +1 @@
399     +ScanPE { $clamav{ScanPE} || 'yes' }
400     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
401     --- 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
402     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/SelfCheck 2020-12-10 08:18:03.000000000 -0500
403     @@ -0,0 +1,2 @@
404     +# Perform internal sanity check (database integrity and freshness).
405     +SelfCheck { $clamav{SelfCheck} || '600' }
406     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
407     --- 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
408     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/StreamMaxLength 2020-12-02 11:37:01.000000000 -0500
409     @@ -0,0 +1,2 @@
410     +# Close the connection if this limit is exceeded.
411     +StreamMaxLength { $clamav{StreamMaxLength} || '25M' }
412     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
413     --- 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
414     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPAddr 2020-12-02 11:37:01.000000000 -0500
415     @@ -0,0 +1,7 @@
416     +{
417     +# TCP address.
418     +# By default we bind to INADDR_ANY, probably not wise.
419     +# Enable the following to provide some degree of protection
420     +# from the outside world.
421     + $clamav{TCPAddr} ? "TCPAddr $clamav{TCPAddr}" : '#TCPAddr 127.0.0.1';
422     +}
423     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
424     --- 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
425     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TCPSocket 2020-12-02 11:37:01.000000000 -0500
426     @@ -0,0 +1,4 @@
427     +{
428     +# TCP port address.
429     + $clamav{TCPSocket} ? "TCPSocket $clamav{TCPSocket}" : '#TCPSocket 3310';
430     +}
431     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
432     --- 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
433     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/TemporaryDirectory 2020-12-02 11:37:01.000000000 -0500
434     @@ -0,0 +1 @@
435     +TemporaryDirectory /var/tmp
436     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
437     --- 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
438     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/clamd.d/scan.conf/User 2020-12-03 07:24:21.000000000 -0500
439     @@ -0,0 +1 @@
440     +User clamscan
441     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
442     --- smeserver-clamav-2.7.0.old/root/etc/e-smith/templates/etc/freshclam.conf/NotifyClamd 2020-12-02 11:37:01.000000000 -0500
443     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/freshclam.conf/NotifyClamd 2021-04-07 16:57:42.772000000 -0400
444     @@ -1 +1 @@
445     -NotifyClamd /etc/clamd.d/clamd.conf
446     +NotifyClamd /etc/clamd.d/scan.conf
447     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
448     --- 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
449     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates/etc/logrotate.d/clamd/clamd.logrotate 2021-04-07 16:58:18.559000000 -0400
450     @@ -1,10 +1,10 @@
451     -# Hmmm....
452     +#
453     /var/log/clamd/current \{
454     monthly
455     notifempty
456     missingok
457    
458     postrotate
459     - pkill -u clamscan -HUP -f '/usr/sbin/clamd -c /etc/clamd.d/clamd.conf >/dev/null 2>&1 || :
460     + pkill -u clamscan -HUP -f '/usr/sbin/clamd -c /etc/clamd.d/scan.conf >/dev/null 2>&1 || :
461     endscript
462     \}
463     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
464     --- 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
465     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates.metadata/etc/clamd.d/clamd.conf 1969-12-31 19:00:00.000000000 -0500
466     @@ -1 +0,0 @@
467     -PERMS=0644
468     \ Pas de fin de ligne à la fin du fichier
469     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
470     --- 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
471     +++ smeserver-clamav-2.7.0/root/etc/e-smith/templates.metadata/etc/clamd.d/scan.conf 2020-12-07 05:14:53.000000000 -0500
472     @@ -0,0 +1 @@
473     +PERMS=0644
474     \ Pas de fin de ligne à la fin du fichier
475     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
476     --- smeserver-clamav-2.7.0.old/root/etc/profile.d/clamd.sh 2021-04-07 16:27:19.455000000 -0400
477     +++ smeserver-clamav-2.7.0/root/etc/profile.d/clamd.sh 1969-12-31 19:00:00.000000000 -0500
478     @@ -1,4 +0,0 @@
479     -# Don't define aliases in plain Bourne shell
480     -[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
481     -alias clamdtop='clamdtop /run/clamd/clamd.socket'
482     -
483     diff -Nur --no-dereference smeserver-clamav-2.7.0.old/root/sbin/clamdscan smeserver-clamav-2.7.0/root/sbin/clamdscan
484     --- smeserver-clamav-2.7.0.old/root/sbin/clamdscan 1969-12-31 19:00:00.000000000 -0500
485     +++ smeserver-clamav-2.7.0/root/sbin/clamdscan 2021-04-07 16:55:27.398000000 -0400
486     @@ -0,0 +1,18 @@
487     +#!/bin/bash
488     +# wrapper for clamdscan to force the --fdpass parameter to avoir failure because of
489     +# no permission to access
490     +allargs=$@
491     +toadd=" --fdpass "
492     +#parse args
493     +while [ "$#" -gt 0 ]; do
494     + case "$1" in
495     + --fdpass) toadd="" ;;
496     + --stream) toadd="" ;;
497     + esac
498     + shift
499     +done
500     +
501     +
502     +#we return to systemd systemctl command unless this is one of the command we want to handle
503     +/usr/bin/clamdscan $toadd ${allargs[*]}
504     +
505     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
506     --- smeserver-clamav-2.7.0.old/root/usr/lib/systemd/system/clamd.service 2021-04-07 16:27:19.434000000 -0400
507     +++ smeserver-clamav-2.7.0/root/usr/lib/systemd/system/clamd.service 2021-04-07 16:58:48.875000000 -0400
508     @@ -8,8 +8,8 @@
509     [Service]
510     Type = forking
511     ExecStartPre=/sbin/e-smith/service-status clamd
512     -ExecStartPre=-/sbin/e-smith/expand-template /etc/clamd.d/clamd.conf
513     -ExecStart=/usr/sbin/clamd -c /etc/clamd.d/clamd.conf
514     +ExecStartPre=-/sbin/e-smith/expand-template /etc/clamd.d/scan.conf
515     +ExecStart=/usr/sbin/clamd -c /etc/clamd.d/scan.conf
516     # Reload the database
517     ExecReload=/bin/kill -USR2 $MAINPID
518     Restart=on-failure
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed