From f87214c3b5454993bae0e2bd2e2f0bb9788ee55c Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Sun, 1 May 2005 00:47:39 +0000 Subject: [PATCH] update git-svn: trunk@1508 --- clamav-devel/clamav-milter/Makefile.am | 2 ++ clamav-devel/clamav-milter/Makefile.in | 21 ++++++++++++++++++++- clamav-devel/configure | 2 +- clamav-devel/configure.in | 2 +- clamav-devel/libclamav/filetypes.c | 11 +++++------ clamav-devel/libclamav/filetypes.h | 1 + 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/clamav-devel/clamav-milter/Makefile.am b/clamav-devel/clamav-milter/Makefile.am index eb3ede9b9..1855e9cb2 100644 --- a/clamav-devel/clamav-milter/Makefile.am +++ b/clamav-devel/clamav-milter/Makefile.am @@ -28,6 +28,8 @@ clamav_milter_SOURCES = \ $(top_srcdir)/shared/getopt.h \ $(top_srcdir)/shared/memory.c \ $(top_srcdir)/shared/memory.h \ + $(top_srcdir)/shared/misc.c \ + $(top_srcdir)/shared/misc.h \ clamav-milter.c man_MANS = $(top_srcdir)/docs/man/clamav-milter.8 diff --git a/clamav-devel/clamav-milter/Makefile.in b/clamav-devel/clamav-milter/Makefile.in index f162540e0..fa37eedbc 100644 --- a/clamav-devel/clamav-milter/Makefile.in +++ b/clamav-devel/clamav-milter/Makefile.in @@ -74,11 +74,13 @@ PROGRAMS = $(sbin_PROGRAMS) am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/cfgparser.c \ $(top_srcdir)/shared/cfgparser.h $(top_srcdir)/shared/getopt.c \ $(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/memory.c \ - $(top_srcdir)/shared/memory.h clamav-milter.c + $(top_srcdir)/shared/memory.h $(top_srcdir)/shared/misc.c \ + $(top_srcdir)/shared/misc.h clamav-milter.c @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am_clamav_milter_OBJECTS = \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ cfgparser.$(OBJEXT) \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ getopt.$(OBJEXT) \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ memory.$(OBJEXT) \ +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ misc.$(OBJEXT) \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.$(OBJEXT) clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS) clamav_milter_LDADD = $(LDADD) @@ -216,6 +218,8 @@ target_vendor = @target_vendor@ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/getopt.h \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/memory.c \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/memory.h \ +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/misc.c \ +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/misc.h \ @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.c @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8 @@ -297,6 +301,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav-milter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -361,6 +366,20 @@ memory.obj: $(top_srcdir)/shared/memory.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memory.obj `if test -f '$(top_srcdir)/shared/memory.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/memory.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/memory.c'; fi` +misc.o: $(top_srcdir)/shared/misc.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF "$(DEPDIR)/misc.Tpo" -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/misc.Tpo" "$(DEPDIR)/misc.Po"; else rm -f "$(DEPDIR)/misc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c + +misc.obj: $(top_srcdir)/shared/misc.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF "$(DEPDIR)/misc.Tpo" -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/misc.Tpo" "$(DEPDIR)/misc.Po"; else rm -f "$(DEPDIR)/misc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff --git a/clamav-devel/configure b/clamav-devel/configure index a0465da29..fa7940484 100755 --- a/clamav-devel/configure +++ b/clamav-devel/configure @@ -2206,7 +2206,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' LC_CURRENT=1 -LC_REVISION=9 +LC_REVISION=10 LC_AGE=0 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in index 548f9c761..5e152d3f9 100644 --- a/clamav-devel/configure.in +++ b/clamav-devel/configure.in @@ -22,7 +22,7 @@ AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`") AM_CONFIG_HEADER(clamav-config.h) LC_CURRENT=1 -LC_REVISION=9 +LC_REVISION=10 LC_AGE=0 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" AC_SUBST(LIBCLAMAV_VERSION) diff --git a/clamav-devel/libclamav/filetypes.c b/clamav-devel/libclamav/filetypes.c index dedc43982..4243e8664 100644 --- a/clamav-devel/libclamav/filetypes.c +++ b/clamav-devel/libclamav/filetypes.c @@ -95,11 +95,6 @@ static const struct cli_magic_s cli_magic[] = { {0, "Hi. This is the qmail-send", 26, "Qmail bounce", CL_TYPE_MAIL}, {0, "\170\237\076\042", 4, "TNEF", CL_TYPE_TNEF}, - /* Others */ - - {0, "\320\317\021\340\241\261\032\341", - 8, "OLE2 container", CL_TYPE_MSOLE2}, - /* Graphics (may contain exploits against MS systems) */ {0, "GIF", 3, "GIF", CL_TYPE_GRAPHICS}, @@ -111,6 +106,11 @@ static const struct cli_magic_s cli_magic[] = { {0, "RIFF", 4, "RIFF", CL_TYPE_RIFF}, {0, "RIFX", 4, "RIFX", CL_TYPE_RIFF}, + /* Others */ + + {0, "\320\317\021\340\241\261\032\341", 8, "OLE2 container", CL_TYPE_MSOLE2}, + //{0, "\%PDF-", 5, "PDF document", CL_TYPE_PDF}, + /* Ignored types */ {0, "\000\000\001\263", 4, "MPEG video stream", CL_TYPE_DATA}, @@ -118,7 +118,6 @@ static const struct cli_magic_s cli_magic[] = { {0, "OggS", 4, "Ogg Stream", CL_TYPE_DATA}, {0, "ID3", 3, "MP3", CL_TYPE_DATA}, {0, "\377\373\220", 3, "MP3", CL_TYPE_DATA}, - {0, "\%PDF-", 5, "PDF document", CL_TYPE_DATA}, {0, "\%!PS-Adobe-", 11, "PostScript", CL_TYPE_DATA}, {0, "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF", CL_TYPE_DATA}, {0, ".RMF" , 4, "Real Media File", CL_TYPE_DATA}, diff --git a/clamav-devel/libclamav/filetypes.h b/clamav-devel/libclamav/filetypes.h index 69d9454d9..01aa2ee2e 100644 --- a/clamav-devel/libclamav/filetypes.h +++ b/clamav-devel/libclamav/filetypes.h @@ -43,6 +43,7 @@ typedef enum { CL_TYPE_RIFF, CL_TYPE_BINHEX, CL_TYPE_TNEF, + CL_TYPE_PDF, /* bigger numbers have higher priority (in o-t-f detection) */ CL_TYPE_HTML, /* on the fly */