diff --git a/.gitignore b/.gitignore index 9cce301..e473819 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/clamav-0.96.3-norar.tar.xz -/clamav-0.96.4-norar.tar.xz -/clamav-0.96.5-norar.tar.xz +/clamav-0.97-norar.tar.xz diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch index 7d94b28..e2bb19b 100644 --- a/clamav-0.95-cliopts.patch +++ b/clamav-0.95-cliopts.patch @@ -2,7 +2,7 @@ Index: clamav-0.96.1/shared/optparser.c =================================================================== --- clamav-0.96.1.orig/shared/optparser.c +++ clamav-0.96.1/shared/optparser.c -@@ -236,7 +236,7 @@ const struct clam_option __clam_options[ +@@ -242,7 +242,7 @@ const struct clam_option __clam_options[ { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch index 98e4cad..22e7c06 100644 --- a/clamav-0.95.3-umask.patch +++ b/clamav-0.95.3-umask.patch @@ -28,7 +28,7 @@ Index: clamav-0.96.2/freshclam/freshclam.c =================================================================== --- clamav-0.96.2.orig/freshclam/freshclam.c +++ clamav-0.96.2/freshclam/freshclam.c -@@ -106,7 +106,7 @@ static void writepid(const char *pidfile +@@ -114,7 +114,7 @@ static void writepid(const char *pidfile { FILE *fd; int old_umask; diff --git a/clamav-0.96.2-jitoff.patch b/clamav-0.96.2-jitoff.patch index b988074..8d8fc3a 100644 --- a/clamav-0.96.2-jitoff.patch +++ b/clamav-0.96.2-jitoff.patch @@ -2,7 +2,7 @@ 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 +@@ -464,6 +464,16 @@ Example # Default: yes #Bytecode yes @@ -23,10 +23,10 @@ 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[ +@@ -258,7 +258,7 @@ const struct clam_option __clam_options[ "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 d28a5e7..4f84d8b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -36,8 +36,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.96.5 -Release: %release_func 1503 +Version: 0.97 +Release: %release_func 1600 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net @@ -801,6 +801,10 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Feb 20 2011 Enrico Scholz - 0.97-1600 +- updated to 0.97 +- rediffed some patches + * Tue Feb 08 2011 Fedora Release Engineering - 0.96.5-1503 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/lastver b/lastver index f0dee0c..ea6844b 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.96.5 +0.97 diff --git a/sources b/sources index ed8890c..aaef1fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7130eea6e410b644be33e869cb497e33 clamav-0.96.5-norar.tar.xz +5c31b43e0198ef140359547e1cb529d5 clamav-0.97-norar.tar.xz