[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6589-g162c5dd
Michael Tautschnig
mt at debian.org
Mon Sep 20 17:11:07 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 501e0b8c2cd7542c6d09a9d9d7e52a1102f4f6a7
Merge: 9a4c8806e03c5e3659cd09a61eb5a11e83ca07d1 358e8e3144115aa0aab7f2722cc77193460b89ee
Author: Michael Tautschnig <mt at debian.org>
Date: Mon Sep 20 18:36:52 2010 +0200
Merge commit 'clamav-0.96.3' into debian/unstable
Conflicts:
ChangeLog
Makefile.am
Makefile.in
NEWS
README
clamconf/clamconf.c
configure
configure.in
docs/clamdoc.pdf
docs/clamdoc.tex
docs/html/clamdoc.html
docs/html/index.html
docs/html/node3.html
freshclam/freshclam.c
libclamav/bytecode.c
libclamav/bytecode_api.c
libclamav/bytecode_api.h
libclamav/bytecode_detect.c
libclamav/c++/ClamBCRTChecks.cpp
libclamav/c++/bytecode2llvm.cpp
libclamav/c++/detect.cpp
libclamav/clamav.h
libclamav/execs.h
libclamav/matcher-ac.c
libclamav/matcher.c
libclamav/others.h
libclamav/pdf.c
libclamav/pe.c
libclamav/readdb.c
libclamav/scanners.c
libclamunrar/unrar.c
sigtool/sigtool.c
unit_tests/check_common.sh
win32/.gitignore
win32/3rdparty/zlib/ChangeLog
win32/3rdparty/zlib/FAQ
win32/3rdparty/zlib/INDEX
win32/3rdparty/zlib/Makefile.in
win32/3rdparty/zlib/README
win32/3rdparty/zlib/adler32.c
win32/3rdparty/zlib/amiga/Makefile.pup
win32/3rdparty/zlib/amiga/Makefile.sas
win32/3rdparty/zlib/compress.c
win32/3rdparty/zlib/configure
win32/3rdparty/zlib/contrib/README.contrib
win32/3rdparty/zlib/contrib/asm686/README.686
win32/3rdparty/zlib/contrib/asm686/match.S
win32/3rdparty/zlib/contrib/delphi/ZLib.pas
win32/3rdparty/zlib/contrib/delphi/zlibd32.mak
win32/3rdparty/zlib/contrib/dotzlib/DotZLib.build
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/Deflater.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/Inflater.cs
win32/3rdparty/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
win32/3rdparty/zlib/contrib/dotzlib/readme.txt
win32/3rdparty/zlib/contrib/infback9/infback9.c
win32/3rdparty/zlib/contrib/infback9/inftree9.c
win32/3rdparty/zlib/contrib/infback9/inftree9.h
win32/3rdparty/zlib/contrib/inflate86/inffas86.c
win32/3rdparty/zlib/contrib/masmx64/gvmat64.asm
win32/3rdparty/zlib/contrib/masmx64/inffas8664.c
win32/3rdparty/zlib/contrib/masmx64/inffasx64.asm
win32/3rdparty/zlib/contrib/masmx64/readme.txt
win32/3rdparty/zlib/contrib/masmx86/bld_ml32.bat
win32/3rdparty/zlib/contrib/masmx86/inffas32.asm
win32/3rdparty/zlib/contrib/masmx86/readme.txt
win32/3rdparty/zlib/contrib/minizip/crypt.h
win32/3rdparty/zlib/contrib/minizip/ioapi.c
win32/3rdparty/zlib/contrib/minizip/ioapi.h
win32/3rdparty/zlib/contrib/minizip/iowin32.c
win32/3rdparty/zlib/contrib/minizip/iowin32.h
win32/3rdparty/zlib/contrib/minizip/miniunz.c
win32/3rdparty/zlib/contrib/minizip/minizip.c
win32/3rdparty/zlib/contrib/minizip/mztools.c
win32/3rdparty/zlib/contrib/minizip/mztools.h
win32/3rdparty/zlib/contrib/minizip/unzip.c
win32/3rdparty/zlib/contrib/minizip/unzip.h
win32/3rdparty/zlib/contrib/minizip/zip.c
win32/3rdparty/zlib/contrib/minizip/zip.h
win32/3rdparty/zlib/contrib/pascal/zlibd32.mak
win32/3rdparty/zlib/contrib/pascal/zlibpas.pas
win32/3rdparty/zlib/contrib/puff/puff.c
win32/3rdparty/zlib/contrib/puff/puff.h
win32/3rdparty/zlib/contrib/testzlib/testzlib.c
win32/3rdparty/zlib/contrib/vstudio/readme.txt
win32/3rdparty/zlib/contrib/vstudio/vc10/zlib.rc
win32/3rdparty/zlib/contrib/vstudio/vc10/zlibvc.def
win32/3rdparty/zlib/contrib/vstudio/vc9/miniunz.vcproj
win32/3rdparty/zlib/contrib/vstudio/vc9/minizip.vcproj
win32/3rdparty/zlib/contrib/vstudio/vc9/testzlib.vcproj
win32/3rdparty/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
win32/3rdparty/zlib/contrib/vstudio/vc9/zlib.rc
win32/3rdparty/zlib/contrib/vstudio/vc9/zlibstat.vcproj
win32/3rdparty/zlib/contrib/vstudio/vc9/zlibvc.def
win32/3rdparty/zlib/contrib/vstudio/vc9/zlibvc.sln
win32/3rdparty/zlib/contrib/vstudio/vc9/zlibvc.vcproj
win32/3rdparty/zlib/crc32.c
win32/3rdparty/zlib/deflate.c
win32/3rdparty/zlib/deflate.h
win32/3rdparty/zlib/doc/algorithm.txt
win32/3rdparty/zlib/example.c
win32/3rdparty/zlib/examples/README.examples
win32/3rdparty/zlib/examples/gun.c
win32/3rdparty/zlib/examples/gzlog.c
win32/3rdparty/zlib/examples/gzlog.h
win32/3rdparty/zlib/examples/zlib_how.html
win32/3rdparty/zlib/examples/zpipe.c
win32/3rdparty/zlib/examples/zran.c
win32/3rdparty/zlib/infback.c
win32/3rdparty/zlib/inffast.c
win32/3rdparty/zlib/inffast.h
win32/3rdparty/zlib/inflate.c
win32/3rdparty/zlib/inflate.h
win32/3rdparty/zlib/inftrees.c
win32/3rdparty/zlib/inftrees.h
win32/3rdparty/zlib/make_vms.com
win32/3rdparty/zlib/minigzip.c
win32/3rdparty/zlib/msdos/Makefile.bor
win32/3rdparty/zlib/msdos/Makefile.dj2
win32/3rdparty/zlib/msdos/Makefile.emx
win32/3rdparty/zlib/msdos/Makefile.msc
win32/3rdparty/zlib/msdos/Makefile.tc
win32/3rdparty/zlib/old/as400/bndsrc
win32/3rdparty/zlib/old/as400/compile.clp
win32/3rdparty/zlib/old/as400/readme.txt
win32/3rdparty/zlib/old/as400/zlib.inc
win32/3rdparty/zlib/old/visualc6/README.txt
win32/3rdparty/zlib/old/visualc6/example.dsp
win32/3rdparty/zlib/old/visualc6/minigzip.dsp
win32/3rdparty/zlib/old/visualc6/zlib.dsp
win32/3rdparty/zlib/old/visualc6/zlib.dsw
win32/3rdparty/zlib/qnx/package.qpg
win32/3rdparty/zlib/trees.c
win32/3rdparty/zlib/trees.h
win32/3rdparty/zlib/uncompr.c
win32/3rdparty/zlib/win32/DLL_FAQ.txt
win32/3rdparty/zlib/win32/Makefile.bor
win32/3rdparty/zlib/win32/Makefile.emx
win32/3rdparty/zlib/win32/Makefile.gcc
win32/3rdparty/zlib/win32/Makefile.msc
win32/3rdparty/zlib/win32/zlib.def
win32/3rdparty/zlib/win32/zlib1.rc
win32/3rdparty/zlib/zconf.h
win32/3rdparty/zlib/zconf.h.in
win32/3rdparty/zlib/zlib.3
win32/3rdparty/zlib/zlib.h
win32/3rdparty/zlib/zutil.c
win32/3rdparty/zlib/zutil.h
win32/ClamAV.sln
win32/README
win32/clamav-config.h
win32/compat/net.c
win32/libclamav.def
win32/llvmbuild/include/llvm/Config/config.h
win32/platform.h
win32/res/common.rc
win32/target.h
win32/update-win32.pl
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --combined unit_tests/check_common.sh
index b9024d6,0c7d209..46517a5
--- a/unit_tests/check_common.sh
+++ b/unit_tests/check_common.sh
@@@ -47,8 -47,8 +47,8 @@@ die(
# Setup test directory to avoid temporary and output file clashes
test_start() {
- ulimit -t 120; ulimit -d 512000;
- ulimit -v 512000 || true;
+ ulimit -t 120; ulimit -d 524288;
+ ulimit -v 600000 || true;
(cd test-$1 2>/dev/null && killclamd || true)
rm -rf test-$1
mkdir test-$1
@@@ -194,6 -194,20 +194,20 @@@ EO
if test "x$NINFECTED" != x4; then
scan_failed clamscan4.log "clamscan has detected spurious icons or whitlisting was not applier properly"
fi
+
+ cat <<EOF >test-db/test.ldb
+ Clam-VI-Test:Target;Engine:52-255,Target:1;(0&1);VI:43006f006d00700061006e0079004e0061006d0065000000000063006f006d00700061006e007900;VI:500072006f0064007500630074004e0061006d0065000000000063006c0061006d00
+ EOF
+ if test_run 1 $CLAMSCAN --quiet -dtest-db/test.ldb $TESTFILES --log=clamscan5.log; then
+ scan_failed clamscan5.log "clamscan didn't detect VI correctly"
+ fi
+ grep "clam_ISmsi_ext.exe: Clam-VI-Test:Target.UNOFFICIAL FOUND" clamscan5.log || die "VI-test1 failed"
+ grep "clam_ISmsi_int.exe: Clam-VI-Test:Target.UNOFFICIAL FOUND" clamscan5.log || die "VI-test2 failed"
+ NINFECTED=`grep "Infected files" clamscan5.log | cut -f2 -d: | sed -e 's/ //g'`
+ if test "x$NINFECTED" != x2; then
+ scan_failed clamscan4.log "clamscan has detected spurious VI's"
+ fi
+
test_end $1
}
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list