Changes - j0ke.net Open Build Service

Changes of Revision 17

[-] [+]	Changed	clamav.spec
@@ -1,5 +1,5 @@ # -# spec file for package clamav (Version 0.97.1) +# spec file for package clamav (Version 0.97.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,8 +31,8 @@ %define clamav_check --disable-check %endif Summary: Antivirus Toolkit -Version: 0.97.1 -Release: 10 +Version: 0.97.2 +Release: 15 License: GPL v2 or later Group: Productivity/Security Url: http://www.clamav.net @@ -271,6 +271,9 @@ done %changelog +* Sun Aug 14 2011 Carsten Schoene <cs@linux-administrator.com> - 0.97.2-1 +- update to release 0.97.2 + * Thu Jun 09 2011 Carsten Schoene <cs@linux-administrator.com> - 0.97.1-1 - update to release 0.97.1
	Changed	clamav-0.97.1.tar.bz2/sigtool/COPYING ^
[-] [+]	Changed	clamav-0.97.2.tar.bz2/ChangeLog ^
@@ -1,3 +1,32 @@ +Mon Jul 25 16:42:31 CEST 2011 (tk) +---------------------------------- + * V 0.97.2 + +Mon Jul 25 14:33:59 CEST 2011 (acab) +------------------------------------ + * libclamav/matcher-hash.c: off by one read in cli_hm_scan (bb#2818) + +Thu Jul 14 12:29:17 EEST 2011 (edwin) +------------------------------------ + * libclamav/pdf.c: fix encrypted pdf detection (bb #2988) + +Thu Jul 14 12:20:04 CEST 2011 (acab) +------------------------------------ + * clamav-milter/clamfi.c: fix typo in error message (bb#3040) + +Thu Jul 14 12:07:04 CEST 2011 (acab) +------------------------------------ + * libclamav/lzma_iface.c: shut up huge alloc warns for 7z/lzma (bb#2913) + +Thu Jun 30 14:24:34 EEST 2011 (edwin) +------------------------------------- + * libclamav/c++/bytecode2llvm.cpp: fix use of unaddressable data in + bytecode_watchdog. Thanks to Michael Scheidell for providing feedback on this bug. + +Tue Jun 7 12:03:19 EEST 2011 (edwin) +------------------------------------ + * libclamav/phishcheck.c: fix safebrowsing detection on certain URLs + Thu Jun 9 09:10:49 CEST 2011 (tk) ---------------------------------- * V 0.97.1 @@ -11204,7 +11233,7 @@ Fri Jun 16 16:03:45 CEST 2006 (tk) ---------------------------------- * libclamav/readdb.c: fix small memory leak in cl_free() - Patch by Török Edvin <edwintorokgmail.com> + Patch by TÃ¶rÃ¶k Edvin <edwintorokgmail.com> Fri Jun 16 11:16:35 CEST 2006 (tk) ---------------------------------- @@ -15055,7 +15084,7 @@ Sat Aug 7 01:33:14 CEST 2004 (tk) ---------------------------------- * libclamav: matcher-bm: fix node sorting (false negative example provided - by René Bellora <rbelloratecnoaccion.com.ar>) + by RenÃ© Bellora <rbelloratecnoaccion.com.ar>) Fri Aug 6 11:09:22 BST 2004 (njh) ---------------------------------- @@ -16154,7 +16183,7 @@ Sat Apr 10 08:02:20 BST 2004 (njh) ---------------------------------- * docs/man/clamav-milter.8: Clarified --force-scan (thanks to - Søren Thing Andersen <soerenthing.dk>) + SÃ¸ren Thing Andersen <soerenthing.dk>) Fri Apr 9 09:50:52 BST 2004 (njh) ---------------------------------- @@ -17331,7 +17360,7 @@ Wed Jan 14 04:44:03 CET 2004 (tk) --------------------------------- * libclamav: reversed zziplib patch from 20031224 (due to a problem reported - by René Bellora <rbelloratecnoaccion.com.ar>) + by RenÃ© Bellora <rbelloratecnoaccion.com.ar>) * freshclam: display a warning if the engine is outdated * docs: manual page updates @@ -17412,7 +17441,7 @@ --------------------------------- * libclamav: fixed handling of multipart signatures (broken since Dec 2). The bug was introduced by _me_ and not by the Thomas Lamy's - patch. Problem found and reported by René Bellora + patch. Problem found and reported by RenÃ© Bellora <rbelloratecnoaccion.com.ar>, Jean-Christophe Heger <jchegeracytec.com> and Tomasz Papszun <tomekclamav.net>. Many thanks ! @@ -17494,7 +17523,7 @@ Fri Dec 12 18:47:10 CET 2003 (tk) --------------------------------- clamd: clamuko - fixed a segmentation fault after database update. Problem - reported by Anders Herbjørnsen <andershgar.no>. Also now clamuko + reported by Anders HerbjÃ¸rnsen <andershgar.no>. Also now clamuko is always stopped before (and restarted after) db update to protect against a potential split with Dazuko. * libclamav: scanners: added missing braces in a logical block (thanks to @@ -17721,7 +17750,7 @@ * docs/manpages: updated * docs/clamdoc.pdf: rewritten * docs/Turkish: included Turish clamdoc.pdf translation by yavuz kaya and - Ýbrahim erken + Ãbrahim erken Tue Nov 11 13:51:23 IST 2003 (njh) ---------------------------------- @@ -18187,7 +18216,7 @@ * freshclam: switch to a mirror when downloaded md5 check sum doesn't match the database (errno 54, man freshclam) * freshclam: mirrors.txt - added clamav.rulez.pl mirror managed by - £ukasz Jaros³aw Mozer <lukasznetx.waw.pl> + Åukasz JarosÅaw Mozer <lukasznetx.waw.pl> * clamd, libclamav, clamscan: fixed a bug introduced in 0.60 - closedir(dd) was called even when dd was not correctly opened * libclamav: mbox - patch for a segfault with some nasty messages which
[-] [+]	Changed	clamav-0.97.2.tar.bz2/Makefile.am ^
@@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS=-I m4 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests -EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 +EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 contrib bin_SCRIPTS=clamav-config
[-] [+]	Changed	clamav-0.97.2.tar.bz2/Makefile.in ^
@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests -EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 +EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 contrib bin_SCRIPTS = clamav-config pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libclamav.pc
[-] [+]	Changed	clamav-0.97.2.tar.bz2/NEWS ^
@@ -1,9 +1,45 @@ -0.97.1 +0.97.2 ------ -This is a bugfix release recommended for all users. Please refer to the -ChangeLog file for details. +ClamAV 0.97.2 fixes problems with the bytecode engine, Safebrowsing detection, +hash matcher, and other minor issues. Please see the ChangeLog file for +details. + +* Announcement * + +The ClamAV project is launching a new service called "Third Party web +interface". It will allow selected individuals/organizations to publish +ClamAV Virus Databases (CVD) through the ClamAV mirror network. + +If you choose to publish your signatures through our Third Party +web interface you will benefit from the following: + +- before publishing the signatures, we will test them for + false positives against our false positive file collection. +- before publishing the signatures, we'll verify that the latest two major + versions of ClamAV can load them correctly. +- the signatures will be digitally signed and packaged into a single + .cvd compressed file. +- there will be no ".UNOFFICIAL" suffix in the detection names. +- a custom prefix will be added to the detection names, identifying the + organization which published the signature. +- updates will be distributed both as full CVD files and cdiff + incremental updates. Users will benefit from lower network traffic. +- the .cvd and .cdiff files will be distributed through the + ClamAV mirror network. +- the service should result in faster remediation of false positives. +- ClamAV users will be able to download the third party databases + using freshclam, by adding a single line to freshclam.conf, what + should make signature maintenance significantly easier. + +The service is still in beta, you are welcome to contact Luca Gibelli +<luca*clamav.net> if you intend to join the beta program. + +We especially welcome those who already distribute their own unofficial +signatures to join. A list of databases distributed by the new service +will be available at http://www.clamav.net/download/cvd/3rdparty + +We will be happy to answer any questions you might have. -- The ClamAV team (http://www.clamav.net/team) -
[-] [+]	Changed	clamav-0.97.2.tar.bz2/README ^
@@ -2,6 +2,52 @@ here may not be available in binary packages. -- +0.97.2 +------ + +ClamAV 0.97.2 fixes problems with the bytecode engine, Safebrowsing detection, +hash matcher, and other minor issues. Please see the ChangeLog file for +details. + +* Announcement * + +The ClamAV project is launching a new service called "Third Party web +interface". It will allow selected individuals/organizations to publish +ClamAV Virus Databases (CVD) through the ClamAV mirror network. + +If you choose to publish your signatures through our Third Party +web interface you will benefit from the following: + +- before publishing the signatures, we will test them for + false positives against our false positive file collection. +- before publishing the signatures, we'll verify that the latest two major + versions of ClamAV can load them correctly. +- the signatures will be digitally signed and packaged into a single + .cvd compressed file. +- there will be no ".UNOFFICIAL" suffix in the detection names. +- a custom prefix will be added to the detection names, identifying the + organization which published the signature. +- updates will be distributed both as full CVD files and cdiff + incremental updates. Users will benefit from lower network traffic. +- the .cvd and .cdiff files will be distributed through the + ClamAV mirror network. +- the service should result in faster remediation of false positives. +- ClamAV users will be able to download the third party databases + using freshclam, by adding a single line to freshclam.conf, what + should make signature maintenance significantly easier. + +The service is still in beta, you are welcome to contact Luca Gibelli +<luca*clamav.net> if you intend to join the beta program. + +We especially welcome those who already distribute their own unofficial +signatures to join. A list of databases distributed by the new service +will be available at http://www.clamav.net/download/cvd/3rdparty + +We will be happy to answer any questions you might have. + +-- +The ClamAV team (http://www.clamav.net/team) + 0.97.1 ------
[-] [+]	Changed	clamav-0.97.2.tar.bz2/clamav-milter/clamfi.c ^
@@ -532,7 +532,7 @@ else if(!strcasecmp(opt->strarg, "Full")) loginfected \|= LOGCLN_FULL; else if(strcasecmp(opt->strarg, "Off")) { - logg("!Invalid setting %s for option LogInfected\n", opt->strarg); + logg("!Invalid setting %s for option LogClean\n", opt->strarg); return 1; } }
[-] [+]	Changed	clamav-0.97.2.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for ClamAV 0.97.1. +# Generated by GNU Autoconf 2.67 for ClamAV 0.97.2. # # Report bugs to <http://bugs.clamav.net/>. # @@ -703,8 +703,8 @@ # Identity of this package. PACKAGE_NAME='ClamAV' PACKAGE_TARNAME='clamav' -PACKAGE_VERSION='0.97.1' -PACKAGE_STRING='ClamAV 0.97.1' +PACKAGE_VERSION='0.97.2' +PACKAGE_STRING='ClamAV 0.97.2' PACKAGE_BUGREPORT='http://bugs.clamav.net/' PACKAGE_URL='http://www.clamav.net/' @@ -1539,7 +1539,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ClamAV 0.97.1 to adapt to many kinds of systems. +\`configure' configures ClamAV 0.97.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1610,7 +1610,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of ClamAV 0.97.1:";; + short \| recursive ) echo "Configuration of ClamAV 0.97.2:";; esac cat <<\_ACEOF @@ -1766,7 +1766,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ClamAV configure 0.97.1 +ClamAV configure 0.97.2 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2235,7 +2235,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ClamAV $as_me 0.97.1, which was +It was created by ClamAV $as_me 0.97.2, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3356,7 +3356,7 @@ # Define the identity of the package. PACKAGE='clamav' - VERSION='0.97.1' + VERSION='0.97.2' # Some tools Automake needs. @@ -3485,7 +3485,7 @@ $as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h -VERSION="0.97.1" +VERSION="0.97.2" cat >>confdefs.h <<_ACEOF #define VERSION "$VERSION" @@ -3493,7 +3493,7 @@ LC_CURRENT=7 -LC_REVISION=10 +LC_REVISION=11 LC_AGE=1 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" @@ -19999,7 +19999,7 @@ # configure think that -lm doesn't have cos, hence its in libc). if test "x$enable_distcheckwerror" = "xyes"; then if test "$distcheck_enable_flags" = "1"; then - CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return" + CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return" fi fi @@ -20624,7 +20624,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ClamAV $as_me 0.97.1, which was +This file was extended by ClamAV $as_me 0.97.2, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20691,7 +20691,7 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ClamAV config.status 0.97.1 +ClamAV config.status 0.97.2 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -23224,7 +23224,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ClamAV $as_me 0.97.1, which was +This file was extended by ClamAV $as_me 0.97.2, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23291,7 +23291,7 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ClamAV config.status 0.97.1 +ClamAV config.status 0.97.2 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	clamav-0.97.2.tar.bz2/configure.in ^
@@ -20,7 +20,7 @@ AC_PREREQ([2.59]) dnl For a release change [devel] to the real version [0.xy] dnl also change VERSION below -AC_INIT([ClamAV], [0.97.1], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/]) +AC_INIT([ClamAV], [0.97.2], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/]) AH_BOTTOM([#include "platform.h"]) dnl put configure auxiliary into config @@ -42,11 +42,12 @@ AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package]) dnl change this on a release -VERSION="0.97.1" +dnl VERSION="devel-`date +%Y%m%d`" +VERSION="0.97.2" AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package]) LC_CURRENT=7 -LC_REVISION=10 +LC_REVISION=11 LC_AGE=1 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" AC_SUBST([LIBCLAMAV_VERSION]) @@ -1591,7 +1592,7 @@ # configure think that -lm doesn't have cos, hence its in libc). if test "x$enable_distcheckwerror" = "xyes"; then if test "$distcheck_enable_flags" = "1"; then - CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return" + CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return" fi fi
[-] [+]	Added	clamav-0.97.2.tar.bz2/contrib ^
+(directory)
[-] [+]	Added	clamav-0.97.2.tar.bz2/contrib/cleanup-partial.pl ^
@@ -0,0 +1,21 @@ +#!/usr/bin/perl + +# ---- Settings ---- +# TemporaryDirectory in clamd.conf +my $TMPDIR='/tmp'; +# How long to wait for next part of RFC1341 message (seconds) +my $cleanup_interval=3600; + +# ---- End of Settings ---- + +my $partial_dir = "$TMPDIR/clamav-partial"; +# if there is no partial directory, nothing to clean up +opendir(DIR, $partial_dir) \|\| exit 0; + +my $cleanup_threshold = time - $cleanup_interval; +while(my $file = readdir(DIR)) { + next unless $file =~ m/^clamav-partial-([0-9]+)_[0-9a-f]{32}-[0-9]+$/; + my $filetime = $1; + unlink "$partial_dir/$file" unless $filetime > $cleanup_threshold; +} +closedir DIR;
[-] [+]	Added	clamav-0.97.2.tar.bz2/contrib/safe_clamd ^
+(directory)
[-] [+]	Added	clamav-0.97.2.tar.bz2/contrib/safe_clamd/safe_clamd ^
@@ -0,0 +1,119 @@ +#!/bin/sh + +# safe_clamd - a script to start clamd and restart if it dies unexpectedly +# Please report bugs at https://wwws.clamav.net/bugzilla/show_bug.cgi?id=2026 +# Usage: +# start with ./safe_clamd +# stop by sending a TERM signal to the safe_clamd process + +{ +####################### CONFIGURATION ####################### +# path to clamd.conf +CLAMDCONF='/usr/local/etc/clamd.conf' +# path to clamd binary +CLAMDBIN='/usr/local/sbin/clamd' +# interval between checks +SLEEPINTERVAL=3 +# after a successful restart, sleep for $THROTTLE secs before attempting to restart clamd again +THROTTLE=30 +##################### END CONFIGURATION ##################### + +# Do not touch anything below this line, unless you know what you are doing +trap "signalClamd HUP" SIGHUP +trap "signalClamd TERM" SIGTERM +trap "signalClamd USR2" SIGUSR2 + +getPid() { + PIDFILE=`grep ^PidFile $CLAMDCONF \| sed -e 's/^PidFile\s*//'` + if [ -z "PIDFILE" ] + then + # missing PidFile directive + echo "Please enable the PidFile directive in $CLAMDCONF. See man clamd.conf for more info." + exit 1 + fi + CLAMDPID=`cat $PIDFILE 2>/dev/null \| grep -Eo '^[0-9]+$'` + if [ -z "$CLAMDPID" ] + then + # empty pidfile + CLAMDPID=0 + return + fi + if ps p $CLAMDPID \| grep -v grep \| grep $CLAMDBIN > /dev/null + then + # good pid + return + fi + # invalid pid + CLAMDPID=0 +} + +startClamd() { + rm -f $PIDFILE + if test -f $PIDFILE + then + echo "ERROR: cannot remove $PIDFILE" + exit 1 + else + $CLAMDBIN $args + if [ $? -ne 0 ] + then + exit $? + fi + sleep $THROTTLE + fi +} + +signalClamd() { + getPid + if [ $CLAMDPID -gt 0 ]; then + echo "Sending $1 to pid $CLAMDPID..." + kill -$1 $CLAMDPID + else + echo "$CLAMDBIN is not running." + fi + if [ "$1" == "TERM" ]; then + echo Exiting $0 ... + exit + fi +} + +args=$@ + +# start clamd +# if it start successfully, enter loop +# every 5 secs, find pid, verify it belongs to clamd, kill -0 +# restart it if dead +while [ true ]; do + if test -r "$CLAMDCONF" + then + if test -x "$CLAMDBIN" + then + # retrieve pid + getPid + # pid found? + if [ $CLAMDPID -gt 0 ] + then + if kill -0 $CLAMDPID > /dev/null 2>/dev/null + then + # pid is alive, sleep before next check + sleep $SLEEPINTERVAL + else + # stale pid + rm -f $PIDFILE + startClamd + fi + else + # pid does not belong to clamd + startClamd + fi + else + echo $CLAMDBIN not found + exit 1 + fi + else + echo $CLAMDCONF not found + exit 1 + fi +done + +} &
	Changed	clamav-0.97.2.tar.bz2/database/daily.cvd ^
	Changed	clamav-0.97.2.tar.bz2/docs/clamdoc.pdf ^
[-] [+]	Changed	clamav-0.97.2.tar.bz2/docs/clamdoc.tex ^
@@ -71,7 +71,7 @@ \vspace{3cm} \begin{flushright} \rule[-1ex]{8cm}{3pt}\\ - \huge Clam AntiVirus 0.97.1\\ + \huge Clam AntiVirus 0.97.2\\ \huge \emph{User Manual}\\ \end{flushright} @@ -127,7 +127,7 @@ \item{POSIX compliant, portable} \item{Fast scanning} \item{Supports on-access scanning (Linux and FreeBSD only)} - \item{Detects over 970,000 viruses, worms and trojans, including + \item{Detects over 1 million viruses, worms and trojans, including Microsoft Office macro viruses, mobile malware, and other threats} \item{Built-in bytecode interpreter allows the ClamAV signature writers to create and distribute very complex detection routines and
[-] [+]	Changed	clamav-0.97.2.tar.bz2/docs/html/clamdoc.html ^
@@ -56,7 +56,7 @@ <BR> <BR> <DIV ALIGN="RIGHT"> -<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.1 +<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.2 <BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN> <BR> </BIG></BIG></DIV> @@ -227,7 +227,7 @@ <BR><HR> <ADDRESS> Tomasz Kojm -2010-08-12 +2011-07-25 </ADDRESS> </BODY> </HTML>
[-] [+]	Changed	clamav-0.97.2.tar.bz2/docs/html/index.html ^
@@ -56,7 +56,7 @@ <BR> <BR> <DIV ALIGN="RIGHT"> -<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.1 +<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.2 <BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN> <BR> </BIG></BIG></DIV> @@ -227,7 +227,7 @@ <BR><HR> <ADDRESS> Tomasz Kojm -2010-08-12 +2011-07-25 </ADDRESS> </BODY> </HTML>
[-] [+]	Changed	clamav-0.97.2.tar.bz2/docs/html/node3.html ^
@@ -67,7 +67,7 @@ </LI> <LI>Supports on-access scanning (Linux and FreeBSD only) </LI> -<LI>Detects over 970,000 viruses, worms and trojans, including +<LI>Detects over 1 million viruses, worms and trojans, including Microsoft Office macro viruses, mobile malware, and other threats </LI> <LI>Built-in bytecode interpreter allows the ClamAV signature writers @@ -195,7 +195,7 @@ <!--End of Navigation Panel--> <ADDRESS> Tomasz Kojm -2010-08-12 +2011-07-25 </ADDRESS> </BODY> </HTML>
[-] [+]	Changed	clamav-0.97.2.tar.bz2/etc/freshclam.conf ^
@@ -206,3 +206,10 @@ # detection mechanisms and improvements to the ClamAV engine. # Default: enabled #Bytecode yes + +# Download an additional 3rd party signature database distributed through +# the ClamAV mirrors. Here you can find a list of available databases: +# http://www.clamav.net/download/cvd/3rdparty +# This option can be used multiple times. +#ExtraDatabase dbname1 +#ExtraDatabase dbname2
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav.pc.in ^
@@ -5,7 +5,7 @@ Name: libclamav Description: A GPL virus scanner -Version: @LIBCLAMAV_VERSION@ +Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ Cflags: -I${includedir} @CFLAGS@
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav/c++/bytecode2llvm.cpp ^
@@ -1876,25 +1876,28 @@ static pthread_mutex_t watchdog_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t watchdog_cond = PTHREAD_COND_INITIALIZER; +static pthread_cond_t watchdog_cond2 = PTHREAD_COND_INITIALIZER; static int watchdog_running = 0; struct watchdog_item { volatile uint8_t* timeout; struct timespec abstimeout; struct watchdog_item next; + int in_use; }; static struct watchdog_item watchdog_head = NULL; static struct watchdog_item* watchdog_tail = NULL; +extern "C" const char cli_strerror(int errnum, char buf, size_t len); #define WATCHDOG_IDLE 10 static void bytecode_watchdog(void arg) { struct timeval tv; struct timespec out; - + int ret; + char err[128]; pthread_mutex_lock(&watchdog_mutex); - watchdog_running = 1; if (cli_debug_flag) cli_dbgmsg_internal("bytecode watchdog is running\n"); do { @@ -1903,16 +1906,35 @@ out.tv_sec = tv.tv_sec + WATCHDOG_IDLE; out.tv_nsec = tv.tv_usec1000; / wait for some work, up to WATCHDOG_IDLE time / - while (watchdog_head == NULL && - pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, - &out) != ETIMEDOUT) {} + while (watchdog_head == NULL) { + ret = pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, + &out); + if (ret == ETIMEDOUT) + break; + if (ret) { + cli_warnmsg("bytecode_watchdog: cond_timedwait(1) failed: %s\n", + cli_strerror(ret, err, sizeof(err))); + break; + } + } if (watchdog_head == NULL) break; / wait till timeout is reached on this item / item = watchdog_head; - while (item == watchdog_head && - pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, - &item->abstimeout) != ETIMEDOUT) {} + while (item == watchdog_head) { + item->in_use = 1; + ret = pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, + &item->abstimeout); + if (ret == ETIMEDOUT) + break; + if (ret) { + cli_warnmsg("bytecode_watchdog: cond_timedwait(2) failed: %s\n", + cli_strerror(ret, err, sizeof(err))); + break; + } + } + item->in_use = 0; + pthread_cond_signal(&watchdog_cond2); if (item != watchdog_head) continue;/ got removed meanwhile / / timeout reached, signal it to bytecode / @@ -1929,7 +1951,6 @@ return NULL; } -extern "C" const char cli_strerror(int errnum, char* buf, size_t len); static void watchdog_disarm(struct watchdog_item item) { struct watchdog_item q, p = NULL; @@ -1945,6 +1966,12 @@ if (q == watchdog_tail) watchdog_tail = p; } + / don't remove the item from the list until the watchdog is sleeping on + * item, or it'll wake up on uninit data / + while (item->in_use) { + pthread_cond_signal(&watchdog_cond); + pthread_cond_wait(&watchdog_cond2, &watchdog_mutex); + } pthread_mutex_unlock(&watchdog_mutex); } @@ -1956,6 +1983,7 @@ timeout = 0; item->timeout = timeout; item->next = NULL; + item->in_use = 0; gettimeofday(&tv0, NULL); tv0.tv_usec += ms * 1000; @@ -1973,6 +2001,8 @@ char buf[256]; cli_errmsg("(watchdog) pthread_create failed: %s\n", cli_strerror(rc, buf, sizeof(buf))); } + if (!rc) + watchdog_running = 1; pthread_attr_destroy(&attr); } if (!rc) {
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav/lzma_iface.c ^
@@ -28,6 +28,11 @@ void __lzma_wrap_alloc(void unused, size_t size) { unused = unused; + if(!size \|\| size > CLI_MAX_ALLOCATION) { + cli_dbgmsg("lzma_wrap_alloc(): Attempt to allocate %lu bytes.\n", (unsigned long int) size); + return NULL; + } + return cli_malloc(size); } void __lzma_wrap_free(void unused, void freeme) {
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav/matcher-hash.c ^
@@ -219,7 +219,7 @@ keylen = hashlen[type]; l = 0; - r = szh->items; + r = szh->items - 1; while(l <= r) { size_t c = (l + r) / 2; int res = hm_cmp(digest, &szh->hash_array[keylen * c], keylen);
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav/others.h ^
@@ -53,7 +53,7 @@ * in re-enabling affected modules. */ -#define CL_FLEVEL 61 +#define CL_FLEVEL 62 #define CL_FLEVEL_DCONF CL_FLEVEL #define CL_FLEVEL_SIGTOOL CL_FLEVEL
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav/pdf.c ^
@@ -1325,6 +1325,11 @@ O = U = NULL; do { EM = pdf_readbool(q, len, "/EncryptMetadata", 1); + P = pdf_readint(q, len, "/P"); + if (P == ~0u) { + cli_dbgmsg("cli_pdf: invalid P\n"); + break; + } q2 = cli_memstr(q, len, "/Standard", 9); if (!q2) { @@ -1380,11 +1385,6 @@ break; } } - P = pdf_readint(q, len, "/P"); - if (P == ~0u) { - cli_dbgmsg("cli_pdf: invalid P\n"); - break; - } length = pdf_readint(q, len, "/Length"); if (length == ~0u) length = 40;
[-] [+]	Changed	clamav-0.97.2.tar.bz2/libclamav/phishcheck.c ^
@@ -1438,9 +1438,6 @@ cli_dbgmsg("Phishcheck:Checking url %s->%s\n", urls->realLink.data, urls->displayLink.data); - if(!strcmp(urls->realLink.data,urls->displayLink.data)) - return CL_PHISH_CLEAN;/* displayed and real URL are identical -> clean / - if(!isURL(urls->realLink.data, 0)) { cli_dbgmsg("Real 'url' is not url:%s\n",urls->realLink.data); return CL_PHISH_CLEAN; @@ -1456,6 +1453,9 @@ } } + if(!strcmp(urls->realLink.data,urls->displayLink.data)) + return CL_PHISH_CLEAN;/ displayed and real URL are identical -> clean */ + if (urls->displayLink.data[0] == '\0') { return CL_PHISH_CLEAN; }
[-] [+]	Changed	clamav-0.97.2.tar.bz2/shared/optparser.c ^
@@ -374,7 +374,7 @@ { "CompressLocalDatabase", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "By default freshclam will keep the local databases (.cld) uncompressed to\nmake their handling faster. With this option you can enable the compression.\nThe change will take effect with the next database update.", "" }, - { "ExtraDatabase", NULL, 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_FRESHCLAM, "Download additional database. This option can be used multiple times.", "dbname1\ndbname2" }, + { "ExtraDatabase", NULL, 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_FRESHCLAM, "Download an additional 3rd party signature database distributed through\nthe ClamAV mirrors. Here you can find a list of available databases:\nhttp://www.clamav.net/download/cvd/3rdparty\nThis option can be used multiple times.", "dbname1\ndbname2" }, { "DatabaseCustomURL", NULL, 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_FRESHCLAM, "With this option you can provide custom sources (http:// or file://) for database files.\nThis option can be used multiple times.", "http://myserver.com/mysigs.ndb\nfile:///mnt/nfs/local.hdb" },
[-] [+]	Changed	clamav-0.97.2.tar.bz2/sigtool/Makefile.in ^
@@ -55,7 +55,7 @@ target_triplet = @target@ bin_PROGRAMS = sigtool$(EXEEXT) subdir = sigtool -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/argz.m4 \
[-] [+]	Changed	clamav-0.97.2.tar.bz2/unit_tests/check_common.sh ^
@@ -58,9 +58,13 @@ aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File EOF port=331$1 - if test "x$RANDOM" != "x"; then - port=1`expr 100 + $ $RANDOM % 899 $`$1 - fi + tries=0 + while nc -z localhost $port 2>/dev/null + do rand=` ( echo $$ ; time ps 2>&1 ; date ) \| cksum \| cut -f1 -d" " ` + port=1`expr 100 + $ $rand % 899 $`$1 + [ $tries -gt 100 ] && echo Giving up, too many ports open && exit 1 + tries=`expr $tries + 1` + done cat <<EOF >test-clamd.conf LogFile `pwd`/clamd-test.log LogFileMaxSize 0
[-] [+]	Added	clamav-0.97.2.tar.bz2/unit_tests/valgrind.supp ^
@@ -0,0 +1,6 @@ +{ + glibc-tls + Memcheck:Free + fun:* + fun:_dl_allocate_tls +}
[-] [+]	Changed	clamav-0.97.2.tar.bz2/win32/configure.js ^
@@ -55,7 +55,12 @@ W.Echo('WARNING: git describe returned ' + git.ExitCode); version = ''; } else { - version = '#define REPO_VERSION "devel-' + version.replace(/[\r\n]+$/, '') + '"'; + version = version.replace(/[\r\n]+$/, ''); + if(version.match(/^clamav-([^-]+)$/)) + version = RegExp.$1; + else + version = 'devel-' + version; + version = '#define REPO_VERSION "' + version + '"'; } } catch (e) { W.Echo('WARNING: Error executing git: ' + e.message);