smeserver-clamav/sme7/smeserver-clamav-1.2.0-version90.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted      2007-02-14 08:56:05.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted    2007-02-14 08:54:01.000000000 -0700
@@ -1,5 +1 @@
-{ 
-# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
-    ($clamav{ArchiveBlockEncrypted} || 'no') eq 'yes' ? 
-       'ArchiveBlockEncrypted' : '#ArchiveBlockEncrypted';
-}
+ArchiveBlockEncrypted { $clamav{ArchiveBlockEncrypted} || 'no' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax    2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax  2007-02-14 08:54:01.000000000 -0700
@@ -1,6 +1 @@
-{
-# Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or
-# ArchiveMaxRecursion limit is reached.
-    ($clamav{ArchiveBlockMax} || 'no') eq 'yes' ? 
-       'ArchiveBlockMax' : '#ArchiveBlockMax';
-}
+ArchiveBlockMax { $clamav{ArchiveBlockMax} || 'no' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug      2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug    2007-02-14 08:54:01.000000000 -0700
@@ -1,4 +1 @@
-{
-# Enable debug messages in libclamav.
-    ($clamav{Debug} || 'no') eq 'yes' ? 'Debug' : '#Debug';
-}
+Debug { $clamav{Debug} || 'no' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables    2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables  2007-02-14 08:54:01.000000000 -0700
@@ -1,8 +1 @@
-{ 
-# With this option clamav will try to detect broken executables and mark
-# them as Broken.Executable
-
-    ($clamav{DetectBrokenExecutables} || 'no') eq 'yes' ? 
-       'DetectBrokenExecutables' : 
-       '#DetectBrokenExecutables'; 
-}
+DetectBrokenExecutables { $clamav{DetectBrokenExecutables} || 'no' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket     2005-02-09 19:38:44.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket   2007-02-14 08:54:01.000000000 -0700
@@ -1 +1 @@
-FixStaleSocket
+FixStaleSocket yes
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground 2005-02-09 19:38:44.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground       2007-02-14 08:54:01.000000000 -0700
@@ -1 +1 @@
-Foreground
+Foreground yes
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles        2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles      2007-02-14 08:54:01.000000000 -0700
@@ -1,5 +1 @@
-{
-# Do not remove temporary files (for debug purposes).
-    ($clamav{LeaveTemporaryFiles} || 'no') eq 'yes' ? 
-       'LeaveTemporaryFiles' : '#LeaveTemporaryFiles';
-}
+LeaveTemporaryFiles { $clamav{LeaveTemporaryFiles} || 'no' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean   2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean 2007-02-14 08:54:01.000000000 -0700
@@ -1,5 +1 @@
-{
-# Also log clean files. Useful in debugging but drastically increases the
-# log size.
-    ($clamav{LogClean} || 'yes') eq 'yes' ? 'LogClean' : '#LogClean';
-}
+LogClean { $clamav{LogClean} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile    2005-02-09 19:38:44.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile  1969-12-31 17:00:00.000000000 -0700
@@ -1,2 +0,0 @@
-LogFile /dev/stderr
-LogFileMaxSize 0
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock      2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock    1969-12-31 17:00:00.000000000 -0700
@@ -1,5 +0,0 @@
-{
-# This option disables log file locking.
-    ($clamav{LogFileUnlock} || 'yes') eq 'yes' ? 
-       'LogFileUnlock' : '#LogFileUnlock';
-}
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime    2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime  2007-02-14 08:54:01.000000000 -0700
@@ -1,4 +1 @@
-{
-# Log time with an each message.
-    ($clamav{LogTime} || 'yes') eq 'yes' ? 'LogTime' : '#LogTime';
-}
+LogTime { $clamav{LogTime} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose 2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose       2007-02-14 08:54:01.000000000 -0700
@@ -1,4 +1 @@
-{
-# Enable verbose logging.
-    ($clamav{LogVerbose} || 'yes') eq 'yes' ? 'LogVerbose' : '#LogVerbose';
-}
+LogVerbose { $clamav{LogVerbose} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive        2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive      2007-02-14 08:54:01.000000000 -0700
@@ -1,4 +1 @@
-{
-# ClamAV can scan within archives and compressed files.
-    ($clamav{ScanArchive} || 'yes') eq 'yes' ? 'ScanArchive' : '#ScanArchive';
-}
+ScanArchive { $clamav{ScanArchive} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML   2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML 2007-02-14 08:54:01.000000000 -0700
@@ -1,5 +1 @@
-{
-# Perform HTML normalisation and decryption of MS Script Encoder code.
-    ($clamav{ScanHTML} || 'yes') eq 'yes' ? 'ScanHTML' : '#ScanHTML';
-}
-
+ScanHTML { $clamav{ScanHTML} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail   2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail 2007-02-14 08:54:01.000000000 -0700
@@ -1,5 +1 @@
-{ 
-# Enable internal e-mail scanner.
-    ($clamav{ScanMail} || 'yes') eq 'yes' ? 'ScanMail' : '#ScanMail';
-}
-
+ScanMail { $clamav{ScanMail} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2 mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2   2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2 2007-02-14 08:54:01.000000000 -0700
@@ -1,4 +1 @@
-{
-# This option enables scanning of Microsoft Office document macros.
-    ($clamav{ScanOLE2} || 'yes') eq 'yes' ? 'ScanOLE2' : '#ScanOLE2';
-}
+ScanOLE2 { $clamav{ScanOLE2} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE     2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE   2007-02-14 08:54:01.000000000 -0700
@@ -1,8 +1 @@
-{
-# PE stands for Portable Executable - it's an executable file format used
-# in all 32-bit versions of Windows operating systems. This option allows
-# ClamAV to perform a deeper analysis of executable files and it's also
-# required for decompression of popular executable packers such as UPX, FSG,
-# and Petite.
-    ($clamav{ScanPE} || 'yes') eq 'yes' ? 'ScanPE' : '#ScanPE';
-}
+ScanPE { $clamav{ScanPE} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR    2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR  1969-12-31 17:00:00.000000000 -0700
@@ -1,8 +0,0 @@
-{
-# Due to license issues libclamav does not support RAR 3.0 archives (only the
-# old 2.0 format is supported). Because some users report stability problems
-# with unrarlib it's disabled by default and you must uncomment the directive
-# below to enable RAR 2.0 support.
-    ($clamav{ScanRAR} || 'no') eq 'yes' ? 'ScanRAR' : '#ScanRAR';
-}
-
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User       2005-02-09 19:38:44.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User     2007-02-14 08:54:01.000000000 -0700
@@ -1,2 +1,2 @@
 User clamav
-AllowSupplementaryGroups
+AllowSupplementaryGroups yes
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground     2005-05-05 19:53:25.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground   2007-02-14 08:54:01.000000000 -0700
@@ -1 +1 @@
-Foreground
+Foreground yes
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose     2005-05-05 19:53:26.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose   2007-02-14 08:54:01.000000000 -0700
@@ -1,5 +1 @@
-{
-# Enable verbose logging.
-    ($clamav{LogVerbose} || 'yes') eq 'yes' ? 'LogVerbose' : '#LogVerbose' 
-}
-
+LogVerbose { $clamav{LogVerbose} || 'yes' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile
--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile  2005-02-09 19:38:45.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile        1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-UpdateLogFile /dev/stderr
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed
--- smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed    2007-02-14 08:56:05.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed  2007-02-14 08:55:10.000000000 -0700
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 #----------------------------------------------------------------------
 
-tac /var/log/freshclam/current | sed -n '1,/---/p' | tac | tai64nlocal | sed '/---/d;s/\.[0-9]\{9\}//' \
+tac /var/log/freshclam/current | sed -n '/Downloading/d;1,/process started/p;/process started/q' | tac | tai64nlocal | \
      mail -s 'freshclam: Update failed' admin
 
 exit 0
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok
--- smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok        2007-02-14 08:56:05.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok      2007-02-14 08:55:38.000000000 -0700
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 #----------------------------------------------------------------------
 
-#tac /var/log/freshclam/current | sed -n '1,/---/p' | tac | tai64nlocal | sed '/---/d;s/\.[0-9]\{9\}//' \
+#tac /var/log/freshclam/current | sed -n '/Downloading/d;1,/process started/p;/process started/q' | tac | tai64nlocal | \
 #     mail -s 'freshclam: Virus patterns updated' admin
 
 exit 0
diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/var/service/freshclam/run mezzanine_patched_smeserver-clamav-1.2.0/root/var/service/freshclam/run
--- smeserver-clamav-1.2.0/root/var/service/freshclam/run       2005-08-18 22:20:01.000000000 -0600
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/var/service/freshclam/run     2007-02-14 08:54:01.000000000 -0700
@@ -24,4 +24,4 @@
 
 /sbin/e-smith/expand-template /etc/freshclam.conf
 
-exec /usr/bin/freshclam --daemon --quiet
+exec /usr/bin/freshclam --daemon
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted
2			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted 2007-02-14 08:56:05.000000000 -0700
3			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockEncrypted 2007-02-14 08:54:01.000000000 -0700
4			@@ -1,5 +1 @@
5			-{
6			-# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
7			- ($clamav{ArchiveBlockEncrypted} \|\| 'no') eq 'yes' ?
8			- 'ArchiveBlockEncrypted' : '#ArchiveBlockEncrypted';
9			-}
10			+ArchiveBlockEncrypted { $clamav{ArchiveBlockEncrypted} \|\| 'no' }
11			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax
12			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax 2005-05-05 19:53:26.000000000 -0600
13			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ArchiveBlockMax 2007-02-14 08:54:01.000000000 -0700
14			@@ -1,6 +1 @@
15			-{
16			-# Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or
17			-# ArchiveMaxRecursion limit is reached.
18			- ($clamav{ArchiveBlockMax} \|\| 'no') eq 'yes' ?
19			- 'ArchiveBlockMax' : '#ArchiveBlockMax';
20			-}
21			+ArchiveBlockMax { $clamav{ArchiveBlockMax} \|\| 'no' }
22			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug
23			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug 2005-05-05 19:53:26.000000000 -0600
24			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Debug 2007-02-14 08:54:01.000000000 -0700
25			@@ -1,4 +1 @@
26			-{
27			-# Enable debug messages in libclamav.
28			- ($clamav{Debug} \|\| 'no') eq 'yes' ? 'Debug' : '#Debug';
29			-}
30			+Debug { $clamav{Debug} \|\| 'no' }
31			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables
32			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables 2005-05-05 19:53:26.000000000 -0600
33			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/DetectBrokenExecutables 2007-02-14 08:54:01.000000000 -0700
34			@@ -1,8 +1 @@
35			-{
36			-# With this option clamav will try to detect broken executables and mark
37			-# them as Broken.Executable
38			-
39			- ($clamav{DetectBrokenExecutables} \|\| 'no') eq 'yes' ?
40			- 'DetectBrokenExecutables' :
41			- '#DetectBrokenExecutables';
42			-}
43			+DetectBrokenExecutables { $clamav{DetectBrokenExecutables} \|\| 'no' }
44			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket
45			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket 2005-02-09 19:38:44.000000000 -0700
46			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/FixStaleSocket 2007-02-14 08:54:01.000000000 -0700
47			@@ -1 +1 @@
48			-FixStaleSocket
49			+FixStaleSocket yes
50			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground
51			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground 2005-02-09 19:38:44.000000000 -0700
52			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/Foreground 2007-02-14 08:54:01.000000000 -0700
53			@@ -1 +1 @@
54			-Foreground
55			+Foreground yes
56			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles
57			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles 2005-05-05 19:53:26.000000000 -0600
58			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LeaveTemporaryFiles 2007-02-14 08:54:01.000000000 -0700
59			@@ -1,5 +1 @@
60			-{
61			-# Do not remove temporary files (for debug purposes).
62			- ($clamav{LeaveTemporaryFiles} \|\| 'no') eq 'yes' ?
63			- 'LeaveTemporaryFiles' : '#LeaveTemporaryFiles';
64			-}
65			+LeaveTemporaryFiles { $clamav{LeaveTemporaryFiles} \|\| 'no' }
66			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean
67			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean 2005-05-05 19:53:26.000000000 -0600
68			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogClean 2007-02-14 08:54:01.000000000 -0700
69			@@ -1,5 +1 @@
70			-{
71			-# Also log clean files. Useful in debugging but drastically increases the
72			-# log size.
73			- ($clamav{LogClean} \|\| 'yes') eq 'yes' ? 'LogClean' : '#LogClean';
74			-}
75			+LogClean { $clamav{LogClean} \|\| 'yes' }
76			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile
77			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile 2005-02-09 19:38:44.000000000 -0700
78			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFile 1969-12-31 17:00:00.000000000 -0700
79			@@ -1,2 +0,0 @@
80			-LogFile /dev/stderr
81			-LogFileMaxSize 0
82			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock
83			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock 2005-05-05 19:53:26.000000000 -0600
84			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogFileUnlock 1969-12-31 17:00:00.000000000 -0700
85			@@ -1,5 +0,0 @@
86			-{
87			-# This option disables log file locking.
88			- ($clamav{LogFileUnlock} \|\| 'yes') eq 'yes' ?
89			- 'LogFileUnlock' : '#LogFileUnlock';
90			-}
91			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime
92			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime 2005-05-05 19:53:26.000000000 -0600
93			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogTime 2007-02-14 08:54:01.000000000 -0700
94			@@ -1,4 +1 @@
95			-{
96			-# Log time with an each message.
97			- ($clamav{LogTime} \|\| 'yes') eq 'yes' ? 'LogTime' : '#LogTime';
98			-}
99			+LogTime { $clamav{LogTime} \|\| 'yes' }
100			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose
101			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose 2005-05-05 19:53:26.000000000 -0600
102			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/LogVerbose 2007-02-14 08:54:01.000000000 -0700
103			@@ -1,4 +1 @@
104			-{
105			-# Enable verbose logging.
106			- ($clamav{LogVerbose} \|\| 'yes') eq 'yes' ? 'LogVerbose' : '#LogVerbose';
107			-}
108			+LogVerbose { $clamav{LogVerbose} \|\| 'yes' }
109			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive
110			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive 2005-05-05 19:53:26.000000000 -0600
111			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanArchive 2007-02-14 08:54:01.000000000 -0700
112			@@ -1,4 +1 @@
113			-{
114			-# ClamAV can scan within archives and compressed files.
115			- ($clamav{ScanArchive} \|\| 'yes') eq 'yes' ? 'ScanArchive' : '#ScanArchive';
116			-}
117			+ScanArchive { $clamav{ScanArchive} \|\| 'yes' }
118			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML
119			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML 2005-05-05 19:53:26.000000000 -0600
120			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanHTML 2007-02-14 08:54:01.000000000 -0700
121			@@ -1,5 +1 @@
122			-{
123			-# Perform HTML normalisation and decryption of MS Script Encoder code.
124			- ($clamav{ScanHTML} \|\| 'yes') eq 'yes' ? 'ScanHTML' : '#ScanHTML';
125			-}
126			-
127			+ScanHTML { $clamav{ScanHTML} \|\| 'yes' }
128			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail
129			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail 2005-05-05 19:53:26.000000000 -0600
130			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanMail 2007-02-14 08:54:01.000000000 -0700
131			@@ -1,5 +1 @@
132			-{
133			-# Enable internal e-mail scanner.
134			- ($clamav{ScanMail} \|\| 'yes') eq 'yes' ? 'ScanMail' : '#ScanMail';
135			-}
136			-
137			+ScanMail { $clamav{ScanMail} \|\| 'yes' }
138			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2 mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2
139			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2 2005-05-05 19:53:26.000000000 -0600
140			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanOLE2 2007-02-14 08:54:01.000000000 -0700
141			@@ -1,4 +1 @@
142			-{
143			-# This option enables scanning of Microsoft Office document macros.
144			- ($clamav{ScanOLE2} \|\| 'yes') eq 'yes' ? 'ScanOLE2' : '#ScanOLE2';
145			-}
146			+ScanOLE2 { $clamav{ScanOLE2} \|\| 'yes' }
147			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE
148			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE 2005-05-05 19:53:26.000000000 -0600
149			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanPE 2007-02-14 08:54:01.000000000 -0700
150			@@ -1,8 +1 @@
151			-{
152			-# PE stands for Portable Executable - it's an executable file format used
153			-# in all 32-bit versions of Windows operating systems. This option allows
154			-# ClamAV to perform a deeper analysis of executable files and it's also
155			-# required for decompression of popular executable packers such as UPX, FSG,
156			-# and Petite.
157			- ($clamav{ScanPE} \|\| 'yes') eq 'yes' ? 'ScanPE' : '#ScanPE';
158			-}
159			+ScanPE { $clamav{ScanPE} \|\| 'yes' }
160			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR
161			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR 2005-05-05 19:53:26.000000000 -0600
162			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/ScanRAR 1969-12-31 17:00:00.000000000 -0700
163			@@ -1,8 +0,0 @@
164			-{
165			-# Due to license issues libclamav does not support RAR 3.0 archives (only the
166			-# old 2.0 format is supported). Because some users report stability problems
167			-# with unrarlib it's disabled by default and you must uncomment the directive
168			-# below to enable RAR 2.0 support.
169			- ($clamav{ScanRAR} \|\| 'no') eq 'yes' ? 'ScanRAR' : '#ScanRAR';
170			-}
171			-
172			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User
173			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User 2005-02-09 19:38:44.000000000 -0700
174			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/clamd.conf/User 2007-02-14 08:54:01.000000000 -0700
175			@@ -1,2 +1,2 @@
176			User clamav
177			-AllowSupplementaryGroups
178			+AllowSupplementaryGroups yes
179			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground
180			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground 2005-05-05 19:53:25.000000000 -0600
181			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/Foreground 2007-02-14 08:54:01.000000000 -0700
182			@@ -1 +1 @@
183			-Foreground
184			+Foreground yes
185			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose
186			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose 2005-05-05 19:53:26.000000000 -0600
187			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/LogVerbose 2007-02-14 08:54:01.000000000 -0700
188			@@ -1,5 +1 @@
189			-{
190			-# Enable verbose logging.
191			- ($clamav{LogVerbose} \|\| 'yes') eq 'yes' ? 'LogVerbose' : '#LogVerbose'
192			-}
193			-
194			+LogVerbose { $clamav{LogVerbose} \|\| 'yes' }
195			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile
196			--- smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile 2005-02-09 19:38:45.000000000 -0700
197			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/etc/e-smith/templates/etc/freshclam.conf/UpdateLogFile 1969-12-31 17:00:00.000000000 -0700
198			@@ -1 +0,0 @@
199			-UpdateLogFile /dev/stderr
200			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed
201			--- smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed 2007-02-14 08:56:05.000000000 -0700
202			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-failed 2007-02-14 08:55:10.000000000 -0700
203			@@ -17,7 +17,7 @@
204			# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
205			#----------------------------------------------------------------------
206
207			-tac /var/log/freshclam/current \| sed -n '1,/---/p' \| tac \| tai64nlocal \| sed '/---/d;s/\.[0-9]\{9\}//' \
208			+tac /var/log/freshclam/current \| sed -n '/Downloading/d;1,/process started/p;/process started/q' \| tac \| tai64nlocal \| \
209			mail -s 'freshclam: Update failed' admin
210
211			exit 0
212			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok
213			--- smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok 2007-02-14 08:56:05.000000000 -0700
214			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/freshclam-update-ok 2007-02-14 08:55:38.000000000 -0700
215			@@ -17,7 +17,7 @@
216			# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
217			#----------------------------------------------------------------------
218
219			-#tac /var/log/freshclam/current \| sed -n '1,/---/p' \| tac \| tai64nlocal \| sed '/---/d;s/\.[0-9]\{9\}//' \
220			+#tac /var/log/freshclam/current \| sed -n '/Downloading/d;1,/process started/p;/process started/q' \| tac \| tai64nlocal \| \
221			# mail -s 'freshclam: Virus patterns updated' admin
222
223			exit 0
224			diff -Nur -x '.orig' -x '.rej' smeserver-clamav-1.2.0/root/var/service/freshclam/run mezzanine_patched_smeserver-clamav-1.2.0/root/var/service/freshclam/run
225			--- smeserver-clamav-1.2.0/root/var/service/freshclam/run 2005-08-18 22:20:01.000000000 -0600
226			+++ mezzanine_patched_smeserver-clamav-1.2.0/root/var/service/freshclam/run 2007-02-14 08:54:01.000000000 -0700
227			@@ -24,4 +24,4 @@
228
229			/sbin/e-smith/expand-template /etc/freshclam.conf
230
231			-exec /usr/bin/freshclam --daemon --quiet
232			+exec /usr/bin/freshclam --daemon