diff -Nru clamav-0.97.7+dfsg/ChangeLog clamav-0.97.8+dfsg/ChangeLog --- clamav-0.97.7+dfsg/ChangeLog 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/ChangeLog 2013-04-17 15:25:08.000000000 +0000 @@ -1,3 +1,11 @@ +Fri Apr 5 17:36:54 EDT 2013 (dar) +------------------------------------ + * libclamav: Bugs reported by Felix Groebert of the Google Security Team + +Thu Feb 28 13:55:04 EDT 2013 (dar) +------------------------------------ + * libclamav/pe_icons.c: introduce LOGPARSEICONDETAILS define to reduce parseicon logging in default build + Wed Feb 20 10:05:00 EDT 2012 (multiple) --------------------------------- * Bug reported by Felix Groebert, Mateusz Jurczyk and Gynvael Coldwind of the @@ -154,6 +162,10 @@ ------------------------------------ * libclamav/matcher-hash.c: off by one read in cli_hm_scan (bb#2818) +Tue Jul 19 18:30:53 CEST 2011 (acab) +------------------------------------ + * libclamav/autoit.c: avoid dumping uninit data on autoit failure (bb#3051) + Thu Jul 14 12:29:17 EEST 2011 (edwin) ------------------------------------ * libclamav/pdf.c: fix encrypted pdf detection (bb #2988) diff -Nru clamav-0.97.7+dfsg/Makefile.in.orig clamav-0.97.8+dfsg/Makefile.in.orig --- clamav-0.97.7+dfsg/Makefile.in.orig 2013-03-19 02:31:44.000000000 +0000 +++ clamav-0.97.8+dfsg/Makefile.in.orig 1970-01-01 00:00:00.000000000 +0000 @@ -1,968 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Copyright (C) 2002 - 2004 Tomasz Kojm -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \ - $(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \ - $(srcdir)/platform.h.in $(top_srcdir)/configure \ - $(top_srcdir)/docs/man/clamav-milter.8.in \ - $(top_srcdir)/docs/man/clamav-milter.conf.5.in \ - $(top_srcdir)/docs/man/clambc.1.in \ - $(top_srcdir)/docs/man/clamconf.1.in \ - $(top_srcdir)/docs/man/clamd.8.in \ - $(top_srcdir)/docs/man/clamd.conf.5.in \ - $(top_srcdir)/docs/man/clamdscan.1.in \ - $(top_srcdir)/docs/man/clamdtop.1.in \ - $(top_srcdir)/docs/man/clamscan.1.in \ - $(top_srcdir)/docs/man/freshclam.1.in \ - $(top_srcdir)/docs/man/freshclam.conf.5.in \ - $(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \ - INSTALL NEWS config/config.guess config/config.rpath \ - config/config.sub config/depcomp config/install-sh \ - config/ltmain.sh config/missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ - $(top_srcdir)/m4/argz.m4 \ - $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ - $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = clamav-config.h -CONFIG_CLEAN_FILES = clamav-config libclamav.pc platform.h \ - docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 \ - docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 \ - docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 \ - docs/man/freshclam.1 docs/man/freshclam.conf.5 \ - docs/man/sigtool.1 docs/man/clamdtop.1 -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" -SCRIPTS = $(bin_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -ARGZ_H = @ARGZ_H@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_CONFIGURE_FLAGS = @BUILD_CONFIGURE_FLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFGDIR = @CFGDIR@ -CFLAGS = @CFLAGS@ -CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ -CHECK_LIBS = @CHECK_LIBS@ -CLAMAVGROUP = @CLAMAVGROUP@ -CLAMAVUSER = @CLAMAVUSER@ -CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@ -CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@ -CLAMD_LIBS = @CLAMD_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CURSES_CPPFLAGS = @CURSES_CPPFLAGS@ -CURSES_LIBS = @CURSES_LIBS@ -CYGPATH_W = @CYGPATH_W@ -DBDIR = @DBDIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ -GCOV = @GCOV@ -GENHTML = @GENHTML@ -GETENT = @GETENT@ -GPERF = @GPERF@ -GREP = @GREP@ -INCLTDL = @INCLTDL@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LCOV = @LCOV@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBADD_DL = @LIBADD_DL@ -LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ -LIBADD_DLOPEN = @LIBADD_DLOPEN@ -LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ -LIBBZ2 = @LIBBZ2@ -LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ -LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ -LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ -LIBLTDL = @LIBLTDL@ -LIBM = @LIBM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTDLDEPS = @LTDLDEPS@ -LTDLINCL = @LTDLINCL@ -LTDLOPEN = @LTDLOPEN@ -LTLIBBZ2 = @LTLIBBZ2@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CONFIG_H = @LT_CONFIG_H@ -LT_DLLOADERS = @LT_DLLOADERS@ -LT_DLPREOPEN = @LT_DLPREOPEN@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -THREAD_LIBS = @THREAD_LIBS@ -TH_SAFE = @TH_SAFE@ -VERSION = @VERSION@ -VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -ltdl_LIBOBJS = @ltdl_LIBOBJS@ -ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sys_symbol_underscore = @sys_symbol_underscore@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -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 contrib -bin_SCRIPTS = clamav-config -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libclamav.pc - -# don't complain that configuration files and databases are not removed, this is intended -distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print -DISTCLEANFILES = target.h -DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes -all: clamav-config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -clamav-config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status clamav-config.h -$(srcdir)/clamav-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f clamav-config.h stamp-h1 -clamav-config: $(top_builddir)/config.status $(srcdir)/clamav-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -libclamav.pc: $(top_builddir)/config.status $(srcdir)/libclamav.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -platform.h: $(top_builddir)/config.status $(srcdir)/platform.h.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamav-milter.8: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamav-milter.8.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamav-milter.conf.5: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamav-milter.conf.5.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clambc.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clambc.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamconf.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamconf.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamd.8: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamd.8.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamd.conf.5: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamd.conf.5.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamdscan.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamdscan.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamscan.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamscan.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/freshclam.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/freshclam.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/freshclam.conf.5: $(top_builddir)/config.status $(top_srcdir)/docs/man/freshclam.conf.5.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/sigtool.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/sigtool.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -docs/man/clamdtop.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamdtop.1.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -installcheck-binSCRIPTS: $(bin_SCRIPTS) - bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \ - case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ - *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ - esac; \ - f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ - for opt in --help --version; do \ - if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ - 2>c$${pid}_.err &2; bad=1; fi; \ - done; \ - done; rm -f c$${pid}_.???; exit $$bad - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(SCRIPTS) $(DATA) clamav-config.h -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-pkgconfigDATA - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: install-binSCRIPTS - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: installcheck-binSCRIPTS - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installcheck-binSCRIPTS \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-pkgconfigDATA - -lcov: - ($(MAKE); cd unit_tests; $(MAKE) lcov) -quick-check: - ($(MAKE); cd unit_tests; $(MAKE) quick-check) - -dist-hook: - rm -rf $(distdir)/win32/clamav-for-windows $(distdir)/win32/build - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru clamav-0.97.7+dfsg/NEWS clamav-0.97.8+dfsg/NEWS --- clamav-0.97.7+dfsg/NEWS 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/NEWS 2013-04-17 15:25:08.000000000 +0000 @@ -1,8 +1,8 @@ -0.97.7 +0.97.8 ------ -ClamAV 0.97.7 addresses several reported potential security bugs. Thanks to -Felix Groebert, Mateusz Jurczyk and Gynvael Coldwind of the Google Security -Team for finding and reporting these issues. +ClamAV 0.97.8 addresses several reported potential security bugs. Thanks to +Felix Groebert of the Google Security Team for finding and reporting these +issues. -- The ClamAV team (http://www.clamav.net/team) diff -Nru clamav-0.97.7+dfsg/README clamav-0.97.8+dfsg/README --- clamav-0.97.7+dfsg/README 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/README 2013-04-17 15:25:08.000000000 +0000 @@ -1,6 +1,12 @@ Note: This README/NEWS file refers to the source tarball. Some things described here may not be available in binary packages. -- +0.97.8 +------ +ClamAV 0.97.8 addresses several reported potential security bugs. Thanks to +Felix Groebert of the Google Security Team for finding and reporting these +issues. + 0.97.7 ------ ClamAV 0.97.7 addresses several reported potential security bugs. Thanks to diff -Nru clamav-0.97.7+dfsg/configure clamav-0.97.8+dfsg/configure --- clamav-0.97.7+dfsg/configure 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/configure 2013-04-17 15:25:09.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for ClamAV 0.97.7. +# Generated by GNU Autoconf 2.63 for ClamAV 0.97.8. # # Report bugs to . # @@ -747,8 +747,8 @@ # Identity of this package. PACKAGE_NAME='ClamAV' PACKAGE_TARNAME='clamav' -PACKAGE_VERSION='0.97.7' -PACKAGE_STRING='ClamAV 0.97.7' +PACKAGE_VERSION='0.97.8' +PACKAGE_STRING='ClamAV 0.97.8' PACKAGE_BUGREPORT='http://bugs.clamav.net/' ac_unique_file="clamscan/clamscan.c" @@ -1592,7 +1592,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.7 to adapt to many kinds of systems. +\`configure' configures ClamAV 0.97.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1663,7 +1663,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ClamAV 0.97.7:";; + short | recursive ) echo "Configuration of ClamAV 0.97.8:";; esac cat <<\_ACEOF @@ -1819,7 +1819,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ClamAV configure 0.97.7 +ClamAV configure 0.97.8 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1833,7 +1833,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.7, which was +It was created by ClamAV $as_me 0.97.8, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -3004,7 +3004,7 @@ # Define the identity of the package. PACKAGE='clamav' - VERSION='0.97.7' + VERSION='0.97.8' # Some tools Automake needs. @@ -3135,10 +3135,10 @@ _ACEOF -VERSION="0.97.7" +VERSION="0.97.8" LC_CURRENT=7 -LC_REVISION=16 +LC_REVISION=17 LC_AGE=1 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" @@ -26535,7 +26535,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.7, which was +This file was extended by ClamAV $as_me 0.97.8, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26598,7 +26598,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -ClamAV config.status 0.97.7 +ClamAV config.status 0.97.8 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -29230,7 +29230,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.7, which was +This file was extended by ClamAV $as_me 0.97.8, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29293,7 +29293,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -ClamAV config.status 0.97.7 +ClamAV config.status 0.97.8 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru clamav-0.97.7+dfsg/configure.in clamav-0.97.8+dfsg/configure.in --- clamav-0.97.7+dfsg/configure.in 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/configure.in 2013-04-17 15:25:09.000000000 +0000 @@ -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.7], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/]) +AC_INIT([ClamAV], [0.97.8], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/]) AH_BOTTOM([#include "platform.h"]) dnl put configure auxiliary into config @@ -43,10 +43,10 @@ dnl change this on a release dnl VERSION="devel-`date +%Y%m%d`" -VERSION="0.97.7" +VERSION="0.97.8" LC_CURRENT=7 -LC_REVISION=16 +LC_REVISION=17 LC_AGE=1 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" AC_SUBST([LIBCLAMAV_VERSION]) diff -Nru clamav-0.97.7+dfsg/debian/changelog clamav-0.97.8+dfsg/debian/changelog --- clamav-0.97.7+dfsg/debian/changelog 2013-05-02 21:36:18.000000000 +0000 +++ clamav-0.97.8+dfsg/debian/changelog 2013-05-02 21:36:18.000000000 +0000 @@ -1,10 +1,24 @@ -clamav (0.97.7+dfsg-1ubuntu0.12.04.1) precise-security; urgency=low +clamav (0.97.8+dfsg-1ubuntu1.12.04.1) precise-security; urgency=low - * SECURITY UPDATE: Updated to 0.97.7 to fix multiple security issues. - (LP: #1157385) - - CVE numbers pending + [ Seth Arnold ] + * SECURITY UPDATE: Updated to 0.97.8 to fix multiple security issues. + - CVE-2013-2020 and CVE-2013-2021 - -- Marc Deslauriers Tue, 19 Mar 2013 15:34:52 -0400 + [ Scott Kitterman ] + * Merge from Debian unstable (LP: #1172981). Remaining changes: + - Drop build-dep on electric-fence (in Universe) + - Add apparmor profiles for clamd and freshclam along with maintainer + script changes + + -- Scott Kitterman Thu, 25 Apr 2013 23:41:55 -0400 + +clamav (0.97.8+dfsg-1) unstable; urgency=medium + + * New upstream release + * Update libclamav6 lintian override to match updated soversion + * Urgency medium due to security fixes + + -- Scott Kitterman Wed, 24 Apr 2013 22:34:16 -0400 clamav (0.97.7+dfsg-1ubuntu1) raring; urgency=low diff -Nru clamav-0.97.7+dfsg/debian/libclamav6.lintian-overrides clamav-0.97.8+dfsg/debian/libclamav6.lintian-overrides --- clamav-0.97.7+dfsg/debian/libclamav6.lintian-overrides 2013-05-02 21:36:18.000000000 +0000 +++ clamav-0.97.8+dfsg/debian/libclamav6.lintian-overrides 2013-05-02 21:36:18.000000000 +0000 @@ -1 +1 @@ -libclamav6 binary: embedded-library usr/lib/libclamav.so.6.1.16: zlib +libclamav6 binary: embedded-library usr/lib/libclamav.so.6.1.17: zlib Binary files /tmp/SiiXxJhDsa/clamav-0.97.7+dfsg/docs/clamdoc.pdf and /tmp/VOVgOLaYwH/clamav-0.97.8+dfsg/docs/clamdoc.pdf differ diff -Nru clamav-0.97.7+dfsg/docs/clamdoc.tex clamav-0.97.8+dfsg/docs/clamdoc.tex --- clamav-0.97.7+dfsg/docs/clamdoc.tex 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/clamdoc.tex 2013-04-17 15:25:09.000000000 +0000 @@ -1,6 +1,6 @@ % Clam AntiVirus: User Manual % -% Copyright (C) 2008 Sourcefire, Inc. +% Copyright (C) 2008-2013 Sourcefire, Inc. % Copyright (C) 2002 - 2007 Tomasz Kojm % Version 0.2x corrected by Dennis Leeuw % Version 0.80 corrected by Tomasz Papszun @@ -71,7 +71,7 @@ \vspace{3cm} \begin{flushright} \rule[-1ex]{8cm}{3pt}\\ - \huge Clam AntiVirus 0.97.4\\ + \huge Clam AntiVirus 0.97.8\\ \huge \emph{User Manual}\\ \end{flushright} @@ -83,7 +83,7 @@ \noindent \begin{boxedminipage}[b]{\textwidth} ClamAV User Manual, - \copyright \ 2007 - 2011 Sourcefire, Inc. + \copyright \ 2007 - 2013 Sourcefire, Inc. Authors: Tomasz Kojm\\ This document is distributed under the terms of the GNU General Public License v2.\\ @@ -1570,15 +1570,44 @@ \section{Core Team} \begin{itemize} + \item Christoph Cordes \email{}, Germany\\ + Role: virus database maintainer + + \item Joel Esler \email{}, USA\\ + Role: open source community manager + + \item Tom Judge \email{}, USA\\ + Role: infrastucture developer + + \item Steven Morgan \email{}, USA\\ + Role: ClamAV developer + + \item Matthew Olney \email{}, USA\\ + Role: development manager + + \item David Raynor \email{}, USA\\ + Role: ClamAV developer + + \item Shawn Webb \email{}, USA\\ + Role: ClamAV developer + + \item Carl Wu \email{}, USA\\ + Role: ClamAV developer + + \item Alain Zidouemba \email{}, USA\\ + Role: virus database maintainer + + \end{itemize} + + \section{Emeritus Team} + + \begin{itemize} \item aCaB \email{}, Italy\\ Role: virus database maintainer, coder \item Mike Cathey \email{}, USA\\ Role: co-sysadmin - \item Christoph Cordes \email{}, Germany\\ - Role: virus database maintainer - \item Diego d'Ambra \email{}, Denmark\\ Role: virus database maintainer Binary files /tmp/SiiXxJhDsa/clamav-0.97.7+dfsg/docs/html/clam.png and /tmp/VOVgOLaYwH/clamav-0.97.8+dfsg/docs/html/clam.png differ diff -Nru clamav-0.97.7+dfsg/docs/html/clamdoc.css clamav-0.97.8+dfsg/docs/html/clamdoc.css --- clamav-0.97.7+dfsg/docs/html/clamdoc.css 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/clamdoc.css 2013-04-17 15:25:09.000000000 +0000 @@ -1,6 +1,6 @@ /* Century Schoolbook font is very similar to Computer Modern Math: cmmi */ .MATH { font-family: "Century Schoolbook", serif; } -.MATH I { font-family: "Century Schoolbook", serif; font-shape: italic } +.MATH I { font-family: "Century Schoolbook", serif; font-style: italic } .BOLDMATH { font-family: "Century Schoolbook", serif; font-weight: bold } /* implement both fixed-size and relative sizes */ @@ -28,3 +28,11 @@ /* document-specific styles come next */ +PRE.preform { } +DIV.center { } +DIV.flushright { } +DIV.navigation { } +SPAN.textbf { font-weight: bold } +SPAN.arabic { } +SPAN.textit { font-style: italic } +#hue36 { color: #ffffff; } diff -Nru clamav-0.97.7+dfsg/docs/html/clamdoc.html clamav-0.97.8+dfsg/docs/html/clamdoc.html --- clamav-0.97.7+dfsg/docs/html/clamdoc.html 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/clamdoc.html 2013-04-17 15:25:09.000000000 +0000 @@ -44,7 +44,7 @@

Image clam
@@ -56,7 +56,7 @@

-
Clam AntiVirus 0.97.4 +
Clam AntiVirus 0.97.8
User Manual
@@ -221,13 +221,12 @@
  • Core Team
  • About this document ... + HREF="node62.html">Emeritus Team
    -Tomasz Kojm -2011-07-25 +SourceFire 2013-04-16
    Binary files /tmp/SiiXxJhDsa/clamav-0.97.7+dfsg/docs/html/crossref.png and /tmp/VOVgOLaYwH/clamav-0.97.8+dfsg/docs/html/crossref.png differ diff -Nru clamav-0.97.7+dfsg/docs/html/footnode.html clamav-0.97.8+dfsg/docs/html/footnode.html --- clamav-0.97.7+dfsg/docs/html/footnode.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/footnode.html 2013-04-17 15:25:09.000000000 +0000 @@ -135,9 +135,9 @@ . -
    ... framework... framework4
    -
    See section 3.6 on how to run the unit tests +
    See section [*] on how to run the unit tests 
    .
 .
@@ -207,7 +207,7 @@
 .
    -
    ... gcc-c++.... gcc-c++.6
    Note that several versions of GCC have bugs when compiling LLVM, see Image clam
    @@ -56,7 +56,7 @@

    -
    Clam AntiVirus 0.97.4 +
    Clam AntiVirus 0.97.8
    User Manual
    @@ -221,13 +221,12 @@
  • Core Team
  • About this document ... + HREF="node62.html">Emeritus Team
    -Tomasz Kojm -2011-07-25 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node1.html clamav-0.97.8+dfsg/docs/html/node1.html --- clamav-0.97.7+dfsg/docs/html/node1.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node1.html 2013-04-17 15:25:09.000000000 +0000 @@ -144,6 +144,8 @@
  • Core Team +
  • Emeritus Team

    @@ -181,8 +183,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node10.html clamav-0.97.8+dfsg/docs/html/node10.html --- clamav-0.97.7+dfsg/docs/html/node10.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node10.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: Installation - Up: Up: Base package - Previous: Previous: Windows -   Contents

    @@ -60,8 +60,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node11.html clamav-0.97.8+dfsg/docs/html/node11.html --- clamav-0.97.7+dfsg/docs/html/node11.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node11.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Requirements - Up: Up: clamdoc - Previous: Previous: Binary packages -   Contents

    @@ -62,26 +62,25 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node12.html clamav-0.97.8+dfsg/docs/html/node12.html --- clamav-0.97.7+dfsg/docs/html/node12.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node12.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Installing on shell account - Up: Up: Installation - Previous: Previous: Installation -   Contents

    @@ -77,7 +77,7 @@
  • bzip2 and bzip2-devel library
  • check unit testing framework 4. + HREF="footnode.html#foot799">4.
    • @@ -89,7 +89,7 @@
    the package for these compilers are usually called: gcc, g++, or gcc-c++. 6 + HREF="footnode.html#foot800">6
  • A supported CPU for the JIT, either of: X86, X86-64, PowerPC, PowerPC64 @@ -109,31 +109,30 @@
    - next - up - previous - contents
    - Next: Next: Installing on shell account - Up: Up: Installation - Previous: Previous: Installation -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node13.html clamav-0.97.8+dfsg/docs/html/node13.html --- clamav-0.97.7+dfsg/docs/html/node13.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node13.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Adding new system user - Up: Up: Installation - Previous: Previous: Requirements -   Contents

    @@ -74,8 +74,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node14.html clamav-0.97.8+dfsg/docs/html/node14.html --- clamav-0.97.7+dfsg/docs/html/node14.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node14.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Compilation of base package - Up: Up: Installation - Previous: Previous: Installing on shell account -   Contents

    @@ -68,8 +68,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node15.html clamav-0.97.8+dfsg/docs/html/node15.html --- clamav-0.97.7+dfsg/docs/html/node15.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node15.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Compilation with clamav-milter enabled - Up: Up: Installation - Previous: Previous: Adding new system user -   Contents

    @@ -74,8 +74,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node16.html clamav-0.97.8+dfsg/docs/html/node16.html --- clamav-0.97.7+dfsg/docs/html/node16.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node16.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Running unit tests - Up: Up: Installation - Previous: Previous: Compilation of base package -   Contents

    @@ -64,8 +64,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node17.html clamav-0.97.8+dfsg/docs/html/node17.html --- clamav-0.97.7+dfsg/docs/html/node17.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node17.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Reporting a unit test - Up: Up: Installation - Previous: Previous: Compilation with clamav-milter enabled -   Contents

    @@ -118,31 +118,30 @@
    - next - up - previous - contents
    - Next: Next: Reporting a unit test - Up: Up: Installation - Previous: Previous: Compilation with clamav-milter enabled -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node18.html clamav-0.97.8+dfsg/docs/html/node18.html --- clamav-0.97.7+dfsg/docs/html/node18.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node18.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: Configuration - Up: Up: Installation - Previous: Previous: Running unit tests -   Contents

    @@ -95,8 +95,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node19.html clamav-0.97.8+dfsg/docs/html/node19.html --- clamav-0.97.7+dfsg/docs/html/node19.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node19.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: clamd - Up: Up: clamdoc - Previous: Previous: Reporting a unit test -   Contents

    @@ -62,32 +62,31 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node2.html clamav-0.97.8+dfsg/docs/html/node2.html --- clamav-0.97.7+dfsg/docs/html/node2.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node2.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Features - Up: Up: clamdoc - Previous: Previous: Contents -   Contents

    @@ -68,18 +68,17 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node20.html clamav-0.97.8+dfsg/docs/html/node20.html --- clamav-0.97.7+dfsg/docs/html/node20.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node20.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: On-access scanning - Up: Up: Configuration - Previous: Previous: Configuration -   Contents

    @@ -72,14 +72,13 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node21.html clamav-0.97.8+dfsg/docs/html/node21.html --- clamav-0.97.7+dfsg/docs/html/node21.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node21.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: clamav-milter - Up: Up: clamd - Previous: Previous: clamd -   Contents

    @@ -83,14 +83,13 @@ 254 dazuko $ su -c "mknod -m 600 /dev/dazuko c 254 0" - Now configure Clamuko in clamd.conf and read the 5.3 + Now configure Clamuko in clamd.conf and read the [*] section.


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node22.html clamav-0.97.8+dfsg/docs/html/node22.html --- clamav-0.97.7+dfsg/docs/html/node22.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node22.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Testing - Up: Up: Configuration - Previous: Previous: On-access scanning -   Contents

    @@ -69,8 +69,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node23.html clamav-0.97.8+dfsg/docs/html/node23.html --- clamav-0.97.7+dfsg/docs/html/node23.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node23.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Setting up auto-updating - Up: Up: Configuration - Previous: Previous: clamav-milter -   Contents

    @@ -74,8 +74,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node24.html clamav-0.97.8+dfsg/docs/html/node24.html --- clamav-0.97.7+dfsg/docs/html/node24.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node24.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Closest mirrors - Up: Up: Configuration - Previous: Previous: Testing -   Contents

    @@ -109,38 +109,37 @@ Subsections
    - next - up - previous - contents
    - Next: Next: Closest mirrors - Up: Up: Configuration - Previous: Previous: Testing -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node25.html clamav-0.97.8+dfsg/docs/html/node25.html --- clamav-0.97.7+dfsg/docs/html/node25.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node25.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: ClamAV Active Malware Report - Up: Up: Setting up auto-updating - Previous: Previous: Setting up auto-updating -   Contents

    @@ -76,8 +76,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node26.html clamav-0.97.8+dfsg/docs/html/node26.html --- clamav-0.97.7+dfsg/docs/html/node26.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node26.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: Usage - Up: Up: Configuration - Previous: Previous: Closest mirrors -   Contents

    @@ -84,31 +84,30 @@
    - next - up - previous - contents
    - Next: Next: Usage - Up: Up: Configuration - Previous: Previous: Closest mirrors -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node27.html clamav-0.97.8+dfsg/docs/html/node27.html --- clamav-0.97.7+dfsg/docs/html/node27.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node27.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Clam daemon - Up: Up: clamdoc - Previous: Previous: ClamAV Active Malware Report -   Contents

    @@ -62,25 +62,24 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node28.html clamav-0.97.8+dfsg/docs/html/node28.html --- clamav-0.97.7+dfsg/docs/html/node28.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node28.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Clamdscan - Up: Up: Usage - Previous: Previous: Usage -   Contents

    @@ -206,31 +206,30 @@
    - next - up - previous - contents
    - Next: Next: Clamdscan - Up: Up: Usage - Previous: Previous: Usage -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node29.html clamav-0.97.8+dfsg/docs/html/node29.html --- clamav-0.97.7+dfsg/docs/html/node29.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node29.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Clamuko - Up: Up: Usage - Previous: Previous: Clam daemon -   Contents

    @@ -75,8 +75,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node3.html clamav-0.97.8+dfsg/docs/html/node3.html --- clamav-0.97.7+dfsg/docs/html/node3.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node3.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Mailing lists and IRC - Up: Up: Introduction - Previous: Previous: Introduction -   Contents

    @@ -171,31 +171,30 @@
    - next - up - previous - contents
    - Next: Next: Mailing lists and IRC - Up: Up: Introduction - Previous: Previous: Introduction -   Contents
    -Tomasz Kojm -2011-07-25 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node30.html clamav-0.97.8+dfsg/docs/html/node30.html --- clamav-0.97.7+dfsg/docs/html/node30.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node30.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Output format - Up: Up: Usage - Previous: Previous: Clamdscan -   Contents

    @@ -91,8 +91,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node31.html clamav-0.97.8+dfsg/docs/html/node31.html --- clamav-0.97.7+dfsg/docs/html/node31.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node31.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: clamscan - Up: Up: Usage - Previous: Previous: Clamuko -   Contents

    @@ -61,16 +61,15 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node32.html clamav-0.97.8+dfsg/docs/html/node32.html --- clamav-0.97.7+dfsg/docs/html/node32.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node32.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: clamd - Up: Up: Output format - Previous: Previous: Output format -   Contents

    @@ -78,8 +78,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node33.html clamav-0.97.8+dfsg/docs/html/node33.html --- clamav-0.97.7+dfsg/docs/html/node33.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node33.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: LibClamAV - Up: Up: Output format - Previous: Previous: clamscan -   Contents

    @@ -82,8 +82,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node34.html clamav-0.97.8+dfsg/docs/html/node34.html --- clamav-0.97.7+dfsg/docs/html/node34.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node34.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Licence - Up: Up: clamdoc - Previous: Previous: clamd -   Contents

    @@ -66,70 +66,69 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node35.html clamav-0.97.8+dfsg/docs/html/node35.html --- clamav-0.97.7+dfsg/docs/html/node35.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node35.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Supported formats and features - Up: Up: LibClamAV - Previous: Previous: LibClamAV -   Contents

    @@ -62,8 +62,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node36.html clamav-0.97.8+dfsg/docs/html/node36.html --- clamav-0.97.7+dfsg/docs/html/node36.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node36.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Executables - Up: Up: LibClamAV - Previous: Previous: Licence -   Contents

    @@ -62,24 +62,23 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node37.html clamav-0.97.8+dfsg/docs/html/node37.html --- clamav-0.97.7+dfsg/docs/html/node37.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node37.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Mail files - Up: Up: Supported formats and features - Previous: Previous: Supported formats and features -   Contents

    @@ -86,8 +86,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node38.html clamav-0.97.8+dfsg/docs/html/node38.html --- clamav-0.97.7+dfsg/docs/html/node38.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node38.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Archives and compressed files - Up: Up: Supported formats and features - Previous: Previous: Executables -   Contents

    @@ -61,8 +61,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node39.html clamav-0.97.8+dfsg/docs/html/node39.html --- clamav-0.97.7+dfsg/docs/html/node39.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node39.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Documents - Up: Up: Supported formats and features - Previous: Previous: Mail files -   Contents

    @@ -97,8 +97,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node4.html clamav-0.97.8+dfsg/docs/html/node4.html --- clamav-0.97.7+dfsg/docs/html/node4.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node4.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Virus submitting - Up: Up: Introduction - Previous: Previous: Features -   Contents

    @@ -85,8 +85,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node40.html clamav-0.97.8+dfsg/docs/html/node40.html --- clamav-0.97.7+dfsg/docs/html/node40.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node40.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Data Loss Prevention - Up: Up: Supported formats and features - Previous: Previous: Archives and compressed files -   Contents

    @@ -75,8 +75,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node41.html clamav-0.97.8+dfsg/docs/html/node41.html --- clamav-0.97.7+dfsg/docs/html/node41.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node41.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Others - Up: Up: Supported formats and features - Previous: Previous: Documents -   Contents

    @@ -61,8 +61,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node42.html clamav-0.97.8+dfsg/docs/html/node42.html --- clamav-0.97.7+dfsg/docs/html/node42.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node42.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: API - Up: Up: Supported formats and features - Previous: Previous: Data Loss Prevention -   Contents

    @@ -74,8 +74,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node43.html clamav-0.97.8+dfsg/docs/html/node43.html --- clamav-0.97.7+dfsg/docs/html/node43.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node43.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Header file - Up: Up: LibClamAV - Previous: Previous: Others -   Contents

    @@ -62,36 +62,35 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node44.html clamav-0.97.8+dfsg/docs/html/node44.html --- clamav-0.97.7+dfsg/docs/html/node44.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node44.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Initialization - Up: Up: API - Previous: Previous: API -   Contents

    @@ -63,8 +63,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node45.html clamav-0.97.8+dfsg/docs/html/node45.html --- clamav-0.97.7+dfsg/docs/html/node45.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node45.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Database loading - Up: Up: API - Previous: Previous: Header file -   Contents

    @@ -72,8 +72,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node46.html clamav-0.97.8+dfsg/docs/html/node46.html --- clamav-0.97.7+dfsg/docs/html/node46.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node46.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Error handling - Up: Up: API - Previous: Previous: Initialization -   Contents

    @@ -124,8 +124,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node47.html clamav-0.97.8+dfsg/docs/html/node47.html --- clamav-0.97.7+dfsg/docs/html/node47.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node47.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Engine structure - Up: Up: API - Previous: Previous: Database loading -   Contents

    @@ -68,8 +68,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node48.html clamav-0.97.8+dfsg/docs/html/node48.html --- clamav-0.97.7+dfsg/docs/html/node48.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node48.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Limits - Up: Up: API - Previous: Previous: Error handling -   Contents

    @@ -74,8 +74,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node49.html clamav-0.97.8+dfsg/docs/html/node49.html --- clamav-0.97.7+dfsg/docs/html/node49.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node49.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Database checks - Up: Up: API - Previous: Previous: Engine structure -   Contents

    @@ -78,8 +78,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node5.html clamav-0.97.8+dfsg/docs/html/node5.html --- clamav-0.97.7+dfsg/docs/html/node5.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node5.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: Base package - Up: Up: Introduction - Previous: Previous: Mailing lists and IRC -   Contents

    @@ -64,8 +64,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node50.html clamav-0.97.8+dfsg/docs/html/node50.html --- clamav-0.97.7+dfsg/docs/html/node50.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node50.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Data scan functions - Up: Up: API - Previous: Previous: Limits -   Contents

    @@ -102,8 +102,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node51.html clamav-0.97.8+dfsg/docs/html/node51.html --- clamav-0.97.7+dfsg/docs/html/node51.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node51.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Memory - Up: Up: API - Previous: Previous: Database checks -   Contents

    @@ -194,31 +194,30 @@
    - next - up - previous - contents
    - Next: Next: Memory - Up: Up: API - Previous: Previous: Database checks -   Contents
    -Tomasz Kojm -2011-03-21 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node52.html clamav-0.97.8+dfsg/docs/html/node52.html --- clamav-0.97.7+dfsg/docs/html/node52.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node52.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Forking daemons - Up: Up: API - Previous: Previous: Data scan functions -   Contents

    @@ -62,8 +62,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node53.html clamav-0.97.8+dfsg/docs/html/node53.html --- clamav-0.97.7+dfsg/docs/html/node53.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node53.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: clamav-config - Up: Up: API - Previous: Previous: Memory -   Contents

    @@ -64,8 +64,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node54.html clamav-0.97.8+dfsg/docs/html/node54.html --- clamav-0.97.7+dfsg/docs/html/node54.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node54.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Example - Up: Up: API - Previous: Previous: Forking daemons -   Contents

    @@ -66,8 +66,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node55.html clamav-0.97.8+dfsg/docs/html/node55.html --- clamav-0.97.7+dfsg/docs/html/node55.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node55.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: CVD format - Up: Up: API - Previous: Previous: clamav-config -   Contents

    @@ -64,8 +64,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node56.html clamav-0.97.8+dfsg/docs/html/node56.html --- clamav-0.97.7+dfsg/docs/html/node56.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node56.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Contributors - Up: Up: LibClamAV - Previous: Previous: Example -   Contents

    @@ -81,8 +81,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node57.html clamav-0.97.8+dfsg/docs/html/node57.html --- clamav-0.97.7+dfsg/docs/html/node57.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node57.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Donors - Up: Up: LibClamAV - Previous: Previous: CVD format -   Contents

    @@ -589,31 +589,30 @@
    - next - up - previous - contents
    - Next: Next: Donors - Up: Up: LibClamAV - Previous: Previous: CVD format -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node58.html clamav-0.97.8+dfsg/docs/html/node58.html --- clamav-0.97.7+dfsg/docs/html/node58.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node58.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Graphics - Up: Up: LibClamAV - Previous: Previous: Contributors -   Contents

    @@ -435,31 +435,30 @@
    - next - up - previous - contents
    - Next: Next: Graphics - Up: Up: LibClamAV - Previous: Previous: Contributors -   Contents
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node59.html clamav-0.97.8+dfsg/docs/html/node59.html --- clamav-0.97.7+dfsg/docs/html/node59.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node59.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: OpenAntiVirus - Up: Up: LibClamAV - Previous: Previous: Donors -   Contents

    @@ -62,8 +62,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node6.html clamav-0.97.8+dfsg/docs/html/node6.html --- clamav-0.97.7+dfsg/docs/html/node6.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node6.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Supported platforms - Up: Up: clamdoc - Previous: Previous: Virus submitting -   Contents

    @@ -62,23 +62,22 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node60.html clamav-0.97.8+dfsg/docs/html/node60.html --- clamav-0.97.7+dfsg/docs/html/node60.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node60.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: Core Team - Up: Up: LibClamAV - Previous: Previous: Graphics -   Contents

    @@ -61,8 +61,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node61.html clamav-0.97.8+dfsg/docs/html/node61.html --- clamav-0.97.7+dfsg/docs/html/node61.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node61.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: About this document ... - Up: Next: Emeritus Team + Up: clamdoc - Previous: Previous: OpenAntiVirus -   Contents

    @@ -59,82 +59,66 @@

      -
    • aCaB <acab*clamav.net>, Italy -
      -Role: virus database maintainer, coder - -

      -

      • -
    • Mike Cathey <mike*clamav.net>, USA -
      -Role: co-sysadmin - -

      -

    • Christoph Cordes <ccordes*clamav.net>, Germany
      Role: virus database maintainer

      • -
    • Diego d'Ambra <diego*clamav.net>, Denmark +
    • Joel Esler <jesler*sourcefire.com>, USA
      -Role: virus database maintainer +Role: open source community manager

      • -
    • Luca Gibelli <luca*clamav.net>, Italy +
    • Tom Judge <tjudge*sourcefire.com>, USA
      -Role: sysadmin, mirror coordinator +Role: infrastucture developer

      • -
    • Nigel Horne <njh*clamav.net>, United Kingdom +
    • Steven Morgan <smorgan*sourcefire.com>, USA
      -Role: coder +Role: ClamAV developer

      • -
    • Arnaud Jacques <arnaud*clamav.net>, France +
    • Matthew Olney <molney*sourcefire.com>, USA
      -Role: virus database maintainer +Role: development manager

      • -
    • Tomasz Kojm <tkojm*clamav.net>, Poland +
    • David Raynor <draynor*sourcefire.com>, USA
      -Role: project leader, coder +Role: ClamAV developer

      • -
    • Tomasz Papszun <tomek*clamav.net>, Poland +
    • Shawn Webb <swebb*sourcefire.com>, USA
      -Role: various help +Role: ClamAV developer

      • -
    • Sven Strickroth <sven*clamav.net>, Germany +
    • Carl Wu <cwu*sourcefire.com>, USA
      -Role: virus database maintainer, virus submission management +Role: ClamAV developer

      • -
    • Edwin Torok <edwin*clamav.net>, Romania +
    • Alain Zidouemba <azidouemba*sourcefire.com>, USA
      -Role: coder +Role: virus database maintainer

      • -
    • Trog <trog*clamav.net>, United Kingdom -
      -Role: coder - -
    + +


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node62.html clamav-0.97.8+dfsg/docs/html/node62.html --- clamav-0.97.7+dfsg/docs/html/node62.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node62.html 2013-04-17 15:25:09.000000000 +0000 @@ -7,8 +7,8 @@ Jens Lippmann, Marek Rouchal, Martin Wilck and others --> -About this document ... - +Emeritus Team + @@ -26,49 +26,102 @@
    next - up - previous - contents
    - Up: Up: clamdoc - Previous: Previous: Core Team -   Contents

    -About this document ... +Emeritus Team

    -

    -This document was generated using the -LaTeX2HTML translator Version 2008 (1.71) -

    -Copyright © 1993, 1994, 1995, 1996, -Nikos Drakos, -Computer Based Learning Unit, University of Leeds. -
    -Copyright © 1997, 1998, 1999, -Ross Moore, -Mathematics Department, Macquarie University, Sydney. + +

    + +

      +
    • aCaB <acab*clamav.net>, Italy +
      +Role: virus database maintainer, coder + +

      +

      • +
    • Mike Cathey <mike*clamav.net>, USA +
      +Role: co-sysadmin + +

      +

      • +
    • Diego d'Ambra <diego*clamav.net>, Denmark +
      +Role: virus database maintainer + +

      +

      • +
    • Luca Gibelli <luca*clamav.net>, Italy +
      +Role: sysadmin, mirror coordinator + +

      +

      • +
    • Nigel Horne <njh*clamav.net>, United Kingdom +
      +Role: coder + +

      +

      • +
    • Arnaud Jacques <arnaud*clamav.net>, France +
      +Role: virus database maintainer + +

      +

      • +
    • Tomasz Kojm <tkojm*clamav.net>, Poland +
      +Role: project leader, coder + +

      +

      • +
    • Tomasz Papszun <tomek*clamav.net>, Poland +
      +Role: various help + +

      +

      • +
    • Sven Strickroth <sven*clamav.net>, Germany +
      +Role: virus database maintainer, virus submission management +

      -The command line arguments were:
      - latex2html -local_icons clamdoc.tex +

      • +
    • Edwin Torok <edwin*clamav.net>, Romania +
      +Role: coder +

      -The translation was initiated by Tomasz Kojm on 2010-08-12 +

      • +
    • Trog <trog*clamav.net>, United Kingdom +
      +Role: coder + +
      • +

    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node7.html clamav-0.97.8+dfsg/docs/html/node7.html --- clamav-0.97.7+dfsg/docs/html/node7.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node7.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: UNIX - Up: Up: Base package - Previous: Previous: Base package -   Contents

    @@ -60,16 +60,15 @@ Subsections
    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node8.html clamav-0.97.8+dfsg/docs/html/node8.html --- clamav-0.97.7+dfsg/docs/html/node8.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node8.html 2013-04-17 15:25:09.000000000 +0000 @@ -27,26 +27,26 @@
    - next - up - previous - contents
    - Next: Next: Windows - Up: Up: Supported platforms - Previous: Previous: Supported platforms -   Contents

    @@ -76,8 +76,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/docs/html/node9.html clamav-0.97.8+dfsg/docs/html/node9.html --- clamav-0.97.7+dfsg/docs/html/node9.html 2013-03-11 15:21:45.000000000 +0000 +++ clamav-0.97.8+dfsg/docs/html/node9.html 2013-04-17 15:25:09.000000000 +0000 @@ -26,26 +26,26 @@
    - next - up - previous - contents
    - Next: Next: Binary packages - Up: Up: Supported platforms - Previous: Previous: UNIX -   Contents

    @@ -59,8 +59,7 @@


    -Tomasz Kojm -2010-08-12 +SourceFire 2013-04-16
    diff -Nru clamav-0.97.7+dfsg/etc/clamav-milter.conf.orig clamav-0.97.8+dfsg/etc/clamav-milter.conf.orig --- clamav-0.97.7+dfsg/etc/clamav-milter.conf.orig 2013-03-19 02:31:44.000000000 +0000 +++ clamav-0.97.8+dfsg/etc/clamav-milter.conf.orig 1970-01-01 00:00:00.000000000 +0000 @@ -1,274 +0,0 @@ -## -## Example config file for clamav-milter -## - -# Comment or remove the line below. -Example - - -## -## Main options -## - -# Define the interface through which we communicate with sendmail -# This option is mandatory! Possible formats are: -# [[unix|local]:]/path/to/file - to specify a unix domain socket -# inet:port@[hostname|ip-address] - to specify an ipv4 socket -# inet6:port@[hostname|ip-address] - to specify an ipv6 socket -# -# Default: no default -#MilterSocket /tmp/clamav-milter.socket -#MilterSocket inet:7357 - -# Define the group ownership for the (unix) milter socket. -# Default: disabled (the primary group of the user running clamd) -#MilterSocketGroup virusgroup - -# Sets the permissions on the (unix) milter socket to the specified mode. -# Default: disabled (obey umask) -#MilterSocketMode 660 - -# Remove stale socket after unclean shutdown. -# -# Default: yes -#FixStaleSocket yes - -# Run as another user (clamav-milter must be started by root for this option to work) -# -# Default: unset (don't drop privileges) -#User clamav - -# Initialize supplementary group access (clamav-milter must be started by root). -# -# Default: no -#AllowSupplementaryGroups no - -# Waiting for data from clamd will timeout after this time (seconds). -# Value of 0 disables the timeout. -# -# Default: 120 -#ReadTimeout 300 - -# Don't fork into background. -# -# Default: no -#Foreground yes - -# Chroot to the specified directory. -# Chrooting is performed just after reading the config file and before dropping privileges. -# -# Default: unset (don't chroot) -#Chroot /newroot - -# This option allows you to save a process identifier of the listening -# daemon (main thread). -# -# Default: disabled -#PidFile /var/run/clamav/clamav-milter.pid - -# Optional path to the global temporary directory. -# Default: system specific (usually /tmp or /var/tmp). -# -#TemporaryDirectory /var/tmp - -## -## Clamd options -## - -# Define the clamd socket to connect to for scanning. -# This option is mandatory! Syntax: -# ClamdSocket unix:path -# ClamdSocket tcp:host:port -# The first syntax specifies a local unix socket (needs an absolute path) e.g.: -# ClamdSocket unix:/var/run/clamd/clamd.socket -# The second syntax specifies a tcp local or remote tcp socket: the -# host can be a hostname or an ip address; the ":port" field is only required -# for IPv6 addresses, otherwise it defaults to 3310, e.g.: -# ClamdSocket tcp:192.168.0.1 -# -# This option can be repeated several times with different sockets or even -# with the same socket: clamd servers will be selected in a round-robin fashion. -# -# Default: no default -#ClamdSocket tcp:scanner.mydomain:7357 -ClamdSocket /var/run/clamav/clamd - - -## -## Exclusions -## - -# Messages originating from these hosts/networks will not be scanned -# This option takes a host(name)/mask pair in CIRD notation and can be -# repeated several times. If "/mask" is omitted, a host is assumed. -# To specify a locally orignated, non-smtp, email use the keyword "local" -# -# Default: unset (scan everything regardless of the origin) -#LocalNet local -#LocalNet 192.168.0.0/24 -#LocalNet 1111:2222:3333::/48 - -# This option specifies a file which contains a list of basic POSIX regular -# expressions. Addresses (sent to or from - see below) matching these regexes -# will not be scanned. Optionally each line can start with the string "From:" -# or "To:" (note: no whitespace after the colon) indicating if it is, -# respectively, the sender or recipient that is to be whitelisted. -# If the field is missing, "To:" is assumed. -# Lines starting with #, : or ! are ignored. -# -# Default unset (no exclusion applied) -#Whitelist /etc/whitelisted_addresses - -# Messages from authenticated SMTP users matching this extended POSIX -# regular expression (egrep-like) will not be scanned. -# As an alternative, a file containing a plain (not regex) list of names (one -# per line) can be specified using the prefix "file:". -# e.g. SkipAuthenticated file:/etc/good_guys -# -# Note: this is the AUTH login name! -# -# Default: unset (no whitelisting based on SMTP auth) -#SkipAuthenticated ^(tom|dick|henry)$ - -# Messages larger than this value won't be scanned. -# Make sure this value is lower or equal than StreamMaxLength in clamd.conf -# -# Default: 25M -#MaxFileSize 10M - - -## -## Actions -## - -# The following group of options controls the delievery process under -# different circumstances. -# The following actions are available: -# - Accept -# The message is accepted for delievery -# - Reject -# Immediately refuse delievery (a 5xx error is returned to the peer) -# - Defer -# Return a temporary failure message (4xx) to the peer -# - Blackhole (not available for OnFail) -# Like Accept but the message is sent to oblivion -# - Quarantine (not available for OnFail) -# Like Accept but message is quarantined instead of being delivered -# -# NOTE: In Sendmail the quarantine queue can be examined via mailq -qQ -# For Postfix this causes the message to be placed on hold -# -# Action to be performed on clean messages (mostly useful for testing) -# Default: Accept -#OnClean Accept - -# Action to be performed on infected messages -# Default: Quarantine -#OnInfected Quarantine - -# Action to be performed on error conditions (this includes failure to -# allocate data structures, no scanners available, network timeouts, -# unknown scanner replies and the like) -# Default: Defer -#OnFail Defer - -# This option allows to set a specific rejection reason for infected messages -# and it's therefore only useful together with "OnInfected Reject" -# The string "%v", if present, will be replaced with the virus name. -# Default: MTA specific -#RejectMsg - -# If this option is set to "Replace" (or "Yes"), an "X-Virus-Scanned" and an -# "X-Virus-Status" headers will be attached to each processed message, possibly -# replacing existing headers. -# If it is set to Add, the X-Virus headers are added possibly on top of the -# existing ones. -# Note that while "Replace" can potentially break DKIM signatures, "Add" may -# confuse procmail and similar filters. -# Default: no -#AddHeader Replace - -# When AddHeader is in use, this option allows to arbitrary set the reported -# hostname. This may be desirable in order to avoid leaking internal names. -# If unset the real machine name is used. -# Default: disabled -#ReportHostname my.mail.server.name - -# Execute a command (possibly searching PATH) when an infected message is found. -# The following parameters are passed to the invoked program in this order: -# virus name, queue id, sender, destination, subject, message id, message date. -# Note #1: this requires MTA macroes to be available (see LogInfected below) -# Note #2: the process is invoked in the context of clamav-milter -# Note #3: clamav-milter will wait for the process to exit. Be quick or fork to -# avoid unnecessary delays in email delievery -# Default: disabled -#VirusAction /usr/local/bin/my_infected_message_handler - -## -## Logging options -## - -# Uncomment this option to enable logging. -# LogFile must be writable for the user running daemon. -# A full path is required. -# -# Default: disabled -#LogFile /var/log/clamav/clamav-milter.log - -# By default the log file is locked for writing - the lock protects against -# running clamav-milter multiple times. -# This option disables log file locking. -# -# Default: no -#LogFileUnlock yes - -# Maximum size of the log file. -# Value of 0 disables the limit. -# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes) -# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size -# in bytes just don't use modifiers. -# -# Default: 1M -#LogFileMaxSize 2M - -# Log time with each message. -# -# Default: no -#LogTime yes - -# Use system logger (can work together with LogFile). -# -# Default: no -#LogSyslog yes - -# Specify the type of syslog messages - please refer to 'man syslog' -# for facility names. -# -# Default: LOG_LOCAL6 -#LogFacility LOG_MAIL - -# Enable verbose logging. -# -# Default: no -#LogVerbose yes - -# This option allows to tune what is logged when a message is infected. -# Possible values are Off (the default - nothing is logged), -# Basic (minimal info logged), Full (verbose info logged) -# Note: -# For this to work properly in sendmail, make sure the msg_id, mail_addr, -# rcpt_addr and i macroes are available in eom. In other words add a line like: -# Milter.macros.eom={msg_id}, {mail_addr}, {rcpt_addr}, i -# to your .cf file. Alternatively use the macro: -# define(`confMILTER_MACROS_EOM', `{msg_id}, {mail_addr}, {rcpt_addr}, i') -# Postfix should be working fine with the default settings. -# -# Default: disabled -#LogInfected Basic - -# This option allows to tune what is logged when no threat is found in a scanned message. -# See LogInfected for possible values and caveats. -# Useful in debugging but drastically increases the log size. -# Default: disabled -#LogClean Basic - diff -Nru clamav-0.97.7+dfsg/freshclam/manager.c clamav-0.97.8+dfsg/freshclam/manager.c --- clamav-0.97.7+dfsg/freshclam/manager.c 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/freshclam/manager.c 2013-04-17 15:25:09.000000000 +0000 @@ -662,6 +662,7 @@ "Host: stats.clamav.net\r\n%s%s%s%s" "Content-Type: application/x-www-form-urlencoded\r\n" "User-Agent: %s\r\n" + "Connection: Close\r\n" "Content-Length: %u\r\n\r\n" "%s", auth ? auth : "", hostid ? "X-HostID: " : "", hostid ? hostid : "", hostid ? "\r\n" : "", uastr, (unsigned int) strlen(query), query) < 0) diff -Nru clamav-0.97.7+dfsg/freshclam/nonblock.c clamav-0.97.8+dfsg/freshclam/nonblock.c --- clamav-0.97.7+dfsg/freshclam/nonblock.c 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/freshclam/nonblock.c 2013-04-17 15:25:09.000000000 +0000 @@ -182,6 +182,9 @@ struct timeval timeout; /* When we should time out */ int numfd; /* Highest fdset fd plus 1 */ + /* Zero buffer to maintain sanity in case we're dealing with strings */ + memset(buf, 0x00, len); + /* Calculate into 'timeout' when we should time out */ gettimeofday(&timeout, 0); timeout.tv_sec += secs; @@ -193,6 +196,7 @@ struct timeval now; struct timeval wait; int n; + ssize_t recvd; /* Force timeout if we ran out of time */ gettimeofday(&now, 0); @@ -217,8 +221,16 @@ break; /* failed */ } - if (n) { - return recv(sock, buf, len, flags); + if (FD_ISSET(sock, &fds)) { + recvd = recv(sock, buf, len, flags); + if (recvd < 0) { + if (errno == EAGAIN) + continue; + + return -1; + } + + return recvd; } /* Select returned, but there is no work to do... */ diff -Nru clamav-0.97.7+dfsg/libclamav/Makefile.am clamav-0.97.8+dfsg/libclamav/Makefile.am --- clamav-0.97.7+dfsg/libclamav/Makefile.am 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/Makefile.am 2013-04-17 15:25:09.000000000 +0000 @@ -71,6 +71,8 @@ libclamav_internal_utils_la_SOURCES=str.c\ str.h\ + iowrap.c \ + iowrap.h \ md5.c\ md5.h\ others_common.c \ @@ -92,6 +94,8 @@ libclamav_internal_utils_nothreads_la_SOURCES=str.c\ str.h\ + iowrap.c \ + iowrap.h \ md5.c\ md5.h\ others_common.c \ diff -Nru clamav-0.97.7+dfsg/libclamav/Makefile.in clamav-0.97.8+dfsg/libclamav/Makefile.in --- clamav-0.97.7+dfsg/libclamav/Makefile.in 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/Makefile.in 2013-04-17 15:25:09.000000000 +0000 @@ -221,6 +221,7 @@ libclamav_internal_utils_la_LIBADD = am_libclamav_internal_utils_la_OBJECTS = \ libclamav_internal_utils_la-str.lo \ + libclamav_internal_utils_la-iowrap.lo \ libclamav_internal_utils_la-md5.lo \ libclamav_internal_utils_la-others_common.lo \ libclamav_internal_utils_la-qsort.lo \ @@ -238,6 +239,7 @@ libclamav_internal_utils_nothreads_la_LIBADD = am_libclamav_internal_utils_nothreads_la_OBJECTS = \ libclamav_internal_utils_nothreads_la-str.lo \ + libclamav_internal_utils_nothreads_la-iowrap.lo \ libclamav_internal_utils_nothreads_la-md5.lo \ libclamav_internal_utils_nothreads_la-others_common.lo \ libclamav_internal_utils_nothreads_la-qsort.lo \ @@ -568,6 +570,8 @@ @ENABLE_UNRAR_TRUE@IFACEDEP = libclamunrar_iface.la libclamav_internal_utils_la_SOURCES = str.c\ str.h\ + iowrap.c \ + iowrap.h \ md5.c\ md5.h\ others_common.c \ @@ -588,6 +592,8 @@ libclamav_internal_utils_la_CFLAGS = -fPIC -DPIC libclamav_internal_utils_nothreads_la_SOURCES = str.c\ str.h\ + iowrap.c \ + iowrap.h \ md5.c\ md5.h\ others_common.c \ @@ -765,6 +771,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytecode_nojit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-iowrap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-md5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others_common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-qsort.Plo@am__quote@ @@ -774,6 +781,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-qsort.Plo@am__quote@ @@ -1752,6 +1760,14 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c +libclamav_internal_utils_la-iowrap.lo: iowrap.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-iowrap.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-iowrap.Tpo -c -o libclamav_internal_utils_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-iowrap.Tpo $(DEPDIR)/libclamav_internal_utils_la-iowrap.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='iowrap.c' object='libclamav_internal_utils_la-iowrap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c + libclamav_internal_utils_la-md5.lo: md5.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-md5.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-md5.Tpo -c -o libclamav_internal_utils_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-md5.Tpo $(DEPDIR)/libclamav_internal_utils_la-md5.Plo @@ -1824,6 +1840,14 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c +libclamav_internal_utils_nothreads_la-iowrap.lo: iowrap.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-iowrap.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Tpo -c -o libclamav_internal_utils_nothreads_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-iowrap.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='iowrap.c' object='libclamav_internal_utils_nothreads_la-iowrap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-iowrap.lo `test -f 'iowrap.c' || echo '$(srcdir)/'`iowrap.c + libclamav_internal_utils_nothreads_la-md5.lo: md5.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-md5.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Tpo -c -o libclamav_internal_utils_nothreads_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo diff -Nru clamav-0.97.7+dfsg/libclamav/autoit.c clamav-0.97.8+dfsg/libclamav/autoit.c --- clamav-0.97.7+dfsg/libclamav/autoit.c 2013-03-11 15:23:20.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/autoit.c 2013-04-17 15:25:09.000000000 +0000 @@ -339,14 +339,22 @@ * * - Fortuna audaces iuvat - */ - if (UNP.error) - cli_dbgmsg("autoit: decompression error - partial file may exist\n"); + if (UNP.error) { + cli_dbgmsg("autoit: decompression error after %u bytes - partial file may exist\n", UNP.cur_output); + UNP.usize = UNP.cur_output; + } } else { cli_dbgmsg("autoit: file is not compressed\n"); UNP.outputbuf = UNP.inputbuf; UNP.usize = UNP.csize; } + if (UNP.usize<4) { + cli_dbgmsg("autoit: file is too short\n"); + free(UNP.outputbuf); + continue; + } + files++; /* FIXME: REGRESSION NEEDED! */ @@ -638,8 +646,10 @@ } free(UNP.inputbuf); - if (UNP.error) - cli_dbgmsg("autoit: decompression error - partial file may exist\n"); + if (UNP.error) { + cli_dbgmsg("autoit: decompression error after %u bytes - partial file may exist\n", UNP.cur_output); + UNP.usize = UNP.cur_output; + } } else { cli_dbgmsg("autoit: file is not compressed\n"); UNP.outputbuf = UNP.inputbuf; diff -Nru clamav-0.97.7+dfsg/libclamav/cache.c clamav-0.97.8+dfsg/libclamav/cache.c --- clamav-0.97.7+dfsg/libclamav/cache.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/cache.c 2013-04-17 15:25:09.000000000 +0000 @@ -688,7 +688,8 @@ } /* Hashes a file onto the provided buffer and looks it up the cache. - Returns CL_VIRUS if found, CL_CLEAN if not FIXME or an error */ + Returns CL_VIRUS if found, CL_CLEAN if not FIXME or a recoverable error, + and returns CL_EREAD if unrecoverable */ int cache_check(unsigned char *hash, cli_ctx *ctx) { fmap_t *map; size_t todo, at = 0; @@ -709,7 +710,10 @@ return CL_EREAD; todo -= readme; at += readme; - cli_md5_update(&md5, buf, readme); + if (cli_md5_update(&md5, buf, readme)) { + cli_errmsg("cache_check: error reading while generating hash!\n"); + return CL_EREAD; + } } cli_md5_final(hash, &md5); ret = cache_lookup_hash(hash, map->len, ctx->engine->cache, ctx->recursion); diff -Nru clamav-0.97.7+dfsg/libclamav/cvd.c clamav-0.97.8+dfsg/libclamav/cvd.c --- clamav-0.97.7+dfsg/libclamav/cvd.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/cvd.c 2013-04-17 15:25:09.000000000 +0000 @@ -516,6 +516,11 @@ } md5 = cli_hashstream(fs, NULL, 1); + if (md5 == NULL) { + cli_dbgmsg("cli_cvdverify: Cannot generate hash, out of memory\n"); + cl_cvdfree(cvd); + return CL_EMEM; + } cli_dbgmsg("MD5(.tar.gz) = %s\n", md5); if(strncmp(md5, cvd->md5, 32)) { diff -Nru clamav-0.97.7+dfsg/libclamav/iowrap.c clamav-0.97.8+dfsg/libclamav/iowrap.c --- clamav-0.97.7+dfsg/libclamav/iowrap.c 1970-01-01 00:00:00.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/iowrap.c 2013-04-17 15:23:45.000000000 +0000 @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2012 Sourcefire, Inc. + * + * Authors: Dave Raynor + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + */ + +#include "iowrap.h" + +#include + +#ifdef _WIN32 +#include +#include + +#ifndef STATUS_DEVICE_DATA_ERROR +#define STATUS_DEVICE_DATA_ERROR 0xC000009C +#endif +#endif + +#ifdef _WIN32 +static int filter_memcpy(unsigned int code, struct _EXCEPTION_POINTERS *ep) { + if ((code == EXCEPTION_IN_PAGE_ERROR) || (code == STATUS_DEVICE_DATA_ERROR)) { + return EXCEPTION_EXECUTE_HANDLER; + } + return EXCEPTION_CONTINUE_SEARCH; +} +#endif + +int cli_memcpy(void *target, const void *source, unsigned long size) +{ + int ret = 0; + +#ifdef _WIN32 + __try { +#endif + memcpy(target, source, size); +#ifdef _WIN32 + } + __except (filter_memcpy(GetExceptionCode(), GetExceptionInformation())) { + ret = 1; + } +#endif + return ret; +} + diff -Nru clamav-0.97.7+dfsg/libclamav/iowrap.h clamav-0.97.8+dfsg/libclamav/iowrap.h --- clamav-0.97.7+dfsg/libclamav/iowrap.h 1970-01-01 00:00:00.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/iowrap.h 2013-04-17 15:23:45.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2012 Sourcefire, Inc. + * + * Authors: Dave Raynor + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#ifndef __IOWRAP_H +#define __IOWRAP_H + +#if HAVE_CONFIG_H +#include "clamav-config.h" +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif + +#include +#include +#ifdef _WIN32 +#include +#include +#endif + +/* + * cli_memcpy is an io wrapper that will allow ClamAV to minimize impact of + * adding SEH logic around map accesses where Windows might raise an error + */ +int cli_memcpy(void *target, const void *source, unsigned long size); + +#endif diff -Nru clamav-0.97.7+dfsg/libclamav/md5.c clamav-0.97.8+dfsg/libclamav/md5.c --- clamav-0.97.7+dfsg/libclamav/md5.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/md5.c 2013-04-17 15:23:45.000000000 +0000 @@ -13,11 +13,14 @@ * This implementation is meant to be fast, but not as fast as possible. * Some known optimizations are not included to reduce source code size * and avoid compile-time configuration. + * + * Updated in 2012 to meet the needs of ClamAV. */ #include #include "md5.h" +#include "iowrap.h" /* * The basic MD5 functions. @@ -49,16 +52,16 @@ */ #if defined(__i386__) || defined(__x86_64__) || defined(__vax__) #define SET(n) \ - (*(const MD5_u32plus *)&ptr[(n) * 4]) + (*(const MD5_u32plus *)&chunk[(n) * 4]) #define GET(n) \ SET(n) #else #define SET(n) \ (ctx->block[(n)] = \ - (MD5_u32plus)ptr[(n) * 4] | \ - ((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \ - ((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \ - ((MD5_u32plus)ptr[(n) * 4 + 3] << 24)) + (MD5_u32plus)chunk[(n) * 4] | \ + ((MD5_u32plus)chunk[(n) * 4 + 1] << 8) | \ + ((MD5_u32plus)chunk[(n) * 4 + 2] << 16) | \ + ((MD5_u32plus)chunk[(n) * 4 + 3] << 24)) #define GET(n) \ (ctx->block[(n)]) #endif @@ -66,12 +69,14 @@ /* * This processes one or more 64-byte data blocks, but does NOT update * the bit counters. There are no alignment requirements. + * Returns NULL on a read error, or a pointer to the next byte if successful. */ static const void *body(cli_md5_ctx *ctx, const void *data, unsigned long size) { const unsigned char *ptr; MD5_u32plus a, b, c, d; MD5_u32plus saved_a, saved_b, saved_c, saved_d; + unsigned char chunk[64]; ptr = data; @@ -86,6 +91,8 @@ saved_c = c; saved_d = d; + if(cli_memcpy(chunk, ptr, 64)) + return NULL; /* Round 1 */ STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7) STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12) @@ -185,10 +192,11 @@ ctx->hi = 0; } -void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size) +int cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size) { MD5_u32plus saved_lo; unsigned long used, free; + int invalid = 0; saved_lo = ctx->lo; if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) @@ -201,22 +209,27 @@ free = 64 - used; if (size < free) { - memcpy(&ctx->buffer[used], data, size); - return; + invalid = cli_memcpy(&ctx->buffer[used], data, size); + return invalid; } - memcpy(&ctx->buffer[used], data, free); + invalid = cli_memcpy(&ctx->buffer[used], data, free); + if (invalid) + return invalid; data = (const unsigned char *)data + free; size -= free; - body(ctx, ctx->buffer, 64); + if (body(ctx, ctx->buffer, 64) == NULL) + return 1; } if (size >= 64) { data = body(ctx, data, size & ~(unsigned long)0x3f); + if (data == NULL) + return 1; size &= 0x3f; } - memcpy(ctx->buffer, data, size); + return cli_memcpy(ctx->buffer, data, size); } void cli_md5_final(unsigned char *result, cli_md5_ctx *ctx) diff -Nru clamav-0.97.7+dfsg/libclamav/md5.h clamav-0.97.8+dfsg/libclamav/md5.h --- clamav-0.97.7+dfsg/libclamav/md5.h 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/md5.h 2013-04-17 15:23:45.000000000 +0000 @@ -5,6 +5,8 @@ * Written by Solar Designer in 2001, and placed * in the public domain. There's absolutely no warranty. * + * Updated in 2012 to meet the needs of ClamAV. + * * See md5.c for more information. */ @@ -22,7 +24,7 @@ } cli_md5_ctx; extern void cli_md5_init(cli_md5_ctx *ctx); -extern void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size); +extern int cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size); extern void cli_md5_final(unsigned char *result, cli_md5_ctx *ctx); #endif diff -Nru clamav-0.97.7+dfsg/libclamav/others.h clamav-0.97.8+dfsg/libclamav/others.h --- clamav-0.97.7+dfsg/libclamav/others.h 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/others.h 2013-04-17 15:25:09.000000000 +0000 @@ -53,7 +53,7 @@ * in re-enabling affected modules. */ -#define CL_FLEVEL 68 +#define CL_FLEVEL 69 #define CL_FLEVEL_DCONF CL_FLEVEL #define CL_FLEVEL_SIGTOOL CL_FLEVEL diff -Nru clamav-0.97.7+dfsg/libclamav/pdf.c clamav-0.97.8+dfsg/libclamav/pdf.c --- clamav-0.97.7+dfsg/libclamav/pdf.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/pdf.c 2013-04-17 15:25:09.000000000 +0000 @@ -296,6 +296,9 @@ case MANY_FILTERS: s = "more than 2 filters per obj"; break; + case DECRYPTABLE_PDF: + s = "decryptable PDF"; + break; } cli_dbgmsg("cli_pdf: %s flagged in object %u %u\n", s, obj->id>>8, obj->id&0xff); } @@ -567,6 +570,8 @@ char *ascii_decoded = NULL; int dump = 1; + cli_dbgmsg("pdf_extract_obj: obj %u %u\n", obj->id>>8, obj->id&0xff); + /* TODO: call bytecode hook here, allow override dumpability */ if ((!(obj->flags & (1 << OBJ_STREAM)) || (obj->flags & (1 << OBJ_HASFILTERS))) @@ -585,7 +590,7 @@ } if (!dump) return CL_CLEAN; - cli_dbgmsg("cli_pdf: dumping obj %u %u\n", obj->id>>8, obj->id); + cli_dbgmsg("cli_pdf: dumping obj %u %u\n", obj->id>>8, obj->id&0xff); snprintf(fullname, sizeof(fullname), "%s"PATHSEP"pdf%02u", pdf->dir, pdf->files++); fout = open(fullname,O_RDWR|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600); if (fout < 0) { @@ -907,6 +912,7 @@ q2 = pdf_nextobject(q, bytesleft); bytesleft -= q2 -q; if (!q2 || bytesleft < 0) { + cli_dbgmsg("cli_pdf: %u %u obj: no dictionary\n", obj->id>>8, obj->id&0xff); return; } q3 = memchr(q-1, '<', q2-q+1); @@ -922,6 +928,7 @@ q2 = pdf_nextobject(q, bytesleft); bytesleft -= q2 -q; if (!q2 || bytesleft < 0) { + cli_dbgmsg("cli_pdf: %u %u obj: broken dictionary\n", obj->id>>8, obj->id&0xff); return; } q3 = memchr(q-1, '>', q2-q+1); @@ -1262,7 +1269,7 @@ password_empty = 1; /* Algorithm 3.2a could be used to recover encryption key */ } - } else { + } else if ((R >= 2) && (R <= 4)) { /* 7.6.3.3 Algorithm 2 */ cli_md5_init(&md5); /* empty password, password == padding */ @@ -1276,9 +1283,9 @@ cli_md5_update(&md5, &v, 4); } cli_md5_final(result, &md5); + if (length > 128) + length = 128; if (R >= 3) { - if (length > 128) - length = 128; for (i=0;i<50;i++) { cli_md5_init(&md5); cli_md5_update(&md5, result, length/8); @@ -1329,6 +1336,11 @@ cli_dbgmsg("cli_pdf: invalid revision %d\n", R); } } + else { + /* Supported R is in {2,3,4,5} */ + cli_dbgmsg("cli_pdf: R value out of range\n"); + return; + } if (password_empty) { cli_dbgmsg("cli_pdf: user password is empty\n"); /* The key we computed above is the key used to encrypt the streams. @@ -1395,6 +1407,10 @@ cli_dbgmsg("cli_pdf: invalid R\n"); break; } + if ((R > 5) || (R < 2)) { + cli_dbgmsg("cli_pdf: R value outside supported range [2..5]\n"); + break; + } if (R < 5) oulen = 32; diff -Nru clamav-0.97.7+dfsg/libclamav/pe.c clamav-0.97.8+dfsg/libclamav/pe.c --- clamav-0.97.7+dfsg/libclamav/pe.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/pe.c 2013-04-17 15:25:09.000000000 +0000 @@ -406,6 +406,10 @@ cli_md5_init(&md5); cli_md5_update(&md5, hashme, s->rsz); cli_md5_final(digest, &md5); + cli_dbgmsg("MDB: %u:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + s->rsz, digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], + digest[7], digest[8], digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], + digest[15]); return 1; } @@ -850,13 +854,13 @@ cli_dbgmsg("------------------------------------\n"); if (DETECT_BROKEN_PE && !native && (!(pe_plus?EC32(optional_hdr64.SectionAlignment):EC32(optional_hdr32.SectionAlignment)) || (pe_plus?EC32(optional_hdr64.SectionAlignment):EC32(optional_hdr32.SectionAlignment))%0x1000)) { - cli_dbgmsg("Bad virtual alignemnt\n"); + cli_dbgmsg("Bad virtual alignment\n"); cli_append_virus(ctx,"Heuristics.Broken.Executable"); return CL_VIRUS; } if (DETECT_BROKEN_PE && !native && (!(pe_plus?EC32(optional_hdr64.FileAlignment):EC32(optional_hdr32.FileAlignment)) || (pe_plus?EC32(optional_hdr64.FileAlignment):EC32(optional_hdr32.FileAlignment))%0x200)) { - cli_dbgmsg("Bad file alignemnt\n"); + cli_dbgmsg("Bad file alignment\n"); cli_append_virus(ctx, "Heuristics.Broken.Executable"); return CL_VIRUS; } @@ -950,10 +954,9 @@ if(exe_sections[i].chr & 0x80000000) cli_dbgmsg("Section's memory is writeable\n"); - cli_dbgmsg("------------------------------------\n"); - if (DETECT_BROKEN_PE && (!valign || (exe_sections[i].urva % valign))) { /* Bad virtual alignment */ cli_dbgmsg("VirtualAddress is misaligned\n"); + cli_dbgmsg("------------------------------------\n"); cli_append_virus(ctx, "Heuristics.Broken.Executable"); free(section_hdr); free(exe_sections); @@ -963,6 +966,7 @@ if (exe_sections[i].rsz) { /* Don't bother with virtual only sections */ if (exe_sections[i].raw >= fsize) { /* really broken */ cli_dbgmsg("Broken PE file - Section %d starts beyond the end of file (Offset@ %lu, Total filesize %lu)\n", i, (unsigned long)exe_sections[i].raw, (unsigned long)fsize); + cli_dbgmsg("------------------------------------\n"); free(section_hdr); free(exe_sections); if(DETECT_BROKEN_PE) { @@ -984,6 +988,7 @@ cli_append_virus(ctx, virname); if(cli_hm_scan(md5_dig, fsize, NULL, ctx->engine->hm_fp, CLI_HASH_MD5) != CL_VIRUS) { if (!SCAN_ALL) { + cli_dbgmsg("------------------------------------\n"); free(section_hdr); free(exe_sections); return CL_VIRUS; @@ -995,6 +1000,8 @@ } + cli_dbgmsg("------------------------------------\n"); + if (exe_sections[i].urva>>31 || exe_sections[i].uvsz>>31 || (exe_sections[i].rsz && exe_sections[i].uraw>>31) || exe_sections[i].ursz>>31) { cli_dbgmsg("Found PE values with sign bit set\n"); free(section_hdr); @@ -1861,13 +1868,21 @@ if(epbuff[1] != '\xbe' || skew <= 0 || skew > 0xfff) { /* FIXME: legit skews?? */ skew = 0; - if(upxfn(src, ssize, dest, &dsize, exe_sections[i].rva, exe_sections[i + 1].rva, vep) >= 0) - upx_success = 1; - - } else { + } + else if(skew > ssize) { + /* Ignore suggested skew larger than section size */ + cli_dbgmsg("UPX: Ignoring bad skew of %d bytes\n", skew); + skew = 0; + } + else { cli_dbgmsg("UPX: UPX1 seems skewed by %d bytes\n", skew); - if(upxfn(src + skew, ssize - skew, dest, &dsize, exe_sections[i].rva, exe_sections[i + 1].rva, vep-skew) >= 0 || upxfn(src, ssize, dest, &dsize, exe_sections[i].rva, exe_sections[i + 1].rva, vep) >= 0) - upx_success = 1; + } + + if(upxfn(src + skew, ssize - skew, dest, &dsize, exe_sections[i].rva, exe_sections[i + 1].rva, vep-skew) >= 0 || upxfn(src, ssize, dest, &dsize, exe_sections[i].rva, exe_sections[i + 1].rva, vep) >= 0) { + upx_success = 1; + } + else if(skew && (upxfn(src, ssize, dest, &dsize, exe_sections[i].rva, exe_sections[i + 1].rva, vep) >= 0)) { + upx_success = 1; } if(upx_success) diff -Nru clamav-0.97.7+dfsg/libclamav/pe_icons.c clamav-0.97.8+dfsg/libclamav/pe_icons.c --- clamav-0.97.7+dfsg/libclamav/pe_icons.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/pe_icons.c 2013-04-17 15:25:09.000000000 +0000 @@ -38,6 +38,8 @@ #define LABDIFF(x) labdiff2(x) #endif +/* #define LOGPARSEICONDETAILS */ + struct GICONS { unsigned int cnt; uint32_t lastg; @@ -1498,6 +1500,7 @@ } else confidence = (color + (gray + bright + noedge)*2/3 + dark + edge + colors) / 6; +#ifdef LOGPARSEICONDETAILS cli_dbgmsg("parseicon: edge confidence: %u%%\n", edge); cli_dbgmsg("parseicon: noedge confidence: %u%%\n", noedge); if(!bwmatch) { @@ -1508,6 +1511,7 @@ cli_dbgmsg("parseicon: dark confidence: %u%%\n", dark); if(!bwmatch) cli_dbgmsg("parseicon: spread confidence: red %u%%, green %u%%, blue %u%% - colors %u%%\n", reds, greens, blues, ccount); +#endif if(confidence >= positivematch) { cli_dbgmsg("confidence: %u\n", confidence); diff -Nru clamav-0.97.7+dfsg/libclamav/sis.c clamav-0.97.8+dfsg/libclamav/sis.c --- clamav-0.97.7+dfsg/libclamav/sis.c 2013-03-11 15:23:21.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/sis.c 2013-04-17 15:25:09.000000000 +0000 @@ -193,7 +193,7 @@ if (!len) return NULL; if (len>400) len=400; - name = cli_malloc(len); + name = cli_malloc(len+1); if (!name) { cli_dbgmsg("SIS: OOM\n"); return NULL; diff -Nru clamav-0.97.7+dfsg/libclamav/version.h clamav-0.97.8+dfsg/libclamav/version.h --- clamav-0.97.7+dfsg/libclamav/version.h 2013-03-11 16:02:27.000000000 +0000 +++ clamav-0.97.8+dfsg/libclamav/version.h 2013-04-17 20:10:44.000000000 +0000 @@ -1 +1 @@ -#define REPO_VERSION "devel-clamav-0.97.7" +#define REPO_VERSION "devel-clamav-0.97.8"