open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel

Browse Source
pull/18/head
Steven Morgan 11 years ago
parent cfe30a07db b5641e9c79
commit be5b01a461
20 changed files with 19 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      clamav-milter/Makefile.am
  2. 2
      clamav-milter/Makefile.in
  3. 2
      clamd/Makefile.am
  4. 2
      clamd/Makefile.in
  5. 2
      clamdscan/Makefile.am
  6. 2
      clamdscan/Makefile.in
  7. 2
      clamdtop/Makefile.am
  8. 2
      clamdtop/Makefile.in
  9. 2
      clamscan/Makefile.am
  10. 2
      clamscan/Makefile.in
  11. 2
      clamsubmit/Makefile.am
  12. 2
      clamsubmit/Makefile.in
  13. BIN
      docs/ClamAV_Document_Properties.xlsx
  14. 2
      freshclam/Makefile.am
  15. 2
      freshclam/Makefile.in
  16. 6
      libclamav/Makefile.am
  17. 6
      libclamav/Makefile.in
  18. 1
      libclamav/filetypes.c
  19. 2
      sigtool/Makefile.am
  20. 2
      sigtool/Makefile.in

2
clamav-milter/Makefile.am
Unescape View File

@ -47,5 +47,5 @@ endif
DEFS = @DEFS@ -DCL_NOLIBCLAMAV
LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
CLEANFILES=*.gcda *.gcno

2
clamav-milter/Makefile.in
Unescape View File

@ -512,7 +512,7 @@ top_srcdir = @top_srcdir@
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@
AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
CLEANFILES = *.gcda *.gcno
all: all-am

2
clamd/Makefile.am
Unescape View File

@ -53,7 +53,7 @@ AM_CFLAGS=@WERR_CFLAGS@
endif
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
# it does support --help and --version but with the default config file
# it outputs an error message which tells us to edit the config files

2
clamd/Makefile.in
Unescape View File

@ -487,7 +487,7 @@ top_srcdir = @top_srcdir@
@BUILD_CLAMD_TRUE@ fan.h
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
# it does support --help and --version but with the default config file
# it outputs an error message which tells us to edit the config files

2
clamdscan/Makefile.am
Unescape View File

@ -44,7 +44,7 @@ endif
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
AM_CPPFLAGS = @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@
LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)

2
clamdscan/Makefile.in
Unescape View File

@ -476,7 +476,7 @@ top_srcdir = @top_srcdir@
@BUILD_CLAMD_TRUE@ client.h
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
AM_CPPFLAGS = @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)
CLEANFILES = *.gcda *.gcno
all: all-am

2
clamdtop/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ clamdtop_SOURCES = \
clamdtop.c
AM_CFLAGS=@WERR_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
clamdtop_LDADD = @SSL_LDFLAGS@ @SSL_LIBS@ @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
endif
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV

2
clamdtop/Makefile.in
Unescape View File

@ -473,7 +473,7 @@ top_srcdir = @top_srcdir@
@HAVE_CURSES_TRUE@ clamdtop.c
@HAVE_CURSES_TRUE@AM_CFLAGS = @WERR_CFLAGS@
@HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
@HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
@HAVE_CURSES_TRUE@clamdtop_LDADD = @SSL_LDFLAGS@ @SSL_LIBS@ @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
EXTRA_DIST = clamdtop.c
all: all-am

2
clamscan/Makefile.am
Unescape View File

@ -38,6 +38,6 @@ clamscan_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@
CLEANFILES=*.gcda *.gcno

2
clamscan/Makefile.in
Unescape View File

@ -464,7 +464,7 @@ clamscan_SOURCES = \
manager.h
AM_CFLAGS = @WERR_CFLAGS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@
CLEANFILES = *.gcda *.gcno
all: all-am

2
clamsubmit/Makefile.am
Unescape View File

@ -31,7 +31,7 @@ clamsubmit_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @JSON_CPPFLAGS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamsubmit$(EXEEXT)

2
clamsubmit/Makefile.in
Unescape View File

@ -457,7 +457,7 @@ clamsubmit_SOURCES = \
clamsubmit.c
AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@
AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @JSON_CPPFLAGS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT)
CLEANFILES = *.gcda *.gcno
all: all-am

BIN
docs/ClamAV_Document_Properties.xlsx
View File

Binary file not shown.

2
freshclam/Makefile.am
Unescape View File

@ -51,7 +51,7 @@ freshclam_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)

2
freshclam/Makefile.in
Unescape View File

@ -480,7 +480,7 @@ freshclam_SOURCES = \
mirman.h
AM_CFLAGS = @WERR_CFLAGS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
CLEANFILES = *.gcda *.gcno
all: all-am

6
libclamav/Makefile.am
Unescape View File

@ -536,11 +536,7 @@ version.h: version.h.tmp
cp version.h.static version.h;\
elif ! diff $@ version.h.tmp >/dev/null 2>/dev/null; then\
cp version.h.tmp $@;\
fi;\
if test -f $(top_srcdir)/libclamav/version.h &&\
! diff $(top_srcdir)/libclamav/version.h version.h.tmp >/dev/null 2>/dev/null; then\
cp version.h.tmp $(top_srcdir)/libclamav/version.h;\
fi
fi
version.h.tmp:
$(AM_V_GEN) test -f version.h || touch version.h;\

6
libclamav/Makefile.in
Unescape View File

@ -3420,11 +3420,7 @@ version.h: version.h.tmp
cp version.h.static version.h;\
elif ! diff $@ version.h.tmp >/dev/null 2>/dev/null; then\
cp version.h.tmp $@;\
fi;\
if test -f $(top_srcdir)/libclamav/version.h &&\
! diff $(top_srcdir)/libclamav/version.h version.h.tmp >/dev/null 2>/dev/null; then\
cp version.h.tmp $(top_srcdir)/libclamav/version.h;\
fi
fi
version.h.tmp:
$(AM_V_GEN) test -f version.h || touch version.h;\

1
libclamav/filetypes.c
Unescape View File

@ -41,6 +41,7 @@
#include "iowrap.h"
#include "mbr.h"
#include "gpt.h"
#include "ooxml.h"
#include "htmlnorm.h"
#include "entconv.h"

2
sigtool/Makefile.am
Unescape View File

@ -37,6 +37,6 @@ sigtool_SOURCES = \
AM_CFLAGS=@WERR_CFLAGS@
DEFS = @DEFS@ -DCL_NOTHREADS
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
CLEANFILES=*.gcda *.gcno

2
sigtool/Makefile.in
Unescape View File

@ -464,7 +464,7 @@ sigtool_SOURCES = \
sigtool.c
AM_CFLAGS = @WERR_CFLAGS@
AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
CLEANFILES = *.gcda *.gcno
all: all-am

Write Preview
Loading…
Cancel
Save