[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6232-g7a3768e
Michael Tautschnig
mt at debian.org
Tue Sep 7 11:17:25 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 9c8e89b1dbf4d721ae82c609dd54330f40d5d305
Author: Michael Tautschnig <mt at debian.org>
Date: Tue Sep 7 12:33:00 2010 +0200
Merged changes from upstream tarball
- Updated database file
- Several files got removed
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --git a/ChangeLog b/ChangeLog
index 9e11328..cef7f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -556,294 +556,6 @@ Fri Apr 2 13:07:50 EEST 2010 (edwin)
-------------------------------------
* unit_tests: Fix matchwithread.cbc
-Wed May 19 14:54:41 CEST 2010 (tk)
-----------------------------------
- * V 0.96.1
-
-Wed May 19 12:21:02 CEST 2010 (acab)
-------------------------------------
- * libclamav/7z/Archive/7z/7zIn.c: fix possible(?) null dereference reported
- by clang (bb#1909)
-
-Wed May 19 12:19:27 CEST 2010 (acab)
-------------------------------------
- * libclamav/pe_icons.c: properly round down when scaling (bb#2031)
-
-Wed May 19 13:15:06 EEST 2010 (edwin)
--------------------------------------
- * libclamav/pdf.c: bb #2016
-
-Wed May 19 00:03:19 CEST 2010 (tk)
-----------------------------------
- * libclamav/readdb.c: properly reject .info files passed on cmdline (bb#2025)
-
-Tue May 18 23:35:43 CEST 2010 (tk)
-----------------------------------
- * libclamav/matcher-bm.c: fix offset check (bb#2032)
-
-Tue May 18 20:20:15 EEST 2010 (edwin)
--------------------------------------
- * libclamav/fmap.c: fix bug introduced in clamav-0.96-51-g3e3b587.
-
-Mon May 17 19:03:51 CEST 2010 (acab)
-------------------------------------
- * libclamav/pe.c: properly resume stringtable loop (bb#2027)
- Note: 0.96 is NOT affected as the min VI sig has got FL=53
- 3rd parties must avoid VI sigs with FL=51
-
-Fri May 14 17:16:19 EEST 2010 (edwin)
--------------------------------------
- * unit_tests: add bytecode.cvd load test
-
-Wed May 12 19:10:39 CEST 2010 (acab)
-------------------------------------
- * docs/man: add clamav.milter.conf.5
-
-Mon May 10 14:11:51 CEST 2010 (acab)
-------------------------------------
- * win32: simulate gai_strerror
-
-Mon May 10 03:43:43 CEST 2010 (acab)
-------------------------------------
- * libclamav: Use mpool in win32 (well, sort of) as the mighty crt allocator
- chokes when loading about one milion signatures
-
-Sat May 8 00:18:13 CEST 2010 (acab)
-------------------------------------
- * libclamav/fmap.c: make oof need stfu (bb#2000)
-
-Fri May 14 11:28:52 EEST 2010 (edwin)
--------------------------------------
- * libclamav/bytecode.c: handle global gep parameter correctly (bb #1955)
-
-Thu May 13 23:40:11 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/llvm: Update to LLVM 2.7 release.
-
-Thu May 13 23:35:55 EEST 2010 (edwin)
--------------------------------------
- * libclamav/bytecode*, unit_tests: add new unit tests for bytecode API and fix bugs.
-
-Thu May 13 12:41:24 EEST 2010 (edwin)
-------------------------------------
- * libclamav/c++: Relax bounds checks. Was rejecting correct code.
-
-Tue May 11 21:33:49 EEST 2010 (edwin)
--------------------------------------
- * libclamav/filtering.c: fix handling of alternates and negated alternates (bb #2004)
-
-Tue May 11 15:31:40 EEST 2010 (edwin)
--------------------------------------
- * libclamav/readdb.c: read the entire .cbc files, fix loading of bytecode.cvd
-
-Wed May 12 14:21:23 CEST 2010 (tk)
-----------------------------------
- * freshclam: fix handling of temporary files
-
-Tue May 11 22:44:06 CEST 2010 (tk)
-----------------------------------
- * freshclam: add new option TestDatabases
-
-Mon May 10 17:00:16 CEST 2010 (tk)
-----------------------------------
- * tools: make sure the libclamav version is high enough (bb#2013)
-
-Mon May 10 14:51:24 CEST 2010 (tk)
-----------------------------------
- * sigtool/sigtool.c: fix error msg (bb#2002)
-
-Fri May 7 21:12:35 CEST 2010 (tk)
-----------------------------------
- * clamdscan: respect ExcludePath in --fdpass mode (bb#1923)
-
-Fri Apr 9 17:01:07 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/llvm/test: Fix make check failure on x86-32 (bb #1942)
-
-Fri May 7 21:12:35 CEST 2010 (tk)
-----------------------------------
- * clamdscan: respect ExcludePath in --fdpass mode (bb#1923)
-
-Fri May 7 15:45:55 CEST 2010 (tk)
-----------------------------------
- * libclamav/readdb.c: add checks to enforce lsig compatibility with 0.95.x (bb#2008)
-
-Fri May 7 16:30:50 EEST 2010 (edwin)
--------------------------------------
- * clamscan/manager.c: don't closedir(NULL) (bb #2010)
-
-Fri May 7 13:06:48 EEST 2010 (edwin)
--------------------------------------
- * configure: darwin* IS thread safe (bb #1534)
-
-Fri May 7 10:48:48 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/configure: add check that correct libstdc++ version is used (bb #1971)
-
-Fri May 7 10:07:24 EEST 2010 (edwin)
--------------------------------------
- * libclamav/cache.c: support building without pthreads (bb #1897).
-
-Fri May 7 09:56:57 EEST 2010 (edwin)
--------------------------------------
- * libclamav/bytecode*: add match_offsets support.
-
-Wed May 5 21:28:04 CEST 2010 (tk)
-----------------------------------
- * shared/output.c: workaround FreeBSD's file locking issue (bb#1918)
-
-Wed May 5 14:12:46 CEST 2010 (tk)
-----------------------------------
- * freshclam/notify.c: fix warning message (bb#1972)
- Thanks to Gianluigi Tiesi
-
-Tue May 4 21:58:19 CEST 2010 (tk)
-----------------------------------
- * libclamav: make lsigs working in cli_scanscript() (bb#1998)
-
-Tue May 4 19:37:58 CEST 2010 (acab)
-------------------------------------
- * libclamav/fmap.c: nicely handle EINTR
-
-Tue May 4 18:47:31 CEST 2010 (acab)
-------------------------------------
- * libclamav: no ERROR on void mapping (bb#1968)
-
-Tue May 4 16:47:57 CEST 2010 (tk)
-----------------------------------
- * libclamav/matcher-ac.c: fix counting of subsig matches (bb#2001)
-
-Sun May 2 19:13:29 CEST 2010 (acab)
-------------------------------------
- * clamav-milter: add VirusAction (bb#1867)
-
-Sat May 1 02:05:17 CEST 2010 (acab)
-------------------------------------
- * m4: On solaris 8 bzlib.h uses FILE without including stdio.h (bb#1985)
-
-Fri Apr 30 12:45:47 CEST 2010 (tk)
-----------------------------------
- * clamconf: warn about dbdir mismatch in clamd and freshclam (bb#1978)
-
-Thu Apr 29 09:49:10 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/configure: Mac OS X doesn't have -pthread (bb #1995)
-
-Thu Apr 29 09:45:29 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/llvm/include/llvm/ADT/SmallVector.h: Fix crash with -ftree-vectorize/-O3(bb #1984).
-
-Tue Apr 27 16:34:38 CEST 2010 (tk)
-----------------------------------
- * libclamav: fix some limit settings (bb#1973)
-
-Mon Apr 26 18:18:47 EEST 2010 (edwin)
--------------------------------------
- * bytecode: min/max functionality level support.
-
-Mon Apr 26 16:12:50 CEST 2010 (tk)
-----------------------------------
- * libclamav/others.c: bump f-level
-
-Mon Apr 26 16:06:56 CEST 2010 (tk)
-----------------------------------
- * libclamav/matcher-ac.c: fix handling of VI/MACRO special offsets (bb#1957)
-
-Fri Apr 23 21:38:19 EEST 2010 (edwin)
--------------------------------------
- * configure: fix Apple-style universal build (bb #1988).
-
-Thu Apr 22 22:34:52 CEST 2010 (acab)
-------------------------------------
- * libclamav/fmap.c: downgrade warning when the kernel doesn't want a map back
-
-Thu Apr 22 18:03:30 CEST 2010 (tk)
-----------------------------------
- * libclamav: avoid loading duplicate databases (bb#1962)
-
-Mon Apr 19 17:12:06 EEST 2010 (edwin)
--------------------------------------
- * clamconf: print information about platform and build.
-
-Thu Apr 15 20:04:16 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/configure: disable gcc 3.4.6 by default, you can still use it with --enable-llvm (bb #1935).
-
-Thu Apr 15 16:27:00 CEST 2010 (tk)
-----------------------------------
- * docs/man/freshclam.conf.5.in: document LogFileMaxSize (bb#1960)
-
-Wed Apr 14 21:44:18 CEST 2010 (tk)
-----------------------------------
- * freshclam/manager.c: add support for X-HostID to allow custom UserAgent
- strings in --submit-stats (bb#1905)
- Thanks to Andreas Schulze
-
-Wed Apr 14 21:14:28 EEST 2010 (edwin)
--------------------------------------
- * libclamav/bytecode.c: fix cli_unlink warnings (bb #1956).
-
-Tue Apr 13 16:17:35 EEST 2010 (edwin)
--------------------------------------
- * clambc, clamd,clamdtop,libclamav,unit_tests: fix compiler warnings (bb #1872,
- bb #1934, bb #1935)
-
-Tue Apr 13 16:13:05 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++: allow building with gcc 3.4.6 (bb #1934).
-
-Tue Apr 13 13:12:47 EEST 2010 (edwin)
--------------------------------------
- * unit_tests/check_common.sh: fix make check on AIX (bb #1917).
-
-Mon Apr 12 18:02:06 CEST 2010 (tk)
-----------------------------------
- * freshclam/manager.c: better handle daylight saving time changes (bb#1920)
-
-Sat Apr 10 16:36:11 CEST 2010 (acab)
-------------------------------------
- * libclamav/pe.c: more relaxed vinfo parser - try to mimic winxp's
-
-Wed Apr 7 16:27:42 CEST 2010 (tk)
-----------------------------------
- * sigtool: handle .idb files
-
-Wed Apr 7 12:42:19 CEST 2010 (tk)
-----------------------------------
- * libclamav/matcher.c: return proper virus name in icon detector (bb#1933)
-
-Mon Apr 5 22:41:40 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/bytecode2llvm.cpp: Fix load of multiple unsigned bytecodes (bb #1924)
-
-Sat Apr 3 21:05:35 EEST 2010 (edwin)
--------------------------------------
- * contrib/split-tarball.sh: update to work with 0.96
-
-Sat Apr 3 20:30:39 EEST 2010 (edwin)
--------------------------------------
- * libclamav/Makefile.{am,in}: Fix unit test failure with non-English locale (bb #1922)
-
-Fri Apr 2 16:22:26 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/llvm/lib/Support/Allocator.cpp: Fix SpecificBumpPtrAllocator
- destructor iteration. Thanks to Nicolas Capens.
-
-Fri Apr 2 16:19:26 EEST 2010 (edwin)
--------------------------------------
- * libclamav/c++/llvm/lib/ExecutionEngine/JIT/JIT.cpp:
- Fix the previous PowerPC workaround to not crash when not using the JIT.
-
-Fri Apr 2 13:09:54 EEST 2010 (edwin)
-------------------------------------
- * libclamav/c++/{bytecode2llvm.cpp,llvm/lib/ExecutionEngine/JIT/JIT.cpp,
- llvm/lib/Target/PowerPC/PPCISelLowering.cpp}: Workaround LLVM JIT PowerPC relocation bug (bb #1921).
- Based on Gary Benson's workaround for OpenJDK Shark / IcedTea.
-
-Fri Apr 2 13:07:50 EEST 2010 (edwin)
--------------------------------------
- * unit_tests: Fix matchwithread.cbc
-
Wed Mar 31 19:30:59 CEST 2010 (tk)
----------------------------------
* V 0.96
diff --git a/README b/README
index 7677151..505b744 100644
--- a/README
+++ b/README
@@ -1547,7 +1547,7 @@ Noteworthy changes in this version:
-) documentation:
+ new Spanish documentation on ClamAV and Sendmail integration by
Erick Ivaan Lopez Carreon
- + included clamdoc.pdf Turkish translation by yavuz kaya and �brahim erken
+ + included clamdoc.pdf Turkish translation by yavuz kaya and Ýbrahim erken
+ included clamav-mirror-howto.pdf by Luca Gibelli
+ included clamd+daemontools HOWTO by Jesse D. Guardiani
+ included signatures.pdf
diff --git a/contrib/cleanup-partial.pl b/contrib/cleanup-partial.pl
new file mode 100755
index 0000000..1346f71
--- /dev/null
+++ b/contrib/cleanup-partial.pl
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+# ---- Settings ----
+# TemporaryDirectory in clamd.conf
+my $TMPDIR='/tmp';
+# How long to wait for next part of RFC1341 message (seconds)
+my $cleanup_interval=3600;
+
+# ---- End of Settings ----
+
+my $partial_dir = "$TMPDIR/clamav-partial";
+# if there is no partial directory, nothing to clean up
+opendir(DIR, $partial_dir) || exit 0;
+
+my $cleanup_threshold = time - $cleanup_interval;
+while(my $file = readdir(DIR)) {
+ next unless $file =~ m/^clamav-partial-([0-9]+)_[0-9a-f]{32}-[0-9]+$/;
+ my $filetime = $1;
+ unlink "$partial_dir/$file" unless $filetime > $cleanup_threshold;
+}
+closedir DIR;
diff --git a/database/daily.cvd b/database/daily.cvd
index f0b9c57..4dc2a1b 100644
Binary files a/database/daily.cvd and b/database/daily.cvd differ
diff --git a/libclamav/7z/BraIA64.c b/libclamav/7z/BraIA64.c
deleted file mode 100644
index 0b4ee85..0000000
--- a/libclamav/7z/BraIA64.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* BraIA64.c -- Converter for IA-64 code
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bra.h"
-
-static const Byte kBranchTable[32] =
-{
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 4, 4, 6, 6, 0, 0, 7, 7,
- 4, 4, 0, 0, 4, 4, 0, 0
-};
-
-SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
-{
- SizeT i;
- if (size < 16)
- return 0;
- size -= 16;
- for (i = 0; i <= size; i += 16)
- {
- UInt32 instrTemplate = data[i] & 0x1F;
- UInt32 mask = kBranchTable[instrTemplate];
- UInt32 bitPos = 5;
- int slot;
- for (slot = 0; slot < 3; slot++, bitPos += 41)
- {
- UInt32 bytePos, bitRes;
- UInt64 instruction, instNorm;
- int j;
- if (((mask >> slot) & 1) == 0)
- continue;
- bytePos = (bitPos >> 3);
- bitRes = bitPos & 0x7;
- instruction = 0;
- for (j = 0; j < 6; j++)
- instruction += (UInt64)data[i + j + bytePos] << (8 * j);
-
- instNorm = instruction >> bitRes;
- if (((instNorm >> 37) & 0xF) == 0x5 && ((instNorm >> 9) & 0x7) == 0)
- {
- UInt32 src = (UInt32)((instNorm >> 13) & 0xFFFFF);
- UInt32 dest;
- src |= ((UInt32)(instNorm >> 36) & 1) << 20;
-
- src <<= 4;
-
- if (encoding)
- dest = ip + (UInt32)i + src;
- else
- dest = src - (ip + (UInt32)i);
-
- dest >>= 4;
-
- instNorm &= ~((UInt64)(0x8FFFFF) << 13);
- instNorm |= ((UInt64)(dest & 0xFFFFF) << 13);
- instNorm |= ((UInt64)(dest & 0x100000) << (36 - 20));
-
- instruction &= (1 << bitRes) - 1;
- instruction |= (instNorm << bitRes);
- for (j = 0; j < 6; j++)
- data[i + j + bytePos] = (Byte)(instruction >> (8 * j));
- }
- }
- }
- return i;
-}
diff --git a/libclamav/7z/lzma.txt b/libclamav/7z/lzma.txt
deleted file mode 100644
index d4f4af9..0000000
--- a/libclamav/7z/lzma.txt
+++ /dev/null
@@ -1,594 +0,0 @@
-LZMA SDK 4.65
--------------
-
-LZMA SDK provides the documentation, samples, header files, libraries,
-and tools you need to develop applications that use LZMA compression.
-
-LZMA is default and general compression method of 7z format
-in 7-Zip compression program (www.7-zip.org). LZMA provides high
-compression ratio and very fast decompression.
-
-LZMA is an improved version of famous LZ77 compression algorithm.
-It was improved in way of maximum increasing of compression ratio,
-keeping high decompression speed and low memory requirements for
-decompressing.
-
-
-
-LICENSE
--------
-
-LZMA SDK is written and placed in the public domain by Igor Pavlov.
-
-
-LZMA SDK Contents
------------------
-
-LZMA SDK includes:
-
- - ANSI-C/C++/C#/Java source code for LZMA compressing and decompressing
- - Compiled file->file LZMA compressing/decompressing program for Windows system
-
-
-UNIX/Linux version
-------------------
-To compile C++ version of file->file LZMA encoding, go to directory
-C++/7zip/Compress/LZMA_Alone
-and call make to recompile it:
- make -f makefile.gcc clean all
-
-In some UNIX/Linux versions you must compile LZMA with static libraries.
-To compile with static libraries, you can use
-LIB = -lm -static
-
-
-Files
----------------------
-lzma.txt - LZMA SDK description (this file)
-7zFormat.txt - 7z Format description
-7zC.txt - 7z ANSI-C Decoder description
-methods.txt - Compression method IDs for .7z
-lzma.exe - Compiled file->file LZMA encoder/decoder for Windows
-history.txt - history of the LZMA SDK
-
-
-Source code structure
----------------------
-
-C/ - C files
- 7zCrc*.* - CRC code
- Alloc.* - Memory allocation functions
- Bra*.* - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code
- LzFind.* - Match finder for LZ (LZMA) encoders
- LzFindMt.* - Match finder for LZ (LZMA) encoders for multithreading encoding
- LzHash.h - Additional file for LZ match finder
- LzmaDec.* - LZMA decoding
- LzmaEnc.* - LZMA encoding
- LzmaLib.* - LZMA Library for DLL calling
- Types.h - Basic types for another .c files
- Threads.* - The code for multithreading.
-
- LzmaLib - LZMA Library (.DLL for Windows)
-
- LzmaUtil - LZMA Utility (file->file LZMA encoder/decoder).
-
- Archive - files related to archiving
- 7z - 7z ANSI-C Decoder
-
-CPP/ -- CPP files
-
- Common - common files for C++ projects
- Windows - common files for Windows related code
-
- 7zip - files related to 7-Zip Project
-
- Common - common files for 7-Zip
-
- Compress - files related to compression/decompression
-
- Copy - Copy coder
- RangeCoder - Range Coder (special code of compression/decompression)
- LZMA - LZMA compression/decompression on C++
- LZMA_Alone - file->file LZMA compression/decompression
- Branch - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code
-
- Archive - files related to archiving
-
- Common - common files for archive handling
- 7z - 7z C++ Encoder/Decoder
-
- Bundles - Modules that are bundles of other modules
-
- Alone7z - 7zr.exe: Standalone version of 7z.exe that supports only 7z/LZMA/BCJ/BCJ2
- Format7zR - 7zr.dll: Reduced version of 7za.dll: extracting/compressing to 7z/LZMA/BCJ/BCJ2
- Format7zExtractR - 7zxr.dll: Reduced version of 7zxa.dll: extracting from 7z/LZMA/BCJ/BCJ2.
-
- UI - User Interface files
-
- Client7z - Test application for 7za.dll, 7zr.dll, 7zxr.dll
- Common - Common UI files
- Console - Code for console archiver
-
-
-
-CS/ - C# files
- 7zip
- Common - some common files for 7-Zip
- Compress - files related to compression/decompression
- LZ - files related to LZ (Lempel-Ziv) compression algorithm
- LZMA - LZMA compression/decompression
- LzmaAlone - file->file LZMA compression/decompression
- RangeCoder - Range Coder (special code of compression/decompression)
-
-Java/ - Java files
- SevenZip
- Compression - files related to compression/decompression
- LZ - files related to LZ (Lempel-Ziv) compression algorithm
- LZMA - LZMA compression/decompression
- RangeCoder - Range Coder (special code of compression/decompression)
-
-
-C/C++ source code of LZMA SDK is part of 7-Zip project.
-7-Zip source code can be downloaded from 7-Zip's SourceForge page:
-
- http://sourceforge.net/projects/sevenzip/
-
-
-
-LZMA features
--------------
- - Variable dictionary size (up to 1 GB)
- - Estimated compressing speed: about 2 MB/s on 2 GHz CPU
- - Estimated decompressing speed:
- - 20-30 MB/s on 2 GHz Core 2 or AMD Athlon 64
- - 1-2 MB/s on 200 MHz ARM, MIPS, PowerPC or other simple RISC
- - Small memory requirements for decompressing (16 KB + DictionarySize)
- - Small code size for decompressing: 5-8 KB
-
-LZMA decoder uses only integer operations and can be
-implemented in any modern 32-bit CPU (or on 16-bit CPU with some conditions).
-
-Some critical operations that affect the speed of LZMA decompression:
- 1) 32*16 bit integer multiply
- 2) Misspredicted branches (penalty mostly depends from pipeline length)
- 3) 32-bit shift and arithmetic operations
-
-The speed of LZMA decompressing mostly depends from CPU speed.
-Memory speed has no big meaning. But if your CPU has small data cache,
-overall weight of memory speed will slightly increase.
-
-
-How To Use
-----------
-
-Using LZMA encoder/decoder executable
---------------------------------------
-
-Usage: LZMA <e|d> inputFile outputFile [<switches>...]
-
- e: encode file
-
- d: decode file
-
- b: Benchmark. There are two tests: compressing and decompressing
- with LZMA method. Benchmark shows rating in MIPS (million
- instructions per second). Rating value is calculated from
- measured speed and it is normalized with Intel's Core 2 results.
- Also Benchmark checks possible hardware errors (RAM
- errors in most cases). Benchmark uses these settings:
- (-a1, -d21, -fb32, -mfbt4). You can change only -d parameter.
- Also you can change the number of iterations. Example for 30 iterations:
- LZMA b 30
- Default number of iterations is 10.
-
-<Switches>
-
-
- -a{N}: set compression mode 0 = fast, 1 = normal
- default: 1 (normal)
-
- d{N}: Sets Dictionary size - [0, 30], default: 23 (8MB)
- The maximum value for dictionary size is 1 GB = 2^30 bytes.
- Dictionary size is calculated as DictionarySize = 2^N bytes.
- For decompressing file compressed by LZMA method with dictionary
- size D = 2^N you need about D bytes of memory (RAM).
-
- -fb{N}: set number of fast bytes - [5, 273], default: 128
- Usually big number gives a little bit better compression ratio
- and slower compression process.
-
- -lc{N}: set number of literal context bits - [0, 8], default: 3
- Sometimes lc=4 gives gain for big files.
-
- -lp{N}: set number of literal pos bits - [0, 4], default: 0
- lp switch is intended for periodical data when period is
- equal 2^N. For example, for 32-bit (4 bytes)
- periodical data you can use lp=2. Often it's better to set lc0,
- if you change lp switch.
-
- -pb{N}: set number of pos bits - [0, 4], default: 2
- pb switch is intended for periodical data
- when period is equal 2^N.
-
- -mf{MF_ID}: set Match Finder. Default: bt4.
- Algorithms from hc* group doesn't provide good compression
- ratio, but they often works pretty fast in combination with
- fast mode (-a0).
-
- Memory requirements depend from dictionary size
- (parameter "d" in table below).
-
- MF_ID Memory Description
-
- bt2 d * 9.5 + 4MB Binary Tree with 2 bytes hashing.
- bt3 d * 11.5 + 4MB Binary Tree with 3 bytes hashing.
- bt4 d * 11.5 + 4MB Binary Tree with 4 bytes hashing.
- hc4 d * 7.5 + 4MB Hash Chain with 4 bytes hashing.
-
- -eos: write End Of Stream marker. By default LZMA doesn't write
- eos marker, since LZMA decoder knows uncompressed size
- stored in .lzma file header.
-
- -si: Read data from stdin (it will write End Of Stream marker).
- -so: Write data to stdout
-
-
-Examples:
-
-1) LZMA e file.bin file.lzma -d16 -lc0
-
-compresses file.bin to file.lzma with 64 KB dictionary (2^16=64K)
-and 0 literal context bits. -lc0 allows to reduce memory requirements
-for decompression.
-
-
-2) LZMA e file.bin file.lzma -lc0 -lp2
-
-compresses file.bin to file.lzma with settings suitable
-for 32-bit periodical data (for example, ARM or MIPS code).
-
-3) LZMA d file.lzma file.bin
-
-decompresses file.lzma to file.bin.
-
-
-Compression ratio hints
------------------------
-
-Recommendations
----------------
-
-To increase the compression ratio for LZMA compressing it's desirable
-to have aligned data (if it's possible) and also it's desirable to locate
-data in such order, where code is grouped in one place and data is
-grouped in other place (it's better than such mixing: code, data, code,
-data, ...).
-
-
-Filters
--------
-You can increase the compression ratio for some data types, using
-special filters before compressing. For example, it's possible to
-increase the compression ratio on 5-10% for code for those CPU ISAs:
-x86, IA-64, ARM, ARM-Thumb, PowerPC, SPARC.
-
-You can find C source code of such filters in C/Bra*.* files
-
-You can check the compression ratio gain of these filters with such
-7-Zip commands (example for ARM code):
-No filter:
- 7z a a1.7z a.bin -m0=lzma
-
-With filter for little-endian ARM code:
- 7z a a2.7z a.bin -m0=arm -m1=lzma
-
-It works in such manner:
-Compressing = Filter_encoding + LZMA_encoding
-Decompressing = LZMA_decoding + Filter_decoding
-
-Compressing and decompressing speed of such filters is very high,
-so it will not increase decompressing time too much.
-Moreover, it reduces decompression time for LZMA_decoding,
-since compression ratio with filtering is higher.
-
-These filters convert CALL (calling procedure) instructions
-from relative offsets to absolute addresses, so such data becomes more
-compressible.
-
-For some ISAs (for example, for MIPS) it's impossible to get gain from such filter.
-
-
-LZMA compressed file format
----------------------------
-Offset Size Description
- 0 1 Special LZMA properties (lc,lp, pb in encoded form)
- 1 4 Dictionary size (little endian)
- 5 8 Uncompressed size (little endian). -1 means unknown size
- 13 Compressed data
-
-
-ANSI-C LZMA Decoder
-~~~~~~~~~~~~~~~~~~~
-
-Please note that interfaces for ANSI-C code were changed in LZMA SDK 4.58.
-If you want to use old interfaces you can download previous version of LZMA SDK
-from sourceforge.net site.
-
-To use ANSI-C LZMA Decoder you need the following files:
-1) LzmaDec.h + LzmaDec.c + Types.h
-LzmaUtil/LzmaUtil.c is example application that uses these files.
-
-
-Memory requirements for LZMA decoding
--------------------------------------
-
-Stack usage of LZMA decoding function for local variables is not
-larger than 200-400 bytes.
-
-LZMA Decoder uses dictionary buffer and internal state structure.
-Internal state structure consumes
- state_size = (4 + (1.5 << (lc + lp))) KB
-by default (lc=3, lp=0), state_size = 16 KB.
-
-
-How To decompress data
-----------------------
-
-LZMA Decoder (ANSI-C version) now supports 2 interfaces:
-1) Single-call Decompressing
-2) Multi-call State Decompressing (zlib-like interface)
-
-You must use external allocator:
-Example:
-void *SzAlloc(void *p, size_t size) { p = p; return malloc(size); }
-void SzFree(void *p, void *address) { p = p; free(address); }
-ISzAlloc alloc = { SzAlloc, SzFree };
-
-You can use p = p; operator to disable compiler warnings.
-
-
-Single-call Decompressing
--------------------------
-When to use: RAM->RAM decompressing
-Compile files: LzmaDec.h + LzmaDec.c + Types.h
-Compile defines: no defines
-Memory Requirements:
- - Input buffer: compressed size
- - Output buffer: uncompressed size
- - LZMA Internal Structures: state_size (16 KB for default settings)
-
-Interface:
- int LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
- const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
- ELzmaStatus *status, ISzAlloc *alloc);
- In:
- dest - output data
- destLen - output data size
- src - input data
- srcLen - input data size
- propData - LZMA properties (5 bytes)
- propSize - size of propData buffer (5 bytes)
- finishMode - It has meaning only if the decoding reaches output limit (*destLen).
- LZMA_FINISH_ANY - Decode just destLen bytes.
- LZMA_FINISH_END - Stream must be finished after (*destLen).
- You can use LZMA_FINISH_END, when you know that
- current output buffer covers last bytes of stream.
- alloc - Memory allocator.
-
- Out:
- destLen - processed output size
- srcLen - processed input size
-
- Output:
- SZ_OK
- status:
- LZMA_STATUS_FINISHED_WITH_MARK
- LZMA_STATUS_NOT_FINISHED
- LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
- SZ_ERROR_DATA - Data error
- SZ_ERROR_MEM - Memory allocation error
- SZ_ERROR_UNSUPPORTED - Unsupported properties
- SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-
- If LZMA decoder sees end_marker before reaching output limit, it returns OK result,
- and output value of destLen will be less than output buffer size limit.
-
- You can use multiple checks to test data integrity after full decompression:
- 1) Check Result and "status" variable.
- 2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
- 3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
- You must use correct finish mode in that case. */
-
-
-Multi-call State Decompressing (zlib-like interface)
-----------------------------------------------------
-
-When to use: file->file decompressing
-Compile files: LzmaDec.h + LzmaDec.c + Types.h
-
-Memory Requirements:
- - Buffer for input stream: any size (for example, 16 KB)
- - Buffer for output stream: any size (for example, 16 KB)
- - LZMA Internal Structures: state_size (16 KB for default settings)
- - LZMA dictionary (dictionary size is encoded in LZMA properties header)
-
-1) read LZMA properties (5 bytes) and uncompressed size (8 bytes, little-endian) to header:
- unsigned char header[LZMA_PROPS_SIZE + 8];
- ReadFile(inFile, header, sizeof(header)
-
-2) Allocate CLzmaDec structures (state + dictionary) using LZMA properties
-
- CLzmaDec state;
- LzmaDec_Constr(&state);
- res = LzmaDec_Allocate(&state, header, LZMA_PROPS_SIZE, &g_Alloc);
- if (res != SZ_OK)
- return res;
-
-3) Init LzmaDec structure before any new LZMA stream. And call LzmaDec_DecodeToBuf in loop
-
- LzmaDec_Init(&state);
- for (;;)
- {
- ...
- int res = LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
- const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode);
- ...
- }
-
-
-4) Free all allocated structures
- LzmaDec_Free(&state, &g_Alloc);
-
-For full code example, look at C/LzmaUtil/LzmaUtil.c code.
-
-
-How To compress data
---------------------
-
-Compile files: LzmaEnc.h + LzmaEnc.c + Types.h +
-LzFind.c + LzFind.h + LzFindMt.c + LzFindMt.h + LzHash.h
-
-Memory Requirements:
- - (dictSize * 11.5 + 6 MB) + state_size
-
-Lzma Encoder can use two memory allocators:
-1) alloc - for small arrays.
-2) allocBig - for big arrays.
-
-For example, you can use Large RAM Pages (2 MB) in allocBig allocator for
-better compression speed. Note that Windows has bad implementation for
-Large RAM Pages.
-It's OK to use same allocator for alloc and allocBig.
-
-
-Single-call Compression with callbacks
---------------------------------------
-
-Check C/LzmaUtil/LzmaUtil.c as example,
-
-When to use: file->file decompressing
-
-1) you must implement callback structures for interfaces:
-ISeqInStream
-ISeqOutStream
-ICompressProgress
-ISzAlloc
-
-static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
-static void SzFree(void *p, void *address) { p = p; MyFree(address); }
-static ISzAlloc g_Alloc = { SzAlloc, SzFree };
-
- CFileSeqInStream inStream;
- CFileSeqOutStream outStream;
-
- inStream.funcTable.Read = MyRead;
- inStream.file = inFile;
- outStream.funcTable.Write = MyWrite;
- outStream.file = outFile;
-
-
-2) Create CLzmaEncHandle object;
-
- CLzmaEncHandle enc;
-
- enc = LzmaEnc_Create(&g_Alloc);
- if (enc == 0)
- return SZ_ERROR_MEM;
-
-
-3) initialize CLzmaEncProps properties;
-
- LzmaEncProps_Init(&props);
-
- Then you can change some properties in that structure.
-
-4) Send LZMA properties to LZMA Encoder
-
- res = LzmaEnc_SetProps(enc, &props);
-
-5) Write encoded properties to header
-
- Byte header[LZMA_PROPS_SIZE + 8];
- size_t headerSize = LZMA_PROPS_SIZE;
- UInt64 fileSize;
- int i;
-
- res = LzmaEnc_WriteProperties(enc, header, &headerSize);
- fileSize = MyGetFileLength(inFile);
- for (i = 0; i < 8; i++)
- header[headerSize++] = (Byte)(fileSize >> (8 * i));
- MyWriteFileAndCheck(outFile, header, headerSize)
-
-6) Call encoding function:
- res = LzmaEnc_Encode(enc, &outStream.funcTable, &inStream.funcTable,
- NULL, &g_Alloc, &g_Alloc);
-
-7) Destroy LZMA Encoder Object
- LzmaEnc_Destroy(enc, &g_Alloc, &g_Alloc);
-
-
-If callback function return some error code, LzmaEnc_Encode also returns that code.
-
-
-Single-call RAM->RAM Compression
---------------------------------
-
-Single-call RAM->RAM Compression is similar to Compression with callbacks,
-but you provide pointers to buffers instead of pointers to stream callbacks:
-
-HRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
- CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
- ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-
-Return code:
- SZ_OK - OK
- SZ_ERROR_MEM - Memory allocation error
- SZ_ERROR_PARAM - Incorrect paramater
- SZ_ERROR_OUTPUT_EOF - output buffer overflow
- SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-
-
-
-LZMA Defines
-------------
-
-_LZMA_SIZE_OPT - Enable some optimizations in LZMA Decoder to get smaller executable code.
-
-_LZMA_PROB32 - It can increase the speed on some 32-bit CPUs, but memory usage for
- some structures will be doubled in that case.
-
-_LZMA_UINT32_IS_ULONG - Define it if int is 16-bit on your compiler and long is 32-bit.
-
-_LZMA_NO_SYSTEM_SIZE_T - Define it if you don't want to use size_t type.
-
-
-C++ LZMA Encoder/Decoder
-~~~~~~~~~~~~~~~~~~~~~~~~
-C++ LZMA code use COM-like interfaces. So if you want to use it,
-you can study basics of COM/OLE.
-C++ LZMA code is just wrapper over ANSI-C code.
-
-
-C++ Notes
-~~~~~~~~~~~~~~~~~~~~~~~~
-If you use some C++ code folders in 7-Zip (for example, C++ code for .7z handling),
-you must check that you correctly work with "new" operator.
-7-Zip can be compiled with MSVC 6.0 that doesn't throw "exception" from "new" operator.
-So 7-Zip uses "CPP\Common\NewHandler.cpp" that redefines "new" operator:
-operator new(size_t size)
-{
- void *p = ::malloc(size);
- if (p == 0)
- throw CNewException();
- return p;
-}
-If you use MSCV that throws exception for "new" operator, you can compile without
-"NewHandler.cpp". So standard exception will be used. Actually some code of
-7-Zip catches any exception in internal code and converts it to HRESULT code.
-So you don't need to catch CNewException, if you call COM interfaces of 7-Zip.
-
----
-
-http://www.7-zip.org
-http://www.7-zip.org/sdk.html
-http://www.7-zip.org/support.html
diff --git a/libclamav/c++/GenList.pl b/libclamav/c++/GenList.pl
deleted file mode 100755
index 42966c3..0000000
--- a/libclamav/c++/GenList.pl
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-my $path = $ARGV[0];
-`(cd $path/tools/llvm-config; make ENABLE_OPTIMIZED=0 llvm-config-perobjincl)`;
-
-my %compdeps;
-my @codegencomponents = ('x86codegen','powerpccodegen','armcodegen');
-my @allnonsys = ('support','jit','fullcodegen', at codegencomponents);
-my @allcomponents= ('system', at allnonsys);
-my $allJIT="jit core lib/Support/SourceMgr.o lib/Analysis/PointerTracking.o lib/Transforms/Scalar/DCE.o lib/Analysis/IPA/CallGraph.o";
-for my $component (@allcomponents) {
- $/ = " ";
- $component =~ s/^fullcodegen/codegen interpreter jit target/;
- if ($component =~ "^jit") {
- open DEPS, "$path/tools/llvm-config/llvm-config-perobjincl --libnames $allJIT|";
- } else {
- open DEPS, "$path/tools/llvm-config/llvm-config-perobjincl --libnames $component|";
- }
- $component =~ s/^codegen.+/fullcodegen/;
- while (<DEPS>) {
- chomp;
- s/[\n\r]//;
- next if (!/\.o$/);
- s/Support\/reg(.*).o/Support\/reg$1.c/;
- s/\.o$/.cpp/;
- $compdeps{$component}{$_}=1;
- }
- close DEPS or die "llvm-config failed";
-}
-
-# System is always linked in, so remove it from all else
-foreach my $systemcomp (keys %{$compdeps{'system'}}) {
- foreach my $component (@allnonsys) {
- delete $compdeps{$component}{$systemcomp} if defined $compdeps{$component}{$systemcomp};
- }
-}
-
-# Eliminate components from codegen that are in JIT already.
-# and compute common codegen components.
-my %intersection = ();
-my %count = ();
-
-foreach my $codegen (@codegencomponents) {
- my %newdeps;
- for my $depobj (keys %{$compdeps{$codegen}}) {
- next if $compdeps{'jit'}{$depobj};
- $newdeps{$depobj}=1;
- $count{$depobj}++;
- }
- $compdeps{$codegen} = \%newdeps;
-}
-foreach my $element (keys %count) {
- $intersection{$element}=1 if $count{$element} > 1;
-}
-
-foreach my $codegen (@codegencomponents) {
- foreach my $element (keys %intersection) {
- delete $compdeps{$codegen}{$element};
- }
- # Move the system and support objs required (even if not common) to codegen,
- # since these were already built for tblgen.
- foreach my $element (keys %{$compdeps{'system'}}) {
- next unless defined $compdeps{$codegen}{$element};
- delete $compdeps{$codegen}{$element};
- $intersection{$element}=1;
- }
- foreach my $element (keys %{$compdeps{'support'}}) {
- next unless defined $compdeps{$codegen}{$element};
- delete $compdeps{$codegen}{$element};
- $intersection{$element}=1;
- }
-}
-
- at allcomponents=(@allcomponents,'codegen');
-$compdeps{'codegen'}=\%intersection;
-foreach my $comp (keys %{$compdeps{'codegen'}}) {
- delete $compdeps{'fullcodegen'}{$comp};
-}
-foreach my $comp (keys %{$compdeps{'jit'}}) {
- delete $compdeps{'fullcodegen'}{$comp};
-}
-foreach my $comp (keys %{$compdeps{'support'}}) {
- $compdeps{'support_nodups'}{$comp}=1;
-}
-
-foreach my $comp (keys %{$compdeps{'jit'}}) {
- next unless defined $compdeps{'support_nodups'}{$comp};
- delete $compdeps{'support_nodups'}{$comp};
-}
- at allcomponents=(@allcomponents,'codegen','support_nodups');
-
-foreach my $comp (@allcomponents) {
- print "libllvm$comp"."_la_SOURCES=";
- foreach my $dep (sort keys %{$compdeps{$comp}}) {
- print "\\\n\tllvm/$dep";
- }
- print "\n\n";
-}
-
diff --git a/libclamav/c++/TODO.CLAMAV b/libclamav/c++/TODO.CLAMAV
deleted file mode 100644
index dc02bc5..0000000
--- a/libclamav/c++/TODO.CLAMAV
+++ /dev/null
@@ -1,15 +0,0 @@
-Convert to clamav's build system -> impl. cross-compilation support (tblgen)
-
-Right now static linking of libclamav doesn't work with llvm parts for a number
-of reasons:
-1. llvm is not built with libtool, and it builds .a files (or .so files)
-2. if I link with .a files, that works for a .so (LLVM's .a files are PIC), but
- the created libclamav.a will miss the .a files, so I'd need to install the llvm
- .a files together with clamav's
-3. libtool solves this by putting individual .o files into the target libtool .a
-archive, but since I link against non-libtool archives it doesn't know how to do
-that
-4. if I link against a .so then obviously it is not static linking
-
-If llvm would be converted to clamav's buildsystem then static linking of
-libclamav would work.
diff --git a/libclamav/c++/merge.sh b/libclamav/c++/merge.sh
deleted file mode 100755
index 475a94c..0000000
--- a/libclamav/c++/merge.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Merge upstream LLVM from git-svn mirror
-set -e
-rm -f .git/info/grafts
-touch .git/info/grafts
-echo "Creating grafts for llvm-upstream"
-
-REPONAME=llvm
-REFPFX=refs/tags/merge-$REPONAME-
-UPSTREAM=$REPONAME-upstream/release
-git for-each-ref $REFPFX* --format='%(refname)' | while read tag_ref
-do
- tag_svn_ref=`echo $tag_ref|sed -e s\|$REFPFX\|\|`
- upstream_ref=`git log $UPSTREAM -1 --grep=trunk@$tag_svn_ref --format=format:%H`
- local_ref=`git rev-parse $tag_ref`
- local_parent_ref=`git rev-parse $tag_ref^`
- git branch --contains $local_ref | grep '*' >/dev/null ||
- { echo "branch has been rebased, tag is on branch: `git branch --contains $local_ref`"; exit 1;}
- echo "$local_ref $local_parent_ref $upstream_ref" >>.git/info/grafts
-done
-echo "Merging llvm-upstream"
-MERGEREV=`git log $UPSTREAM -1 |grep /release_27@|sed -s 's/.*@\([0-9]*\).*/\1/'`
-echo "$MERGEREV"
-git merge -s subtree --squash llvm-upstream/release
-
-echo "Run strip-llvm.sh from libclamav/c++"
-echo "Then fix conflicts if needed: git mergetool"
-echo "Then commit the result and tag it: git commit && git tag merge-llvm-$MERGEREV"
-echo "Then remove the grafts: rm .git/info/grafts"
-# && git commit || {
-# echo "Merge failed: resolve conflicts and run: git tag merge-llvm-$MERGEREV && rm .git/info/grafts"; exit 1;}
-# git tag merge-llvm-$MERGEREV
-# rm .git/info/grafts
diff --git a/libclamav/c++/strip-llvm.sh b/libclamav/c++/strip-llvm.sh
deleted file mode 100755
index 44bb1fe..0000000
--- a/libclamav/c++/strip-llvm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Remove directories we don't use
-
-for i in llvm/bindings/ llvm/examples/ llvm/projects/ llvm/runtime/\
- llvm/website llvm/win32 llvm/Xcode llvm/lib/Archive\
- llvm/lib/CompilerDriver/ llvm/lib/Debugger/ llvm/lib/Linker/\
- llvm/lib/Target/Alpha/ llvm/lib/Target/Blackfin/ llvm/lib/Target/CBackend/\
- llvm/lib/Target/CellSPU/ llvm/lib/Target/CppBackend/ llvm/lib/Target/Mips\
- llvm/lib/Target/MSIL llvm/lib/Target/MSP430/ llvm/lib/Target/PIC16\
- llvm/lib/Target/Sparc/ llvm/lib/Target/SystemZ llvm/lib/Target/XCore\
- llvm/lib/Target/MBlaze/ llvm/lib/Target/PIC16/ llvm/lib/Target/MSP430\
- llvm/test/Archive/ llvm/test/Bindings/ llvm/test/Bitcode/ llvm/test/DebugInfo/\
- llvm/test/FrontendAda/ llvm/test/FrontendC llvm/test/FrontendC++/\
- llvm/test/FrontendFortran/ llvm/test/FrontendObjC\
- llvm/test/FrontendObjC++ llvm/test/Linker/ llvm/test/LLVMC\
- llvm/test/MC llvm/test/Transforms llvm/test/Transforms/InstCombine\
- llvm/test/BugPoint llvm/test/CodeGen/CPP llvm/test/CodeGen/Mips\
- llvm/test/CodeGen/Alpha llvm/test/CodeGen/PIC16 llvm/test/CodeGen/SPARC\
- llvm/test/CodeGen/XCore llvm/test/CodeGen/MSP430 llvm/test/CodeGen/MBlaze\
- llvm/test/CodeGen/CellSPU llvm/test/CodeGen/CBackend\
- llvm/test/CodeGen/SystemZ llvm/test/CodeGen/Blackfin llvm/test/TableGen\
- llvm/test/Analysis llvm/test/Assembler llvm/test/Other\
- llvm/tools/bugpoint llvm/tools/gold llvm/tools/llvm-ar\
- llvm/tools/llvm-bcanalyzer llvm/tools/llvm-db\
- llvm/tools/llvm-extract llvm/tools/llvm-ld llvm/tools/llvm-link llvm/tools/llvm-mc\
- llvm/tools/llvm-nm llvm/tools/llvm-prof llvm/tools/llvm-ranlib\
- llvm/tools/llvm-stub llvm/tools/lto llvm/tools/opt llvm/lib/MC/MCParser\
- llvm/tools/llvm-dis/Makefile llvm/tools/edis/ llvm/tools/llvm-shlib\
- llvm/docs
- do
- git rm -rf $i; git rm -f $i;
-done
-# config.status needs these
-mkdir -p llvm/docs/doxygen
-touch llvm/docs/doxygen.cfg.in
-git add llvm/docs/doxygen.cfg.in
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list