diff --git a/clamav-conf.patch b/clamav-conf.patch index 81f3afa..e777585 100644 --- a/clamav-conf.patch +++ b/clamav-conf.patch @@ -46,7 +46,7 @@ +LocalSocket /var/lib/clamav/clamd-socket # Remove stale socket after unclean shutdown. - # Default: no + # Default: yes @@ -77,14 +73,14 @@ # TCP port address. @@ -64,7 +64,7 @@ # Maximum length the queue of pending connections may grow to. # Default: 15 -@@ -141,7 +137,7 @@ +@@ -147,7 +143,7 @@ # Run as another user (clamd must be started by root for this option to work) # Default: don't drop privileges @@ -73,7 +73,7 @@ # Initialize supplementary group access (clamd must be started by root). # Default: no -@@ -326,6 +322,10 @@ +@@ -395,6 +391,10 @@ ## # Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running. @@ -100,7 +100,7 @@ # Path to the database directory. # WARNING: It must match clamd.conf's directive! # Default: hardcoded (depends on installation options) -@@ -22,21 +18,21 @@ +@@ -34,21 +30,21 @@ # Use system logger (can work together with UpdateLogFile). # Default: no @@ -126,7 +126,7 @@ # Initialize supplementary group access (freshclam must be started by root). # Default: no -@@ -92,7 +88,7 @@ +@@ -111,7 +107,7 @@ # Send the RELOAD command to clamd. # Default: no @@ -135,3 +135,12 @@ # Run command after successful database update. # Default: disabled +@@ -148,7 +144,7 @@ + # detected in the field and in what geographic area they are. + # This feature requires LogTime and LogFile to be enabled in clamd.conf. + # Default: no +-#SubmitDetectionStats /path/to/clamd.conf ++#SubmitDetectionStats /etc/clamd.conf + + # Country of origin of malware/detection statistics (for statistical + # purposes only). The statistics collector at ClamAV.net will look up diff --git a/clamav-milter.patch b/clamav-milter.patch index e0531dc..73d82c0 100644 --- a/clamav-milter.patch +++ b/clamav-milter.patch @@ -1,6 +1,6 @@ --- clamav-milter/clamav-milter.c +++ clamav-milter/clamav-milter.c -@@ -2069,12 +2069,7 @@ +@@ -2085,12 +2085,7 @@ logg(_("!Can't save PID in file %s\n"), pidfile); return EX_CONFIG; } diff --git a/clamav-valgrind.patch b/clamav-valgrind.patch index a6f3af5..0b1eef3 100644 --- a/clamav-valgrind.patch +++ b/clamav-valgrind.patch @@ -7,7 +7,7 @@ +{ + glibc-iconv_open + Memcheck:Addr4 -+ obj:/lib/ld-2.8.90.so ++ obj:/lib*/ld-2.8.90.so +} + #{ diff --git a/clamav.changes b/clamav.changes index dd30199..3124616 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 11 11:24:28 CET 2008 - max@suse.de + +- Version 0.94.1 also fixes bnc#443311. +- Disabled valgrind tests again, as they show false positives with + current glibc. + ------------------------------------------------------------------- Fri Nov 7 16:12:37 CET 2008 - max@suse.de diff --git a/clamav.spec b/clamav.spec index 50b5773..e375e24 100644 --- a/clamav.spec +++ b/clamav.spec @@ -27,16 +27,13 @@ BuildRequires: bc gmp-devel pkgconfig zlib-devel %endif %if 0%{?suse_version} >= 1030 BuildRequires: check-devel pwdutils -%ifarch i586 x86_64 -BuildRequires: valgrind -%endif %define clamav_check --enable-check %else %define clamav_check --disable-check %endif Summary: Antivirus Toolkit Version: 0.94.1 -Release: 1 +Release: 2 License: GPL v2 or later Group: Productivity/Security Url: http://www.clamav.net @@ -276,6 +273,10 @@ for f in main daily; do done %changelog +* Tue Nov 11 2008 max@suse.de +- Version 0.94.1 also fixes bnc#443311. +- Disabled valgrind tests again, as they show false positives with + current glibc. * Fri Nov 07 2008 max@suse.de - New bugfix release: 0.94.1: * daily.ign was overwriting local.ign