[clamav: 1/2] Upgrade to 0.98.5 and updated daily.cvd (#1138101)
Robert Scheck
robert at fedoraproject.org
Wed Nov 19 12:00:41 UTC 2014
commit cf98e1a8b5d498fcbb027d1a2dd99059184d7a67
Author: Robert Scheck <robert at fedoraproject.org>
Date: Wed Nov 19 12:59:13 2014 +0100
Upgrade to 0.98.5 and updated daily.cvd (#1138101)
clamav-0.98-cliopts.patch | 11 -----------
clamav-0.98.5-cliopts.patch | 11 +++++++++++
...98.3-jitoff.patch => clamav-0.98.5-jitoff.patch | 18 +++++++++---------
clamav.spec | 11 +++++++----
sources | 4 ++--
5 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/clamav-0.98.5-cliopts.patch b/clamav-0.98.5-cliopts.patch
new file mode 100644
index 0000000..58eb83a
--- /dev/null
+++ b/clamav-0.98.5-cliopts.patch
@@ -0,0 +1,11 @@
+--- clamav-0.98.5/shared/optparser.c 2014-11-13 23:30:44.000000000 +0100
++++ clamav-0.98.5/shared/optparser.c.cliopts 2014-11-19 11:44:52.357577022 +0100
+@@ -272,7 +272,7 @@
+
+ { "AllowAllMatchScan", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD, "Permit use of the ALLMATCHSCAN command.", "yes" },
+
+- { "Foreground", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
++ { "Foreground", "nofork", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" },
+
+ { "Debug", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" },
+
diff --git a/clamav-0.98.3-jitoff.patch b/clamav-0.98.5-jitoff.patch
similarity index 50%
rename from clamav-0.98.3-jitoff.patch
rename to clamav-0.98.5-jitoff.patch
index e2cec50..aa45b90 100644
--- a/clamav-0.98.3-jitoff.patch
+++ b/clamav-0.98.5-jitoff.patch
@@ -1,5 +1,5 @@
---- clamav-0.98.3/etc/clamd.conf.sample 2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3/etc/clamd.conf.sample.jitoff 2014-05-10 22:20:49.000000000 +0200
+--- 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
@@ -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.3/shared/optparser.c 2014-05-06 20:42:41.000000000 +0200
-+++ clamav-0.98.3/shared/optparser.c.jitoff 2014-05-10 22:21:27.000000000 +0200
-@@ -295,7 +295,7 @@
- { "BytecodeUnsigned", "bytecode-unsigned", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN,
+--- 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
+@@ -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, 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,
+- { "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"},
- { "BytecodeStatistics", "bytecode-statistics", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN | OPT_CLAMBC, "Collect and print bytecode execution statistics.", "no" },
+ { "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 9cea5a5..7f7aa1e 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -53,7 +53,7 @@ Requires(postun): /bin/systemctl\
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 0.98.4
+Version: 0.98.5
Release: 1%{?dist}
License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
Group: Applications/File
@@ -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-19120.cvd
+Source11: http://db.local.clamav.net/daily-19651.cvd
Patch24: clamav-0.92-private.patch
-Patch26: clamav-0.98-cliopts.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.3-jitoff.patch
+Patch29: clamav-0.98.5-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
+* Wed Nov 19 2014 Robert Scheck <robert at fedoraproject.org> - 0.98.5-1
+- Upgrade to 0.98.5 and updated daily.cvd (#1138101)
+
* Sat Jun 21 2014 Robert Scheck <robert at fedoraproject.org> - 0.98.4-1
- Upgrade to 0.98.4 and updated daily.cvd (#1111811)
- Add build requirement to libxml2 for DMG, OpenIOC and XAR
diff --git a/sources b/sources
index 08599ef..aad7cca 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz
+6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz
06f660f474d1a6863de4a00eb02521e3 main-55.cvd
-14939dd869178d9c934bd2b7026104f5 daily-19120.cvd
+f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd
More information about the scm-commits
mailing list