diff --git a/.gitignore b/.gitignore index e884c29..73ffe3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +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 +/clamav-0.97.1-norar.tar.xz diff --git a/clamav-0.96.2-jitoff.patch b/clamav-0.96.2-jitoff.patch index 511d0f3..b34fc81 100644 --- a/clamav-0.96.2-jitoff.patch +++ b/clamav-0.96.2-jitoff.patch @@ -1,6 +1,8 @@ ---- 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 @@ +Index: clamav-0.97.1/etc/clamd.conf +=================================================================== +--- clamav-0.97.1.orig/etc/clamd.conf ++++ clamav-0.97.1/etc/clamd.conf +@@ -469,6 +469,16 @@ Example # Default: yes #Bytecode yes @@ -17,14 +19,16 @@ # Set bytecode security level. # Possible values: # None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS ---- 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, 5000, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, - "Set bytecode timeout in miliseconds.\n","5000"}, +Index: clamav-0.97.1/shared/optparser.c +=================================================================== +--- clamav-0.97.1.orig/shared/optparser.c ++++ clamav-0.97.1/shared/optparser.c +@@ -264,7 +264,7 @@ const struct clam_option __clam_options[ + { "BytecodeUnsigned", "bytecode-unsigned", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, + "Allow loading bytecode from outside digitally signed .c[lv]d files.\n","no"}, + - { "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"}, - { "DetectPUA", "detect-pua", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Detect Potentially Unwanted Applications.", "yes" }, + { "DetectPUA", "detect-pua", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Detect Potentially Unwanted Applications.", "yes" }, diff --git a/clamav.spec b/clamav.spec index a39e732..18710c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -36,8 +36,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.97 -Release: %release_func 1501 +Version: 0.97.1 +Release: %release_func 1500 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net @@ -801,6 +801,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Jun 9 2011 Enrico Scholz - 0.97.1-1500 +- updated to 0.97.1 + * Sat Apr 23 2011 Enrico Scholz - 0.97-1501 - fixed tmpfiles.d syntax (#696812) diff --git a/lastver b/lastver index f0dee0c..e84716c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.96.5 +0.97.1 diff --git a/sources b/sources index cfde483..c663d0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ac2932a776943b01d943f2f27967e6d clamav-0.97-norar.tar.xz +aabce43102cebdc445acaa6b7ee4db09 clamav-0.97.1-norar.tar.xz