From 9815683656d239e3e7f4e927ed9a72779eb70087 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 2 Dec 2015 01:46:49 +0100 Subject: [PATCH] Upgrade to 0.99 and updated daily.cvd (#1287327) --- clamav-0.92-private.patch | 33 ------------------- ...6-jitoff.patch => clamav-0.99-jitoff.patch | 14 ++++---- clamav-0.99-private.patch | 27 +++++++++++++++ clamav.spec | 13 +++++--- sources | 4 +-- 5 files changed, 44 insertions(+), 47 deletions(-) delete mode 100644 clamav-0.92-private.patch rename clamav-0.98.6-jitoff.patch => clamav-0.99-jitoff.patch (66%) create mode 100644 clamav-0.99-private.patch diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch deleted file mode 100644 index ef68e3c..0000000 --- a/clamav-0.92-private.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: clamav-0.97.2/libclamav.pc.in -=================================================================== ---- clamav-0.97.2.orig/libclamav.pc.in -+++ clamav-0.97.2/libclamav.pc.in -@@ -6,6 +6,7 @@ includedir=@includedir@ - Name: libclamav - Description: A GPL virus scanner - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} - -Index: clamav-0.97.2/clamav-config.in -=================================================================== ---- clamav-0.97.2.orig/clamav-config.in -+++ clamav-0.97.2/clamav-config.in -@@ -54,12 +54,8 @@ while test $# -gt 0; do - usage 0 - ;; - -- --cflags) -- echo -I@includedir@ @CFLAGS@ -- ;; -- -- --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ (--cflags|--libs) -+ ${PKG_CONFIG:-pkg-config} "$1" libclamav - ;; - - *) diff --git a/clamav-0.98.6-jitoff.patch b/clamav-0.99-jitoff.patch similarity index 66% rename from clamav-0.98.6-jitoff.patch rename to clamav-0.99-jitoff.patch index b03c628..3d08c9b 100644 --- a/clamav-0.98.6-jitoff.patch +++ b/clamav-0.99-jitoff.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- clamav-0.99/etc/clamd.conf.sample 2015-11-24 00:13:46.000000000 +0100 ++++ clamav-0.99/etc/clamd.conf.sample.jitoff 2015-12-02 01:36:11.766462183 +0100 +@@ -614,6 +614,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.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 @@ +--- clamav-0.99/shared/optparser.c 2015-12-02 01:35:26.632828082 +0100 ++++ clamav-0.99/shared/optparser.c.jitoff 2015-12-02 01:36:54.249117737 +0100 +@@ -298,7 +298,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"}, @@ -27,4 +27,4 @@ + { "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\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" }, + { "Statistics", "statistics", 0, CLOPT_TYPE_STRING, "^(none|None|bytecode|Bytecode|pcre|PCRE)$", -1, NULL, FLAG_MULTIPLE, OPT_CLAMSCAN | OPT_CLAMBC, "Collect and print execution statistics.\nPossible values:\n\tBytecode - reports bytecode statistics\nPCRE - reports PCRE execution statistics\nNone - reports no statistics", "None" }, diff --git a/clamav-0.99-private.patch b/clamav-0.99-private.patch new file mode 100644 index 0000000..7f9f563 --- /dev/null +++ b/clamav-0.99-private.patch @@ -0,0 +1,27 @@ +--- clamav-0.99/libclamav.pc.in 2015-09-18 22:48:25.000000000 +0200 ++++ clamav-0.99/libclamav.pc.in.private 2015-12-02 01:30:30.055231319 +0100 +@@ -7,6 +7,6 @@ + Description: A GPL virus scanner + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lclamav +-Libs.private: @LIBCLAMAV_LIBS@ ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ + Cflags: -I${includedir} + +--- clamav-0.99/clamav-config.in 2015-05-28 23:56:25.000000000 +0200 ++++ clamav-0.99/clamav-config.in.private 2015-12-02 01:31:34.933705763 +0100 +@@ -54,12 +54,8 @@ + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav.spec b/clamav.spec index 2e8b9b3..ea85417 100644 --- a/clamav.spec +++ b/clamav.spec @@ -57,8 +57,8 @@ Requires(postun): /bin/systemctl\ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.98.7 -Release: 3%{?dist} +Version: 0.99 +Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net @@ -75,13 +75,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-20394.cvd +Source11: http://db.local.clamav.net/daily-21123.cvd -Patch24: clamav-0.92-private.patch +Patch24: clamav-0.99-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.6-jitoff.patch +Patch29: clamav-0.99-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 @@ -891,6 +891,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Wed Dec 02 2015 Robert Scheck - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) + * Tue Jun 30 2015 Robert Scheck - 0.98.7-3 - Move /etc/tmpfiles.d/ to /usr/lib/tmpfiles.d/ (#1126595) diff --git a/sources b/sources index 746df41..8700fb1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz +a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd +547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd