[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Tomasz Kojm
tkojm at clamav.net
Sun Apr 4 00:55:36 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 75e46945d2fc3a56f8dc3eef0a5ce1a989122508
Author: Tomasz Kojm <tkojm at clamav.net>
Date: Mon Jul 6 16:15:33 2009 +0200
libclamav: add support for cpio archives (bb#1649) - missing changes
diff --git a/ChangeLog b/ChangeLog
index 2155252..f0048ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 2 17:05:12 CEST 2009 (tk)
+----------------------------------
+ * libclamav: add support for cpio archives (bb#1649)
+
Mon Jun 29 15:40:42 CEST 2009 (acab)
------------------------------------
* clamav-milter: use s/STREAM/INSTREAM/ (bb#1548)
diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
index 6fc8690..bf6e48a 100644
--- a/libclamav/Makefile.am
+++ b/libclamav/Makefile.am
@@ -288,7 +288,9 @@ libclamav_la_SOURCES = \
bignum.h\
bytecode.c\
bytecode.h\
- clambc.h
+ clambc.h \
+ cpio.c \
+ cpio.h
if !LINK_TOMMATH
libclamav_la_SOURCES += bignum.c \
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index 98c3e06..0e2e1f1 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -121,7 +121,8 @@ am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \
textnorm.h dlp.c dlp.h jsparse/js-norm.c jsparse/js-norm.h \
jsparse/lexglobal.h jsparse/textbuf.h uniq.c uniq.h version.c \
version.h mpool.c mpool.h default.h sha256.c sha256.h bignum.h \
- bytecode.c bytecode.h clambc.h bignum.c bignum_class.h
+ bytecode.c bytecode.h clambc.h cpio.c cpio.h bignum.c \
+ bignum_class.h
@LINK_TOMMATH_FALSE at am__objects_1 = libclamav_la-bignum.lo
am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
libclamav_la-matcher-bm.lo libclamav_la-matcher.lo \
@@ -159,7 +160,7 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
libclamav_la-js-norm.lo libclamav_la-uniq.lo \
libclamav_la-version.lo libclamav_la-mpool.lo \
libclamav_la-sha256.lo libclamav_la-bytecode.lo \
- $(am__objects_1)
+ libclamav_la-cpio.lo $(am__objects_1)
libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
libclamav_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libclamav_la_CFLAGS) \
@@ -529,7 +530,7 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \
explode.h textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \
jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \
uniq.h version.c version.h mpool.c mpool.h default.h sha256.c \
- sha256.h bignum.h bytecode.c bytecode.h clambc.h \
+ sha256.h bignum.h bytecode.c bytecode.h clambc.h cpio.c cpio.h \
$(am__append_7)
noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la
COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno
@@ -649,6 +650,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-bzlib.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-cab.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-chmunpack.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-cpio.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-cvd.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-dconf.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclamav_la-disasm.Plo at am__quote@
@@ -1248,6 +1250,13 @@ libclamav_la-bytecode.lo: bytecode.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-bytecode.lo `test -f 'bytecode.c' || echo '$(srcdir)/'`bytecode.c
+libclamav_la-cpio.lo: cpio.c
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-cpio.lo -MD -MP -MF $(DEPDIR)/libclamav_la-cpio.Tpo -c -o libclamav_la-cpio.lo `test -f 'cpio.c' || echo '$(srcdir)/'`cpio.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclamav_la-cpio.Tpo $(DEPDIR)/libclamav_la-cpio.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cpio.c' object='libclamav_la-cpio.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-cpio.lo `test -f 'cpio.c' || echo '$(srcdir)/'`cpio.c
+
libclamav_la-bignum.lo: bignum.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-bignum.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bignum.Tpo -c -o libclamav_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclamav_la-bignum.Tpo $(DEPDIR)/libclamav_la-bignum.Plo
diff --git a/libclamav/dconf.c b/libclamav/dconf.c
index 329c2e7..9318c68 100644
--- a/libclamav/dconf.c
+++ b/libclamav/dconf.c
@@ -83,6 +83,7 @@ static struct dconf_module modules[] = {
{ "ARCHIVE", "CHM", ARCH_CONF_CHM, 1 },
{ "ARCHIVE", "OLE2", ARCH_CONF_OLE2, 1 },
{ "ARCHIVE", "TAR", ARCH_CONF_TAR, 1 },
+ { "ARCHIVE", "CPIO", ARCH_CONF_CPIO, 1 },
{ "ARCHIVE", "BINHEX", ARCH_CONF_BINHEX, 1 },
{ "ARCHIVE", "SIS", ARCH_CONF_SIS, 1 },
{ "ARCHIVE", "NSIS", ARCH_CONF_NSIS, 1 },
diff --git a/libclamav/dconf.h b/libclamav/dconf.h
index eecfa86..6263a04 100644
--- a/libclamav/dconf.h
+++ b/libclamav/dconf.h
@@ -73,6 +73,7 @@ struct cli_dconf {
#define ARCH_CONF_NSIS 0x800
#define ARCH_CONF_ARJ 0x1000
#define ARCH_CONF_AUTOIT 0x2000
+#define ARCH_CONF_CPIO 0x4000
/* Document flags */
#define DOC_CONF_HTML 0x1
diff --git a/libclamav/filetypes.c b/libclamav/filetypes.c
index fb37792..b3f35a1 100644
--- a/libclamav/filetypes.c
+++ b/libclamav/filetypes.c
@@ -58,6 +58,10 @@ static const struct ftmap_s {
{ "CL_TYPE_ELF", CL_TYPE_ELF },
{ "CL_TYPE_POSIX_TAR", CL_TYPE_POSIX_TAR },
{ "CL_TYPE_OLD_TAR", CL_TYPE_OLD_TAR },
+ { "CL_TYPE_CPIO_OLD", CL_TYPE_CPIO_OLD },
+ { "CL_TYPE_CPIO_ODC", CL_TYPE_CPIO_ODC },
+ { "CL_TYPE_CPIO_NEWC", CL_TYPE_CPIO_NEWC },
+ { "CL_TYPE_CPIO_CRC", CL_TYPE_CPIO_CRC },
{ "CL_TYPE_GZ", CL_TYPE_GZ },
{ "CL_TYPE_ZIP", CL_TYPE_ZIP },
{ "CL_TYPE_BZ", CL_TYPE_BZ },
diff --git a/libclamav/filetypes.h b/libclamav/filetypes.h
index ecfb216..b1ee94f 100644
--- a/libclamav/filetypes.h
+++ b/libclamav/filetypes.h
@@ -43,6 +43,10 @@ typedef enum {
CL_TYPE_ELF,
CL_TYPE_POSIX_TAR,
CL_TYPE_OLD_TAR,
+ CL_TYPE_CPIO_OLD,
+ CL_TYPE_CPIO_ODC,
+ CL_TYPE_CPIO_NEWC,
+ CL_TYPE_CPIO_CRC,
CL_TYPE_GZ,
CL_TYPE_ZIP,
CL_TYPE_BZ,
diff --git a/libclamav/others.h b/libclamav/others.h
index 4b949aa..8751c3d 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -45,7 +45,7 @@
* in re-enabling affected modules.
*/
-#define CL_FLEVEL 43
+#define CL_FLEVEL 44
#define CL_FLEVEL_DCONF CL_FLEVEL
extern uint8_t cli_debug_flag;
diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index 9751739..bf5b8b3 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -2028,6 +2028,26 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)
ret = cli_scantar(desc, ctx, 0);
break;
+ case CL_TYPE_CPIO_OLD:
+ if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_CPIO))
+ ret = cli_scancpio_old(desc, ctx);
+ break;
+
+ case CL_TYPE_CPIO_ODC:
+ if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_CPIO))
+ ret = cli_scancpio_odc(desc, ctx);
+ break;
+
+ case CL_TYPE_CPIO_NEWC:
+ if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_CPIO))
+ ret = cli_scancpio_newc(desc, ctx, 0);
+ break;
+
+ case CL_TYPE_CPIO_CRC:
+ if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_CPIO))
+ ret = cli_scancpio_newc(desc, ctx, 1);
+ break;
+
case CL_TYPE_BINHEX:
if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_BINHEX))
ret = cli_scanbinhex(desc, ctx);
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list