[clamav: 1/2] - Upgrade to 0.98.3 and updated daily.cvd (#1095614) - Avoid automatic path detection breakage regar
Robert Scheck
robert at fedoraproject.org
Sat May 10 21:17:34 UTC 2014
commit 07c7f286706ac9e6ea49eed9d46e21ac2b0bfa93
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sat May 10 23:17:17 2014 +0200
- Upgrade to 0.98.3 and updated daily.cvd (#1095614)
- Avoid automatic path detection breakage regarding curl
- Added build requirement to openssl-devel for hasing code
- Added clamsubmit to main package
clamav-0.98-glibc-fanotify.patch | 95 --------------------
...0.98-jitoff.patch => clamav-0.98.3-jitoff.patch | 14 ++--
clamav.spec | 21 +++--
sources | 4 +-
4 files changed, 21 insertions(+), 113 deletions(-)
---
diff --git a/clamav-0.98-jitoff.patch b/clamav-0.98.3-jitoff.patch
similarity index 74%
rename from clamav-0.98-jitoff.patch
rename to clamav-0.98.3-jitoff.patch
index 2e366f4..e2cec50 100644
--- a/clamav-0.98-jitoff.patch
+++ b/clamav-0.98.3-jitoff.patch
@@ -1,6 +1,6 @@
---- clamav-0.98/etc/clamd.conf.sample 2013-09-16 21:28:14.000000000 +0200
-+++ clamav-0.98/etc/clamd.conf.sample.jitoff 2013-10-06 20:46:59.000000000 +0200
-@@ -543,6 +543,16 @@
+--- 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
+@@ -564,6 +564,16 @@
# Default: yes
#Bytecode yes
@@ -17,9 +17,9 @@
# Set bytecode security level.
# Possible values:
# None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS
---- clamav-0.98/shared/optparser.c 2013-09-16 21:28:14.000000000 +0200
-+++ clamav-0.98/shared/optparser.c.jitoff 2013-10-06 20:46:12.000000000 +0200
-@@ -277,7 +277,7 @@
+--- 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,
"Allow loading bytecode from outside digitally signed .c[lv]d files.","no"},
@@ -27,4 +27,4 @@
+ { "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.","Auto"},
- { "BytecodeStatistics", "bytecode-statistics", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "Collect and print bytecode execution statistics.", "no" },
+ { "BytecodeStatistics", "bytecode-statistics", 0, 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 e0e24ad..793a79c 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -52,7 +52,7 @@ Requires(postun): /bin/systemctl\
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 0.98.1
+Version: 0.98.3
Release: 1%{?dist}
License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
Group: Applications/File
@@ -64,29 +64,26 @@ Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?p
# Unfortunately, clamav includes support for RAR v3, derived from GPL
# incompatible unrar from RARlabs. We have to pull this code out.
# tarball was created by
-# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
+# make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz
Source0: %name-%version%{?prerelease}-norar.tar.xz
%endif
# 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-18353.cvd
+Source11: http://db.local.clamav.net/daily-18354.cvd
Patch24: clamav-0.92-private.patch
Patch26: clamav-0.98-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-jitoff.patch
+Patch29: clamav-0.98.3-jitoff.patch
# https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?r1=128086&r2=137567
Patch30: llvm-glibc.patch
-# use glibc fanotify instead of limited hand-crafted support
-# https://bugzilla.clamav.net/show_bug.cgi?id=9156
-Patch31: clamav-0.98-glibc-fanotify.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: clamav-lib = %version-%release
Requires: data(clamav)
BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel openssl-devel
BuildRequires: %_includedir/tcpd.h
%{?with_bytecode:BuildRequires: bc tcl groff graphviz}
%if %{have_ocaml}
@@ -395,7 +392,6 @@ The systemd initscripts for clamav-scanner.
%apply -n27 -p1 -b .umask
%apply -n29 -p1 -b .jitoff
%apply -n30 -p1
-%apply -n31 -p1 -b .glibc-fanotify
%{?apply_end}
install -p -m0644 %SOURCE300 clamav-milter/
@@ -434,6 +430,7 @@ export have_cv_ipv6=yes
--disable-clamav \
--with-user=%username \
--with-group=%username \
+ --with-libcurl=%{_prefix} \
--with-dbdir=/var/lib/clamav \
--enable-milter \
--enable-clamdtop \
@@ -858,6 +855,12 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
%changelog
+* Sat May 10 2014 Robert Scheck <robert at fedoraproject.org> - 0.98.3-1
+- Upgrade to 0.98.3 and updated daily.cvd (#1095614)
+- Avoid automatic path detection breakage regarding curl
+- Added build requirement to openssl-devel for hasing code
+- Added clamsubmit to main package
+
* Wed Jan 15 2014 Robert Scheck <robert at fedoraproject.org> - 0.98.1-1
- Upgrade to 0.98.1 and updated daily.cvd (#1053400)
diff --git a/sources b/sources
index f4a8bf5..9436b28 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz
+e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz
06f660f474d1a6863de4a00eb02521e3 main-55.cvd
-52ce049e8df4693766c5c42697890d35 daily-18353.cvd
+5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd
More information about the scm-commits
mailing list