Török Edvin 72a03f9bd5 Merge branch 'master' into bytecode ...

* 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

2009-10-02 10:08:44 +03:00

..

actions.c

win32#3

2009-09-24 19:31:30 +02:00

actions.h

unify actions

2009-02-12 15:14:12 +00:00

cdiff.c

shared/cdiff.c: add missing gzclose() (bb#1450)

2009-03-04 08:11:44 +00:00

cdiff.h

update some copyrights and stick to GPL v2

2007-03-31 20:31:04 +00:00

fdpassing.h

CMSG_SPACE/CMSG_LEN compat macros for Solaris 8 (bb #1439).

2009-03-04 15:51:28 +00:00

getopt.c

win32

2009-09-24 16:08:52 +02:00

getopt.h

shared/getopt.[ch]: fix type conflict on Solaris (introduced in r5060)

2009-05-06 08:39:50 +00:00

misc.c

fix several problems introduced by the win32 commits

2009-09-25 00:32:34 +02:00

misc.h

merge win32 patches from sherpya

2009-09-25 15:29:09 +02:00

network.c

win32: s/C_WINDOWS/_WIN32/ in clamd, shared

2009-09-30 00:54:04 +02:00

network.h

win32: s/C_WINDOWS/_WIN32/ in clamd, shared

2009-09-30 00:54:04 +02:00

optparser.c

Merge branch 'master' into bytecode

2009-10-02 10:08:44 +03:00

optparser.h

use optparser.

2009-06-30 18:15:12 +03:00

output.c

win32#3

2009-09-24 19:31:30 +02:00

output.h

sendtimeout

2009-02-17 15:59:26 +00:00

tar.c

win32#2

2009-09-24 16:24:07 +02:00

tar.h

new option CompressLocalDatabase

2007-12-22 21:30:38 +00:00