[clamav/f13/master] Update to 0.97, rediff patch

[Nick Bebout]

commit 830984182a15fb8ce78bddcf14ab7cb2587b8c2a
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Mar 4 19:04:31 2011 -0600

    Update to 0.97, rediff patch

 clamav-0.96.2-jitoff.patch |   20 ++++++++------------
 clamav.spec                |    7 +++++--
 2 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/clamav-0.96.2-jitoff.patch b/clamav-0.96.2-jitoff.patch
index b988074..511d0f3 100644
--- a/clamav-0.96.2-jitoff.patch
+++ b/clamav-0.96.2-jitoff.patch
@@ -1,8 +1,6 @@
-Index: clamav-0.96.2/etc/clamd.conf
-===================================================================
---- clamav-0.96.2.orig/etc/clamd.conf
-+++ clamav-0.96.2/etc/clamd.conf
-@@ -459,6 +459,16 @@ Example
+--- clamav-0.97-orig/etc/clamd.conf	2011-01-20 08:12:41.000000000 -0600
++++ clamav-0.97/etc/clamd.conf	2011-03-03 20:00:07.677677290 -0600
+@@ -464,6 +464,16 @@
  # Default: yes
  #Bytecode yes
  
@@ -19,14 +17,12 @@ Index: clamav-0.96.2/etc/clamd.conf
  # Set bytecode security level.
  # Possible values:
  #       None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS
-Index: clamav-0.96.2/shared/optparser.c
-===================================================================
---- clamav-0.96.2.orig/shared/optparser.c
-+++ clamav-0.96.2/shared/optparser.c
-@@ -254,7 +254,7 @@ const struct clam_option __clam_options[
+--- clamav-0.97-orig/shared/optparser.c	2011-01-20 08:33:44.000000000 -0600
++++ clamav-0.97/shared/optparser.c	2011-03-03 19:59:36.557740794 -0600
+@@ -258,7 +258,7 @@
  	"Set bytecode security level.\nPossible values:\n\tNone - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS\n\tTrustSigned - trust bytecode loaded from signed .c[lv]d files,\n\t\t insert runtime safety checks for bytecode loaded from other sources\n\tParanoid - don't trust any bytecode, insert runtime checks for all\nRecommended: TrustSigned, because bytecode in .cvd files already has these checks\n","TrustSigned"},
-     { "BytecodeTimeout", "bytecode-timeout", 0, TYPE_NUMBER, MATCH_NUMBER, 60000, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, 
- 	"Set bytecode timeout in miliseconds.\n","60000"},
+     { "BytecodeTimeout", "bytecode-timeout", 0, TYPE_NUMBER, MATCH_NUMBER, 5000, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, 
+ 	"Set bytecode timeout in miliseconds.\n","5000"},
 -    { "BytecodeMode", "bytecode-mode", 0, TYPE_STRING, "^(Auto|ForceJIT|ForceInterpreter|Test)$", -1, "Auto", FLAG_REQUIRED, OPT_CLAMD | OPT_CLAMSCAN,
 +    { "BytecodeMode", "bytecode-mode", 0, TYPE_STRING, "^(Auto|ForceJIT|ForceInterpreter|Test)$", -1, "ForceInterpreter", FLAG_REQUIRED, OPT_CLAMD | OPT_CLAMSCAN,
  	"Set bytecode execution mode.\nPossible values:\n\tAuto - automatically choose JIT if possible, fallback to interpreter\nForceJIT - always choose JIT, fail if not possible\nForceIntepreter - always choose interpreter\nTest - run with both JIT and interpreter and compare results. Make all failures fatal\n","Auto"},
diff --git a/clamav.spec b/clamav.spec
index 3ee6844..4e7712b 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -26,8 +26,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.96.5
-Release:	%release_func 1301
+Version:	0.97
+Release:	%release_func 1300
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
 URL:		http://www.clamav.net
@@ -709,6 +709,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
 
 
 %changelog
+* Thu Mar 3 2011 Nick Bebout <nb at fedoraproject.org> - 0.97-1300
+- Upgrade to 0.97
+
 * Sat Jan  8 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96.5-1301
 - fixed signal specifier in clamd-wrapper (#668131, James Ralston)