[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:59 UTC 2010 

The following commit has been merged in the debian/unstable branch:
commit 094127dd664bcc663aef1fae02a66b840c867776
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Jul 6 16:56:32 2009 +0200

    test: add cpio test files

diff --git a/ChangeLog b/ChangeLog
index f0048ba..976cbf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul  6 16:56:06 CEST 2009 (tk)
+----------------------------------
+ * test: add cpio test files
+
 Thu Jul  2 17:05:12 CEST 2009 (tk)
 ----------------------------------
  * libclamav: add support for cpio archives (bb#1649)
diff --git a/libclamav/filetypes_int.h b/libclamav/filetypes_int.h
index d79dd4d..3a0d06e 100644
--- a/libclamav/filetypes_int.h
+++ b/libclamav/filetypes_int.h
@@ -1,7 +1,7 @@
 /*
  *  Static filetype data for use when daily.ftm is not available.
  *
- *  Copyright (C) 2007-2008 Sourcefire, Inc.
+ *  Copyright (C) 2007-2009 Sourcefire, Inc.
  *
  *  Authors: Tomasz Kojm
  *
@@ -139,6 +139,11 @@ static const char *ftypes_int[] = {
   "1:0,1024:0a(4d|6d)(49|69)(4d|6d)(45|65)2d(56|76)657273696f6e3a20{-2048}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL",
   "1:0,1024:0a(4d|6d)6573736167652d(49|69)643a20{-1024}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL",
   "1:0,1024:0a(52|72)656365697665643a20{-2048}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL",
+  "0:0:303730373031:CPIO NEWC:CL_TYPE_ANY:CL_TYPE_CPIO_NEWC:44",
+  "0:0:303730373032:CPIO CRC:CL_TYPE_ANY:CL_TYPE_CPIO_CRC:44",
+  "0:0:303730373037:CPIO ODC:CL_TYPE_ANY:CL_TYPE_CPIO_ODC:44",
+  "0:0:71c7:CPIO OLD BINARY BE:CL_TYPE_ANY:CL_TYPE_CPIO_OLD:44",
+  "0:0:c771:CPIO OLD BINARY LE:CL_TYPE_ANY:CL_TYPE_CPIO_OLD:44",
   NULL
 };
 
diff --git a/contrib/test/clam.exe b/test/.split/split.clam.bin-be.cpioaa
similarity index 63%
copy from contrib/test/clam.exe
copy to test/.split/split.clam.bin-be.cpioaa
index 7fa9143..7f0b53f 100644
Binary files a/contrib/test/clam.exe and b/test/.split/split.clam.bin-be.cpioaa differ
diff --git a/test/.split/split.clam.bin-be.cpioab b/test/.split/split.clam.bin-be.cpioab
new file mode 100644
index 0000000..0e1c758
Binary files /dev/null and b/test/.split/split.clam.bin-be.cpioab differ
diff --git a/contrib/test/clam.exe b/test/.split/split.clam.bin-le.cpioaa
similarity index 63%
copy from contrib/test/clam.exe
copy to test/.split/split.clam.bin-le.cpioaa
index 7fa9143..6742dd0 100644
Binary files a/contrib/test/clam.exe and b/test/.split/split.clam.bin-le.cpioaa differ
diff --git a/test/.split/split.clam.bin-le.cpioab b/test/.split/split.clam.bin-le.cpioab
new file mode 100644
index 0000000..770a3d8
Binary files /dev/null and b/test/.split/split.clam.bin-le.cpioab differ
diff --git a/test/.split/split.clam.newc.cpioaa b/test/.split/split.clam.newc.cpioaa
new file mode 100644
index 0000000..fdb6e31
Binary files /dev/null and b/test/.split/split.clam.newc.cpioaa differ
diff --git a/test/.split/split.clam.newc.cpioab b/test/.split/split.clam.newc.cpioab
new file mode 100644
index 0000000..5bd8aaa
Binary files /dev/null and b/test/.split/split.clam.newc.cpioab differ
diff --git a/contrib/test/clam.exe b/test/.split/split.clam.odc.cpioaa
similarity index 51%
copy from contrib/test/clam.exe
copy to test/.split/split.clam.odc.cpioaa
index 7fa9143..e102564 100644
Binary files a/contrib/test/clam.exe and b/test/.split/split.clam.odc.cpioaa differ
diff --git a/test/.split/split.clam.odc.cpioab b/test/.split/split.clam.odc.cpioab
new file mode 100644
index 0000000..be2223d
Binary files /dev/null and b/test/.split/split.clam.odc.cpioab differ
diff --git a/test/Makefile.am b/test/Makefile.am
index 780cd26..147ab0b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,8 @@ FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
 	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf\
 	clam.mail clam.ppt clam.tnef clam.ea05.exe clam.ea06.exe clam.d64.zip\
 	clam.exe.mbox.base64 clam.exe.mbox.uu clam.exe.binhex clam.ole.doc \
-	clam.impl.zip clam.exe.html clam.bz2.zip
+	clam.impl.zip clam.exe.html clam.bz2.zip clam.bin-be.cpio clam.bin-le.cpio \
+	clam.newc.cpio clam.odc.cpio
 
 SPLIT_DIR=$(top_srcdir)/test/.split
 
diff --git a/test/Makefile.in b/test/Makefile.in
index d7329b0..31fc788 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -213,7 +213,8 @@ FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
 	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf\
 	clam.mail clam.ppt clam.tnef clam.ea05.exe clam.ea06.exe clam.d64.zip\
 	clam.exe.mbox.base64 clam.exe.mbox.uu clam.exe.binhex clam.ole.doc \
-	clam.impl.zip clam.exe.html clam.bz2.zip
+	clam.impl.zip clam.exe.html clam.bz2.zip clam.bin-be.cpio clam.bin-le.cpio \
+	clam.newc.cpio clam.odc.cpio
 
 SPLIT_DIR = $(top_srcdir)/test/.split
 EXTRA_DIST = .split
diff --git a/unit_tests/input/daily.ftm b/unit_tests/input/daily.ftm
index 8803586..2f4b1f7 100644
--- a/unit_tests/input/daily.ftm
+++ b/unit_tests/input/daily.ftm
@@ -58,10 +58,6 @@
 0:6:45786966:JPEG:CL_TYPE_ANY:CL_TYPE_GRAPHICS
 0:6:4a464946:JPEG:CL_TYPE_ANY:CL_TYPE_GRAPHICS
 0:8:19040010:SIS:CL_TYPE_ANY:CL_TYPE_SIS
-1:*:0a46726f6d3a20{-1024}0a4d494d452d56657273696f6e3a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
-1:*:0a46726f6d3a20{-2048}0a436f6e74656e742d547970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
-1:*:0a52656365697665643a20{-2048}0a436f6e74656e742d547970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
-1:*:0a52656365697665643a20{-2048}0a436f6e74656e742d747970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
 1:*:3c4120*(68|48)(72|52)4546:HTML data:CL_TYPE_ANY:CL_TYPE_HTML
 1:*:3c4120*(68|48)(72|52)6566:HTML data:CL_TYPE_ANY:CL_TYPE_HTML
 1:*:3c484541443e:HTML data:CL_TYPE_ANY:CL_TYPE_HTML
@@ -85,7 +81,6 @@
 1:*:3c6f626a656374:HTML data:CL_TYPE_ANY:CL_TYPE_HTML
 1:*:3c736372697074:HTML data:CL_TYPE_ANY:CL_TYPE_HTML
 1:*:3c7461626c65:HTML data:CL_TYPE_ANY:CL_TYPE_HTML
-1:*:4d494d452d56657273696f6e3a20{-2048}0a436f6e74656e742d547970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
 1:*:4d534346:CAB-SFX:CL_TYPE_ANY:CL_TYPE_CABSFX
 1:*:4d5a{60-300}50450000:PE:CL_TYPE_ANY:CL_TYPE_MSEXE
 1:*:504b0304:ZIP-SFX:CL_TYPE_ANY:CL_TYPE_ZIPSFX
@@ -101,3 +96,14 @@
 1:*:255044462d??2e:PDF:CL_TYPE_ANY:CL_TYPE_PDF:30
 1:*:257064662d??2e:PDF:CL_TYPE_ANY:CL_TYPE_PDF:30
 0:257:7573746172:TAR-POSIX:CL_TYPE_ANY:CL_TYPE_POSIX_TAR
+0:0:5b616c69617365735d:mirc ini:CL_TYPE_ANY:CL_TYPE_SCRIPT
+1:0,1024:0a(46|66)726f6d3a20{-1024}0a(4d|6d)(49|69)(4d|6d)(45|65)2d(56|76)657273696f6e3a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
+1:0,1024:0a(46|66)726f6d3a20{-2048}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
+1:0,1024:0a(4d|6d)(49|69)(4d|6d)(45|65)2d(56|76)657273696f6e3a20{-2048}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
+1:0,1024:0a(4d|6d)6573736167652d(49|69)643a20{-1024}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
+1:0,1024:0a(52|72)656365697665643a20{-2048}0a(43|63)6f6e74656e742d(54|74)7970653a20:Mail file:CL_TYPE_ANY:CL_TYPE_MAIL
+0:0:303730373031:CPIO NEWC:CL_TYPE_ANY:CL_TYPE_CPIO_NEWC:44
+0:0:303730373032:CPIO CRC:CL_TYPE_ANY:CL_TYPE_CPIO_CRC:44
+0:0:303730373037:CPIO ODC:CL_TYPE_ANY:CL_TYPE_CPIO_ODC:44
+0:0:71c7:CPIO OLD BINARY BE:CL_TYPE_ANY:CL_TYPE_CPIO_OLD:44
+0:0:c771:CPIO OLD BINARY LE:CL_TYPE_ANY:CL_TYPE_CPIO_OLD:44

-- 
Debian repository for ClamAV

More information about the Pkg-clamav-commits mailing list