* bytecode: (99 commits)
Update to autoconf 2.65, and libtool 2.2.6b.
Disable LLVM's make check for now.
Output trace messages to stderr, to ensure its flushed.
Support for bytecode lines >8k.
Print llvm's version too when printing clambc's.
Fix global initializer bitcasts.
Allow controlling trace level from cmdline.
Refactor trace API, so that trace printing happens in clambc.
Add support for null constant.
Trace formatting fixes.
Add support for tracing (if bytecode compiled with support).
Drop extra {} and "".
Fix compiler version check for C++: autoconf needs [] to be escaped.
change bytecode format to allow structs with more than 16 fields.
Fix after merge: update to fmap API.
Support for scanning files created by bytecode.
read optional debug metadata.
Sync headers with clamav bytecode compiler.
Print better error message when wrong function is called.
Update to new LLVM API.
...
Conflicts:
Makefile.am
Makefile.in
configure
configure.in
libclamav/Makefile.am
libclamav/Makefile.in
libclamav/pe.h
* master: (182 commits)
libclamav/qsort.c: fix CMP1 macro (bb#1769)
handle floating chars
libclamav/readdb.c: make sure static sigs with floating chars go into AC
sigtool: --decode-sigs: handle alternatives
sigtool: --decode-sigs: handle .ldb sigs
inflateinit spam
sigtool: --decode-sigs: handle .ndb sigs
fix sig printing
Set limit to 255 so that warning is shown if maxthreads*maxrec would exceed it.
Enable more than 256 FD support on Solaris (bb #1764).
fix memleaks
sigtool: --decode-sigs; decode .db entries (bb#1246)
fsk sxs, gimme back my dll hell!
Fix Solaris build: cli_hex2ui has to be added to libclamav.map
Don't error on unused functions.
sigtool: basic sig decoding
sigtool/sigtool.c: handle .ign2 files (bb#1625)
libclamav/qsort.c: don't call med3 when using internal cmp
win32: fix globbing
unify DUPMAX def
...
Conflicts:
.gitignore
Makefile.am
configure
libclamav/Makefile.in
libclamav/clamav.h
libclamav/disasm.c
libclamav/libclamav.map
libclamav/matcher.c
libclamav/others.c
libclamav/pe.c
libclamav/pe.h
libclamav/readdb.c
* master: (60 commits)
Fix build when git is not installed and using BSD make.
Only use -fno-strict-aliasing for gcc-4.3+, to avoid bugs with older compilers (bb #1581).
libclamav/matcher-bm.c: fix cli_bm_freeoff() (bb#1710)
bb#1708
implove poolsize.pl
win32: s/C_WINDOWS/_WIN32/ in clamd, shared
libclamav/matcher-ac.c: fix matching of logical sigs (bb#1707)
libclamav/readdb.c: fix handling of broken .ldb sigs (bb#1701)
libclamav: new signature blacklisting format (bb#1625)
killclamd must always succeed (except when there's a stuck clamd).
Fix typo.
Better error message when clamd gets killed
merge win32 patches from sherpya
remove bogus debug printf
libclamav/matcher-ac.c: add support for line marker (L) (matches CR, CRLF and boundaries)
fix EOL in platform.h
sis.c: fix size check
fix several problems introduced by the win32 commits
fix in cli_is_abspath
win32#3
...
Conflicts:
.gitignore
Makefile.am
configure
configure.in
libclamav/readdb.c
