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