[clamav] rediffed patches for 0.96.2
ensc
ensc at fedoraproject.org
Sun Aug 15 20:55:12 UTC 2010
commit e23ab1c21a91f7863a602f4de1ea993e85d0392d
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sun Aug 15 22:35:32 2010 +0200
rediffed patches for 0.96.2
clamav-0.92-open.patch | 6 +-
clamav-0.95.3-umask.patch | 20 +++---
clamav-0.96-disable-jit.patch | 150 -----------------------------------------
clamav-0.96-jitoff.patch | 80 ----------------------
clamav-0.96.2-jitoff.patch | 34 +++++++++
clamav.spec | 4 +-
6 files changed, 48 insertions(+), 246 deletions(-)
---
diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch
index 48ad0c1..e300279 100644
--- a/clamav-0.92-open.patch
+++ b/clamav-0.92-open.patch
@@ -1,7 +1,7 @@
-Index: clamav-0.96.1/clamd/dazukoio_compat12.c
+Index: clamav-0.96.2/clamd/dazukoio_compat12.c
===================================================================
---- clamav-0.96.1.orig/clamd/dazukoio_compat12.c
-+++ clamav-0.96.1/clamd/dazukoio_compat12.c
+--- clamav-0.96.2.orig/clamd/dazukoio_compat12.c
++++ clamav-0.96.2/clamd/dazukoio_compat12.c
@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da
if (dazuko->device < 0)
{
diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch
index ada0fcd..98e4cad 100644
--- a/clamav-0.95.3-umask.patch
+++ b/clamav-0.95.3-umask.patch
@@ -1,8 +1,8 @@
-Index: clamav-0.96.1/clamav-milter/clamav-milter.c
+Index: clamav-0.96.2/clamav-milter/clamav-milter.c
===================================================================
---- clamav-0.96.1.orig/clamav-milter/clamav-milter.c
-+++ clamav-0.96.1/clamav-milter/clamav-milter.c
-@@ -365,7 +365,7 @@ int main(int argc, char **argv) {
+--- clamav-0.96.2.orig/clamav-milter/clamav-milter.c
++++ clamav-0.96.2/clamav-milter/clamav-milter.c
+@@ -370,7 +370,7 @@ int main(int argc, char **argv) {
if((opt = optget(opts, "PidFile"))->enabled) {
FILE *fd;
@@ -11,10 +11,10 @@ Index: clamav-0.96.1/clamav-milter/clamav-milter.c
if((fd = fopen(opt->strarg, "w")) == NULL) {
logg("!Can't save PID in file %s\n", opt->strarg);
-Index: clamav-0.96.1/shared/output.c
+Index: clamav-0.96.2/shared/output.c
===================================================================
---- clamav-0.96.1.orig/shared/output.c
-+++ clamav-0.96.1/shared/output.c
+--- clamav-0.96.2.orig/shared/output.c
++++ clamav-0.96.2/shared/output.c
@@ -280,7 +280,7 @@ int logg(const char *str, ...)
#endif
if(logg_file) {
@@ -24,10 +24,10 @@ Index: clamav-0.96.1/shared/output.c
if((logg_fp = fopen(logg_file, "at")) == NULL) {
umask(old_umask);
#ifdef CL_THREAD_SAFE
-Index: clamav-0.96.1/freshclam/freshclam.c
+Index: clamav-0.96.2/freshclam/freshclam.c
===================================================================
---- clamav-0.96.1.orig/freshclam/freshclam.c
-+++ clamav-0.96.1/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
{
FILE *fd;
diff --git a/clamav-0.96.2-jitoff.patch b/clamav-0.96.2-jitoff.patch
new file mode 100644
index 0000000..b988074
--- /dev/null
+++ b/clamav-0.96.2-jitoff.patch
@@ -0,0 +1,34 @@
+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
+ # Default: yes
+ #Bytecode yes
+
++# Bytecode mode
++#
++# This option has been set to 'ForceInterpreter' in Fedora due to
++# security concerns by default. You might need to enable the
++# 'clamd_use_jit' SELinux boolean after setting this option to the
++# more efficient 'ForceJIT' value.
++#
++# Default: ForceInterpreter
++#ByteCodeMode ForceInterpreter
++
+ # 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[
+ "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"},
+- { "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" },
+
diff --git a/clamav.spec b/clamav.spec
index 80d5a9c..ab3f3cd 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -59,8 +59,7 @@ Patch25: clamav-0.92-open.patch
Patch26: clamav-0.95-cliopts.patch
Patch27: clamav-0.95.3-umask.patch
# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=patch&collapsed=&headers=1&format=raw
-Patch28: clamav-0.96-disable-jit.patch
-Patch29: clamav-0.96-jitoff.patch
+Patch29: clamav-0.96.2-jitoff.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: clamav-lib = %version-%release
Requires: data(clamav)
@@ -326,7 +325,6 @@ The Upstart initscripts for clamav-milter.
%apply -n25 -p1 -b .open
%apply -n26 -p1 -b .cliopts
%apply -n27 -p1 -b .umask
-%apply -n28 -p1 -b .jit-disable
%apply -n29 -p1 -b .jitoff
install -p -m0644 %SOURCE300 clamav-milter/
More information about the scm-commits
mailing list