diff --git a/clamav-0.98.5-jitoff.patch b/clamav-0.98.6-jitoff.patch similarity index 74% rename from clamav-0.98.5-jitoff.patch rename to clamav-0.98.6-jitoff.patch index aa45b90..b03c628 100644 --- a/clamav-0.98.5-jitoff.patch +++ b/clamav-0.98.6-jitoff.patch @@ -1,5 +1,5 @@ ---- clamav-0.98.5/etc/clamd.conf.sample 2014-05-06 20:39:56.000000000 +0200 -+++ clamav-0.98.5/etc/clamd.conf.sample.jitoff 2014-05-10 22:20:49.000000000 +0200 +--- clamav-0.98.6/etc/clamd.conf.sample 2014-05-06 20:39:56.000000000 +0200 ++++ clamav-0.98.6/etc/clamd.conf.sample.jitoff 2014-05-10 22:20:49.000000000 +0200 @@ -564,6 +564,16 @@ # Default: yes #Bytecode yes @@ -17,14 +17,14 @@ # Set bytecode security level. # Possible values: # None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS ---- clamav-0.98.5/shared/optparser.c 2014-11-19 11:46:47.080668301 +0100 -+++ clamav-0.98.5/shared/optparser.c.jitoff 2014-11-19 11:47:32.709306659 +0100 +--- clamav-0.98.6/shared/optparser.c 2015-01-29 21:28:10.024678857 +0100 ++++ clamav-0.98.6/shared/optparser.c.jitoff 2015-01-29 21:29:11.676195061 +0100 @@ -294,7 +294,7 @@ { "BytecodeUnsigned", "bytecode-unsigned", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Allow loading bytecode from outside digitally signed .c[lv]d files.","no"}, - { "BytecodeMode", "bytecode-mode", 0, CLOPT_TYPE_STRING, "^(Auto|ForceJIT|ForceInterpreter|Test)$", -1, "Auto", FLAG_REQUIRED, OPT_CLAMD | OPT_CLAMSCAN, + { "BytecodeMode", "bytecode-mode", 0, CLOPT_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.","Auto"}, + "Set bytecode execution mode.\nPossible values:\n\tAuto - automatically choose JIT if possible, fallback to interpreter\nForceJIT - always choose JIT, fail if not possible\nForceInterpreter - always choose interpreter\nTest - run with both JIT and interpreter and compare results. Make all failures fatal.","Auto"}, { "BytecodeStatistics", "bytecode-statistics", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN | OPT_CLAMBC, "Collect and print bytecode execution statistics.", "no" }, diff --git a/clamav.spec b/clamav.spec index b1a66a4..c5a017f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -53,8 +53,8 @@ Requires(postun): /bin/systemctl\ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.98.5 -Release: 2%{?dist} +Version: 0.98.6 +Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net @@ -71,13 +71,13 @@ Source0: %name-%version%{?prerelease}-norar.tar.xz # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source10: http://db.local.clamav.net/main-55.cvd -Source11: http://db.local.clamav.net/daily-19651.cvd +Source11: http://db.local.clamav.net/daily-19995.cvd Patch24: clamav-0.92-private.patch Patch26: clamav-0.98.5-cliopts.patch Patch27: clamav-0.98-umask.patch # https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=patch&collapsed=&headers=1&format=raw -Patch29: clamav-0.98.5-jitoff.patch +Patch29: clamav-0.98.6-jitoff.patch # https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?r1=128086&r2=137567 Patch30: llvm-glibc.patch BuildRoot: %_tmppath/%name-%version-%release-root @@ -856,6 +856,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Jan 29 2015 Robert Scheck - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) + * Wed Nov 19 2014 Robert Scheck - 0.98.5-2 - Corrected summary of clamav-server-systemd package (#1165672) diff --git a/sources b/sources index aad7cca..d5fc91c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz +a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd +d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd