diff --git a/.cvsignore b/.cvsignore index 9d98152..a1db4d6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-4.24.tar.gz +file-4.25.tar.gz diff --git a/file-4.16-xen.patch b/file-4.16-xen.patch deleted file mode 100644 index fbfef3e..0000000 --- a/file-4.16-xen.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- file-4.16/magic/Localstuff.xen 2003-03-23 05:17:27.000000000 +0100 -+++ file-4.16/magic/Localstuff 2006-02-02 14:17:25.000000000 +0100 -@@ -5,3 +5,9 @@ - # $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ - # Add any locally observed files here. Remember: - # text if readable, executable if runnable binary, data if unreadable. -+ -+# File magic for Xen, the virtual machine monitor for x86 -+0 string LinuxGuestRecord Xen saved domain -+#>2 regex \(name\ [^)]*\) %s -+>20 search/256 (name (name -+>>&1 string x %s...) diff --git a/file-4.17-clamav.patch b/file-4.17-clamav.patch deleted file mode 100644 index 84559de..0000000 --- a/file-4.17-clamav.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- file-4.17/magic/Magdir/fsav.old 2006-03-02 22:50:25.000000000 +0100 -+++ file-4.17/magic/Magdir/fsav 2006-05-22 08:50:58.000000000 +0200 -@@ -54,7 +54,5 @@ - >>>>>>>>37 string x \b%-.1s - >>>>>>>>>38 string !: - >>>>>>>>>>38 string x \b%-.1s -->>>>512 string \037\213 \b, gzipped -->>>>769 string ustar\0 \b, tared - >512 string \037\213 \b, gzipped - >769 string ustar\0 \b, tared diff --git a/file-4.19-debian.patch b/file-4.19-debian.patch deleted file mode 100644 index 5641bda..0000000 --- a/file-4.19-debian.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- file-4.19/src/magic.c.debian 2007-01-09 17:40:50.000000000 +0100 -+++ file-4.19/src/magic.c 2007-01-09 17:42:29.000000000 +0100 -@@ -238,7 +238,7 @@ - int fd = 0; - int rv = -1; - unsigned char *buf; -- struct stat sb; -+ struct stat sb, *st = &sb; - ssize_t nbytes = 0; /* number of bytes read from a datafile */ - int ispipe = 0; - -@@ -253,7 +253,7 @@ - if (file_reset(ms) == -1) - goto done; - -- switch (file_fsmagic(ms, inname, &sb)) { -+ switch (file_fsmagic(ms, inname, st)) { - case -1: /* error */ - goto done; - case 0: /* nothing found */ diff --git a/file-4.19-ooffice.patch b/file-4.19-ooffice.patch deleted file mode 100644 index 0b7a7af..0000000 --- a/file-4.19-ooffice.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- file-4.19/magic/Magdir/archive.ooffice 2007-01-25 11:18:43.000000000 +0100 -+++ file-4.19/magic/Magdir/archive 2007-01-25 11:19:08.000000000 +0100 -@@ -536,8 +536,6 @@ - >4 byte 0x0b Zip archive data, at least v1.1 to extract - >4 byte 0x14 - >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract -->0x161 string WINZIP Zip archive data, WinZIP self-extracting -- - - # OpenOffice.org / KOffice / StarOffice documents - # From: Abel Cheung diff --git a/file-4.21-magic.patch b/file-4.21-magic.patch deleted file mode 100644 index 8067f99..0000000 --- a/file-4.21-magic.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- file-4.21/magic/Magdir/revision.magic 2007-04-09 18:33:07.000000000 +0200 -+++ file-4.21/magic/Magdir/revision 2007-05-28 21:41:15.000000000 +0200 -@@ -4,6 +4,11 @@ - # From Hendrik Scholz - 0 string /1\ :pserver: cvs password text file - -+# Subversion (SVN) dumps -+# Uwe Zeisberger -+0 string SVN-fs-dump-format-version: Subversion dumpfile -+>28 string >\0 (version: %s) -+ - # Conary changesets - # From: Jonathan Smith - 0 belong 0xea3f81bb Conary changeset data ---- file-4.21/magic/Magdir/apple.magic 2006-03-02 23:10:26.000000000 +0100 -+++ file-4.21/magic/Magdir/apple 2007-05-28 21:33:01.000000000 +0200 -@@ -10,6 +10,23 @@ - 0 belong 0x00051600 AppleSingle encoded Macintosh file - 0 belong 0x00051607 AppleDouble encoded Macintosh file - -+# Apple Emulator 2IMG format -+# -+0 string 2IMG Apple ][ 2IMG Disk Image -+>4 string XGS! \b, XGS -+>4 string CTKG \b, Catakig -+>4 string ShIm \b, Sheppy's ImageMaker -+>4 string WOOF \b, Sweet 16 -+>4 string B2TR \b, Bernie ][ the Rescue -+>4 string !nfc \b, ASIMOV2 -+>4 string x \b, Unknown Format -+>0xc byte 00 \b, DOS 3.3 sector order -+>>0x10 byte 00 \b, Volume 254 -+>>0x10 byte&0x7f x \b, Volume %u -+>0xc byte 01 \b, ProDOS sector order -+>>0x14 short x \b, %u Blocks -+>0xc byte 02 \b, NIB data -+ - # magic for Newton PDA package formats - # from Ruda Moura - 0 string package0 Newton package, NOS 1.x, ---- file-4.21/magic/Magdir/images.magic 2007-05-03 17:11:33.000000000 +0200 -+++ file-4.21/magic/Magdir/images 2007-05-28 21:33:01.000000000 +0200 -@@ -525,6 +525,12 @@ - 0 belong 0x0e031301 Hierarchical Data Format (version 4) data - 0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data - -+# The boot loaders syslinux and isolinux use a RLE based image format -+# called SLL16 to store splash screens. -+0 lelong 0x1413f33d Syslinux SLL16 image data, -+>4 leshort >0 %hd x -+>6 leshort >0 %hd -+ - # From: Tobias Burnus - # Xara (for a while: Corel Xara) is a graphic package, see - # http://www.xara.com/ for Windows and as GPL application for ---- file-4.21/magic/magic.mime.magic 2007-04-03 23:11:32.000000000 +0200 -+++ file-4.21/magic/magic.mime 2007-05-28 21:47:26.000000000 +0200 -@@ -196,7 +196,7 @@ - # modified by Joerg Jenderek - # GRR the original test are too common for many DOS files - # so test 1 <= kbits nibble <= E --0 beshort &0xffe0 -+0 beshort&0xfffe =0xfffa audio/mpeg - >2 ubyte&0xF0 >0x0F - >>2 ubyte&0xF0 <0xE1 audio/mpeg - #MP3 with ID3 tag -@@ -402,16 +402,14 @@ - # - # from Daniel Quinlan - # --0 string \14 byte 12 (OS/2 1.x format) - #>14 byte 64 (OS/2 2.x format) - #>14 byte 40 (Windows 3.x format) -@@ -939,6 +937,12 @@ - 0 string fLaC audio/x-flac - 0 string CWS application/x-shockwave-flash - -+ -+# Gnumeric spreadsheet -+# This entry is only semi-helpful, as Gnumeric compresses its files, so -+# they will ordinarily reported as "compressed", but at least -z helps -+39 string = ---- file-4.21/src/fsmagic.c.magic 2007-01-12 18:40:53.000000000 +0100 -+++ file-4.21/src/fsmagic.c 2007-05-28 21:33:01.000000000 +0200 -@@ -92,7 +92,8 @@ - if (file_printf(ms, "cannot open `%s' (%s)", - fn, strerror(errno)) == -1) - return -1; -- return 1; -+ ms->haderr++; -+ return -1; - } - - if ((ms->flags & MAGIC_MIME) != 0) { diff --git a/file-4.21-oracle.patch b/file-4.21-oracle.patch deleted file mode 100644 index 7646a07..0000000 --- a/file-4.21-oracle.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- file-4.21/magic/Magdir/filesystems.oracle 2007-05-16 02:02:54.000000000 +0200 -+++ file-4.21/magic/Magdir/filesystems 2007-05-28 21:55:58.000000000 +0200 -@@ -1197,6 +1197,19 @@ - >>>2 short 2048 AXP generated) - >>>2 short 4096 I64 generated) - -+# Oracle Clustered Filesystem - Aaron Botsis -+8 string OracleCFS Oracle Clustered Filesystem, -+>4 long x rev %d -+>0 long x \b.%d, -+>560 string x label: %.64s, -+>136 string x mountpoint: %.128s -+ -+# Oracle ASM tagged volume - Aaron Botsis -+32 string ORCLDISK Oracle ASM Volume, -+>40 string x Disk Name: %0.12s -+32 string ORCLCLRD Oracle ASM Volume (cleared), -+>40 string x Disk Name: %0.12s -+ - # Compaq/HP RILOE floppy image - # From: Dirk Jagdmann - 0 string CPQRFBLO Compaq/HP RILOE floppy image diff --git a/file-4.23-ext4.patch b/file-4.23-ext4.patch deleted file mode 100644 index 276c1de..0000000 --- a/file-4.23-ext4.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -up file-4.23/magic/Magdir/filesystems.ext4 file-4.23/magic/Magdir/filesystems ---- file-4.23/magic/Magdir/filesystems.ext4 2008-02-01 09:45:02.000000000 +0100 -+++ file-4.23/magic/Magdir/filesystems 2008-02-01 09:46:23.000000000 +0100 -@@ -1025,19 +1025,42 @@ - >&-1248 belong 0 TIME optimization - >&-1248 belong 1 SPACE optimization - --# ext2/ext3 filesystems - Andreas Dilger --0x438 leshort 0xEF53 Linux -->0x44c lelong x rev %d -->0x43e leshort x \b.%d -->0x45c lelong ^0x0000004 ext2 filesystem data -->>0x43a leshort ^0x0000001 (mounted or unclean) -->0x45c lelong &0x0000004 ext3 filesystem data -->>0x460 lelong &0x0000004 (needs journal recovery) -->0x43a leshort &0x0000002 (errors) -->0x460 lelong &0x0000001 (compressed) --#>0x460 lelong &0x0000002 (filetype) --#>0x464 lelong &0x0000001 (sparse_super) -->0x464 lelong &0x0000002 (large files) -+# ext2/ext3 filesystems - Andreas Dilger -+# ext4 filesystem - Eric Sandeen -+0x438 leshort 0xEF53 Linux -+>0x44c lelong x rev %d -+>0x43e leshort x \b.%d -+# No journal? ext2 -+>0x45c lelong ^0x0000004 ext2 filesystem data -+>>0x43a leshort ^0x0000001 (mounted or unclean) -+# Has a journal? ext3 or ext4 -+>0x45c lelong &0x0000004 -+# and small INCOMPAT? -+>>0x460 lelong <0x0000040 -+# and small RO_COMPAT? -+>>>0x464 lelong <0x0000008 ext3 filesystem data -+# else large RO_COMPAT? -+>>>0x464 lelong >0x0000007 ext4 filesystem data -+# else large INCOMPAT? -+>>0x460 lelong >0x000003f ext4 filesystem data -+# General flags for any ext* fs -+>0x460 lelong &0x0000004 (needs journal recovery) -+>0x43a leshort &0x0000002 (errors) -+# INCOMPAT flags -+>0x460 lelong &0x0000001 (compressed) -+#>0x460 lelong &0x0000002 (filetype) -+#>0x460 lelong &0x0000010 (meta bg) -+>0x460 lelong &0x0000040 (extents) -+>0x460 lelong &0x0000080 (64bit) -+#>0x460 lelong &0x0000100 (mmp) -+#>0x460 lelong &0x0000200 (flex bg) -+# RO_INCOMPAT flags -+#>0x464 lelong &0x0000001 (sparse super) -+>0x464 lelong &0x0000002 (large files) -+>0x464 lelong &0x0000008 (huge files) -+#>0x464 lelong &0x0000010 (gdt checksum) -+#>0x464 lelong &0x0000020 (many subdirs) -+#>0x463 lelong &0x0000040 (extra isize) - - # SGI disk labels - Nathan Scott - 0 belong 0x0BE5A941 SGI disk label (volume header) diff --git a/file-4.23-msoffice.patch b/file-4.23-msoffice.patch deleted file mode 100644 index 4110c56..0000000 --- a/file-4.23-msoffice.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up file-4.23/magic/magic.mime.msoffice file-4.23/magic/magic.mime ---- file-4.23/magic/magic.mime.msoffice 2008-01-28 13:04:11.000000000 +0100 -+++ file-4.23/magic/magic.mime 2008-01-28 13:04:11.000000000 +0100 -@@ -883,6 +883,7 @@ - 0 string \320\317\021\340\241\261\032\341 - >546 string bjbj application/msword - >546 string jbjb application/msword -+>546 default x application/msword - - 512 string R\0o\0o\0t\0\ \0E\0n\0t\0r\0y application/msword - -@@ -891,7 +892,6 @@ - 2112 string MSWordDoc application/msword - - #0 string \320\317\021\340\241\261\032\341 application/powerpoint --0 string \320\317\021\340\241\261\032\341 application/msword - - 0 string #\ PaCkAgE\ DaTaStReAm application/x-svr4-package - -diff -up file-4.23/magic/Magdir/msdos.msoffice file-4.23/magic/Magdir/msdos diff --git a/file-4.23-tryelf.patch b/file-4.23-tryelf.patch deleted file mode 100644 index c00f803..0000000 --- a/file-4.23-tryelf.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up file-4.23/src/readelf.c.tryelf file-4.23/src/readelf.c ---- file-4.23/src/readelf.c.tryelf 2008-01-31 08:05:27.000000000 +0100 -+++ file-4.23/src/readelf.c 2008-01-31 08:04:07.000000000 +0100 -@@ -983,7 +983,6 @@ file_tryelf(struct magic_set *ms, int fd - break; - #endif - case ET_EXEC: -- case ET_DYN: - if (dophn_exec(ms, class, swap, - fd, (off_t)getu32(swap, elfhdr.e_phoff), - getu16(swap, elfhdr.e_phnum), -@@ -991,6 +990,8 @@ file_tryelf(struct magic_set *ms, int fd - fsize, &flags, getu16(swap, elfhdr.e_shnum)) - == -1) - return -1; -+ case ET_DYN: -+ default: - if (doshn(ms, class, swap, fd, - (off_t)getu32(swap, elfhdr.e_shoff), - getu16(swap, elfhdr.e_shnum), -@@ -998,9 +999,6 @@ file_tryelf(struct magic_set *ms, int fd - &flags) == -1) - return -1; - break; -- -- default: -- break; - } - return 1; - } diff --git a/file-4.24-ELF.patch b/file-4.24-ELF.patch deleted file mode 100644 index 722f833..0000000 --- a/file-4.24-ELF.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up file-4.24/src/elfclass.h.ELF file-4.24/src/elfclass.h ---- file-4.24/src/elfclass.h.ELF 2008-05-07 11:25:23.000000000 +0200 -+++ file-4.24/src/elfclass.h 2008-05-07 11:32:11.000000000 +0200 -@@ -49,7 +49,8 @@ - (off_t)elf_getu(swap, elfhdr.e_phoff), - elf_getu16(swap, elfhdr.e_phnum), - (size_t)elf_getu16(swap, elfhdr.e_phentsize), -- fsize, &flags) == -1) -+ fsize, &flags, elf_getu16(swap, elfhdr.e_shnum)) -+ == -1) - return -1; - /*FALLTHROUGH*/ - case ET_REL: -diff -up file-4.24/src/readelf.c.ELF file-4.24/src/readelf.c ---- file-4.24/src/readelf.c.ELF 2008-05-07 11:25:33.000000000 +0200 -+++ file-4.24/src/readelf.c 2008-05-07 11:34:38.000000000 +0200 -@@ -46,7 +46,7 @@ private int dophn_core(struct magic_set - off_t, int *); - #endif - private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t, -- off_t, int *); -+ off_t, int *, int); - private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, int *); - private size_t donote(struct magic_set *, unsigned char *, size_t, size_t, int, - int, size_t, int *); -@@ -838,7 +838,7 @@ doshn(struct magic_set *ms, int class, i - */ - private int - dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off, -- int num, size_t size, off_t fsize, int *flags) -+ int num, size_t size, off_t fsize, int *flags, int sh_num) - { - Elf32_Phdr ph32; - Elf64_Phdr ph64; -@@ -907,6 +907,8 @@ dophn_exec(struct magic_set *ms, int cla - return -1; - align = 4; - } -+ if (sh_num) -+ break; - /* - * This is a PT_NOTE section; loop through all the notes - * in the section. diff --git a/file-4.24-berkeley.patch b/file-4.24-berkeley.patch deleted file mode 100644 index cf7d90c..0000000 --- a/file-4.24-berkeley.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up file-4.24/magic/Makefile.in.berkeley file-4.24/magic/Makefile.in ---- file-4.24/magic/Makefile.in.berkeley 2008-05-06 13:49:07.000000000 +0200 -+++ file-4.24/magic/Makefile.in 2008-05-06 13:50:41.000000000 +0200 -@@ -204,10 +204,10 @@ $(MAGIC_FRAGMENT_DIR)/communications \ - $(MAGIC_FRAGMENT_DIR)/compress \ - $(MAGIC_FRAGMENT_DIR)/console \ - $(MAGIC_FRAGMENT_DIR)/convex \ --$(MAGIC_FRAGMENT_DIR)/cracklib \ - $(MAGIC_FRAGMENT_DIR)/ctags \ - $(MAGIC_FRAGMENT_DIR)/dact \ - $(MAGIC_FRAGMENT_DIR)/database \ -+$(MAGIC_FRAGMENT_DIR)/cracklib \ - $(MAGIC_FRAGMENT_DIR)/diamond \ - $(MAGIC_FRAGMENT_DIR)/diff \ - $(MAGIC_FRAGMENT_DIR)/digital \ diff --git a/file-4.24-efi.patch b/file-4.24-efi.patch deleted file mode 100644 index b4f52d7..0000000 --- a/file-4.24-efi.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up file-4.24/magic/Magdir/msdos.efi file-4.24/magic/Magdir/msdos ---- file-4.24/magic/Magdir/msdos.efi 2008-03-28 19:06:25.000000000 +0100 -+++ file-4.24/magic/Magdir/msdos 2008-05-06 14:23:44.000000000 +0200 -@@ -45,8 +45,9 @@ - # - # many of the compressed formats were extraced from IDARC 1.23 source code - # --0 string MZ MS-DOS executable -+0 string MZ - !:mime application/x-dosexec -+>0x18 leshort <0x40 MS-DOS executable - >0 string MZ\0\0\0\0\0\0\0\0\0\0PE\0\0 \b, PE for MS Windows - >>&18 leshort&0x2000 >0 (DLL) - >>&88 leshort 0 (unknown subsystem) -@@ -72,27 +73,35 @@ - !:mime application/zip - - >0x18 leshort >0x3f -->>(0x3c.l) string PE\0\0 PE -+>>(0x3c.l) string PE\0\0 PE -+>>>(0x3c.l+25) byte 1 \b32 executable -+>>>(0x3c.l+25) byte 2 \b32+ executable - # hooray, there's a DOS extender using the PE format, with a valid PE - # executable inside (which just prints a message and exits if run in win) -->>>(8.s*16) string 32STUB for MS-DOS, 32rtm DOS extender -->>>(8.s*16) string !32STUB for MS Windows -->>>>(0x3c.l+22) leshort&0x2000 >0 (DLL) -->>>>(0x3c.l+92) leshort 0 (unknown subsystem) -->>>>(0x3c.l+92) leshort 1 (native) -->>>>(0x3c.l+92) leshort 2 (GUI) -->>>>(0x3c.l+92) leshort 3 (console) -->>>>(0x3c.l+92) leshort 7 (POSIX) -->>>>(0x3c.l+4) leshort 0x0 unknown processor -->>>>(0x3c.l+4) leshort 0x14c Intel 80386 -->>>>(0x3c.l+4) leshort 0x166 MIPS R4000 -->>>>(0x3c.l+4) leshort 0x184 Alpha -->>>>(0x3c.l+4) leshort 0x268 Motorola 68000 -->>>>(0x3c.l+4) leshort 0x1f0 PowerPC -->>>>(0x3c.l+4) leshort 0x290 PA-RISC -->>>>(0x3c.l+22) leshort&0x0100 >0 32-bit -->>>>(0x3c.l+22) leshort&0x1000 >0 system file -->>>>(0x3c.l+232) lelong >0 Mono/.Net assembly -+>>>(0x3c.l+92) leshort <10 -+>>>>(8.s*16) string 32STUB for MS-DOS, 32rtm DOS extender -+>>>>(8.s*16) string !32STUB for MS Windows -+>>>>>(0x3c.l+22) leshort&0x2000 >0 (DLL) -+>>>>>(0x3c.l+92) leshort 0 (unknown subsystem) -+>>>>>(0x3c.l+92) leshort 1 (native) -+>>>>>(0x3c.l+92) leshort 2 (GUI) -+>>>>>(0x3c.l+92) leshort 3 (console) -+>>>>>(0x3c.l+92) leshort 7 (POSIX) -+>>>(0x3c.l+92) leshort 10 (EFI application) -+>>>(0x3c.l+92) leshort 11 (EFI boot service driver) -+>>>(0x3c.l+92) leshort 12 (EFI runtime driver) -+>>>(0x3c.l+92) leshort 13 (XBOX) -+>>>(0x3c.l+4) leshort 0x0 unknown processor -+>>>(0x3c.l+4) leshort 0x14c Intel 80386 -+>>>(0x3c.l+4) leshort 0x166 MIPS R4000 -+>>>(0x3c.l+4) leshort 0x184 Alpha -+>>>(0x3c.l+4) leshort 0x268 Motorola 68000 -+>>>(0x3c.l+4) leshort 0x1f0 PowerPC -+>>>(0x3c.l+4) leshort 0x290 PA-RISC -+>>>(0x3c.l+4) leshort 0x200 Intel Itanium -+>>>(0x3c.l+22) leshort&0x0100 >0 32-bit -+>>>(0x3c.l+22) leshort&0x1000 >0 system file -+>>>(0x3c.l+232) lelong >0 Mono/.Net assembly - - >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed - >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed -@@ -121,6 +130,8 @@ - >>>>&(0x3c.l+0xf8) search/0x100 SharedD \b, Microsoft Installer self-extracting archive - >>>>0x30 string Inno \b, InnoSetup self-extracting archive - -+>>(0x3c.l) string !PE\0\0 MS-DOS executable -+ - >>(0x3c.l) string NE \b, NE - >>>(0x3c.l+0x36) byte 0 (unknown OS) - >>>(0x3c.l+0x36) byte 1 for OS/2 1.x diff --git a/file-4.24-flc.patch b/file-4.24-flc.patch deleted file mode 100644 index 1075695..0000000 --- a/file-4.24-flc.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- file-4.24/magic/Magdir/animation 2008-02-20 01:27:27.000000000 +0800 -+++ file-4.24-new/magic/Magdir/animation 2008-04-25 12:58:24.000000000 +0800 -@@ -616,22 +616,30 @@ - #0 beshort 0x4DE1 MPEG-4 LO-EP audio stream - #!:mime audio/x-mp4a-latm - --# FLI animation format --4 leshort 0xAF11 FLI file -+# Summary: FLI animation format -+# Created by: Daniel Quinlan -+# Modified by (1): Abel Cheung (avoid over-generic detection) -+4 leshort 0xAF11 -+# standard FLI always has 320x200 resolution and 8 bit color -+>8 leshort 320 -+>>10 leshort 200 -+>>>12 leshort 8 FLI animation, 320x200x8 - !:mime video/x-fli -->6 leshort x - %d frames, -->8 leshort x width=%d pixels, -->10 leshort x height=%d pixels, -->12 leshort x depth=%d, -->16 leshort x ticks/frame=%d --# FLC animation format --4 leshort 0xAF12 FLC file -+>>>>6 leshort x \b, %d frames -+# frame speed is multiple of 1/70s -+>>>>16 leshort x \b, %d/70s per frame -+ -+# Summary: FLC animation format -+# Created by: Daniel Quinlan -+# Modified by (1): Abel Cheung (avoid over-generic detection) -+4 leshort 0xAF12 -+# standard FLC always use 8 bit color -+>12 leshort 8 FLC animation - !:mime video/x-flc -->6 leshort x - %d frames -->8 leshort x width=%d pixels, -->10 leshort x height=%d pixels, -->12 leshort x depth=%d, -->16 leshort x ticks/frame=%d -+>>8 leshort x \b, %d -+>>10 leshort x \bx%dx8 -+>>6 uleshort x \b, %d frames -+>>16 uleshort x \b, %dms per frame - - # DL animation format - # XXX - collision with most `mips' magic diff --git a/file-4.24-fsdump.patch b/file-4.24-fsdump.patch deleted file mode 100644 index 3057b2d..0000000 --- a/file-4.24-fsdump.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up file-4.24/magic/Makefile.in.fsdump file-4.24/magic/Makefile.in ---- file-4.24/magic/Makefile.in.fsdump 2008-03-22 22:41:06.000000000 +0100 -+++ file-4.24/magic/Makefile.in 2008-05-06 13:44:45.000000000 +0200 -@@ -211,11 +211,11 @@ $(MAGIC_FRAGMENT_DIR)/diamond \ - $(MAGIC_FRAGMENT_DIR)/diff \ - $(MAGIC_FRAGMENT_DIR)/digital \ - $(MAGIC_FRAGMENT_DIR)/dolby \ --$(MAGIC_FRAGMENT_DIR)/dump \ - $(MAGIC_FRAGMENT_DIR)/dyadic \ - $(MAGIC_FRAGMENT_DIR)/editors \ - $(MAGIC_FRAGMENT_DIR)/efi \ - $(MAGIC_FRAGMENT_DIR)/elf \ -+$(MAGIC_FRAGMENT_DIR)/dump \ - $(MAGIC_FRAGMENT_DIR)/encore \ - $(MAGIC_FRAGMENT_DIR)/epoc \ - $(MAGIC_FRAGMENT_DIR)/erlang \ diff --git a/file-4.24-gfs2.patch b/file-4.24-gfs2.patch deleted file mode 100644 index 88a3300..0000000 --- a/file-4.24-gfs2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up file-4.24/magic/Magdir/filesystems.orig file-4.24/magic/Magdir/filesystems ---- file-4.24/magic/Magdir/filesystems.orig 2008-06-04 08:16:57.000000000 +0200 -+++ file-4.24/magic/Magdir/filesystems 2008-06-04 08:19:34.000000000 +0200 -@@ -1302,3 +1302,9 @@ - # really le32 operation,destination,payloadsize (but quite predictable) - # 01 00 00 00 00 00 00 c0 00 02 00 00 - 0 string \1\0\0\0\0\0\0\300\0\2\0\0 Marvell Libertas firmware -+ -+# From Eric Sandeen -+# GFS2 -+0x10000 belong 0x01161970 GFS2 Filesystem -+>0x10024 belong x (blocksize %d, -+>0x10060 string >\0 lockproto %s) diff --git a/file-4.24-lvm.patch b/file-4.24-lvm.patch deleted file mode 100644 index c3e6bb3..0000000 --- a/file-4.24-lvm.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up file-4.24/magic/Magdir/linux.orig file-4.24/magic/Magdir/linux ---- file-4.24/magic/Magdir/linux.orig 2008-06-04 08:21:06.000000000 +0200 -+++ file-4.24/magic/Magdir/linux 2008-06-04 08:23:04.000000000 +0200 -@@ -231,6 +231,14 @@ - 0x618 string LVM2\ 001 LVM2 (Linux Logical Volume Manager) - >(0x614.l+0x600) string >\0 , UUID: %s - -+# LVM snapshot -+# from Jason Farrell -+0 string SnAp LVM Snapshot (CopyOnWrite store) -+>4 lelong !0 - valid, -+>4 lelong 0 - invalid, -+>8 lelong x version = %d, -+>12 lelong x chunk_size = %d -+ - # SE Linux policy database - 0 lelong 0xf97cff8c SE Linux policy - >16 lelong x v%d diff --git a/file-4.24-oracle.patch b/file-4.24-oracle.patch deleted file mode 100644 index 9c15004..0000000 --- a/file-4.24-oracle.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up file-4.24/magic/Magdir/filesystems.orig file-4.24/magic/Magdir/filesystems ---- file-4.24/magic/Magdir/filesystems.orig 2008-02-19 18:27:29.000000000 +0100 -+++ file-4.24/magic/Magdir/filesystems 2008-06-03 15:34:34.000000000 +0200 -@@ -1266,6 +1266,19 @@ - >>>2 short 2048 AXP generated) - >>>2 short 4096 I64 generated) - -+# Oracle Clustered Filesystem - Aaron Botsis -+8 string OracleCFS Oracle Clustered Filesystem, -+>4 long x rev %d -+>0 long x \b.%d, -+>560 string x label: %.64s, -+>136 string x mountpoint: %.128s -+ -+# Oracle ASM tagged volume - Aaron Botsis -+32 string ORCLDISK Oracle ASM Volume, -+>40 string x Disk Name: %0.12s -+32 string ORCLCLRD Oracle ASM Volume (cleared), -+>40 string x Disk Name: %0.12s -+ - # Compaq/HP RILOE floppy image - # From: Dirk Jagdmann - 0 string CPQRFBLO Compaq/HP RILOE floppy image diff --git a/file-4.24-quick.patch b/file-4.24-quick.patch deleted file mode 100644 index eb900f5..0000000 --- a/file-4.24-quick.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up file-4.24/magic/Makefile.in.quick file-4.24/magic/Makefile.in ---- file-4.24/magic/Makefile.in.quick 2008-05-06 13:46:23.000000000 +0200 -+++ file-4.24/magic/Makefile.in 2008-05-06 13:47:49.000000000 +0200 -@@ -172,6 +172,7 @@ $(MAGIC_FRAGMENT_DIR)/alliant \ - $(MAGIC_FRAGMENT_DIR)/alpha \ - $(MAGIC_FRAGMENT_DIR)/amanda \ - $(MAGIC_FRAGMENT_DIR)/amigaos \ -+$(MAGIC_FRAGMENT_DIR)/mail.news \ - $(MAGIC_FRAGMENT_DIR)/animation \ - $(MAGIC_FRAGMENT_DIR)/apl \ - $(MAGIC_FRAGMENT_DIR)/apple \ -@@ -264,7 +265,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ - $(MAGIC_FRAGMENT_DIR)/mach \ - $(MAGIC_FRAGMENT_DIR)/macintosh \ - $(MAGIC_FRAGMENT_DIR)/magic \ --$(MAGIC_FRAGMENT_DIR)/mail.news \ - $(MAGIC_FRAGMENT_DIR)/maple \ - $(MAGIC_FRAGMENT_DIR)/mathcad \ - $(MAGIC_FRAGMENT_DIR)/mathematica \ diff --git a/file-4.24-selinux.patch b/file-4.24-selinux.patch deleted file mode 100644 index d6d284e..0000000 --- a/file-4.24-selinux.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up file-4.24/magic/Makefile.am.selinux file-4.24/magic/Makefile.am ---- file-4.24/magic/Makefile.am.selinux 2008-03-22 22:41:00.000000000 +0100 -+++ file-4.24/magic/Makefile.am 2008-05-06 13:32:36.000000000 +0200 -@@ -149,6 +149,7 @@ $(MAGIC_FRAGMENT_DIR)/pgp \ - $(MAGIC_FRAGMENT_DIR)/pkgadd \ - $(MAGIC_FRAGMENT_DIR)/plan9 \ - $(MAGIC_FRAGMENT_DIR)/plus5 \ -+$(MAGIC_FRAGMENT_DIR)/policy \ - $(MAGIC_FRAGMENT_DIR)/printer \ - $(MAGIC_FRAGMENT_DIR)/project \ - $(MAGIC_FRAGMENT_DIR)/psdbms \ -diff -up /dev/null file-4.24/magic/Magdir/policy ---- /dev/null 2008-04-14 09:39:21.445009731 +0200 -+++ file-4.24/magic/Magdir/policy 2008-05-06 13:29:35.000000000 +0200 -@@ -0,0 +1,6 @@ -+# SE Linux policy database -+0 lelong 0xf97cff8c SE Linux policy -+>16 lelong x v%d -+>20 lelong 1 MLS -+>24 lelong x %d symbols -+>28 lelong x %d ocons diff --git a/file.spec b/file.spec index f1a95bc..49800ab 100644 --- a/file.spec +++ b/file.spec @@ -4,19 +4,13 @@ Summary: A utility for determining file types Name: file -Version: 4.24 -Release: 4%{?dist} +Version: 4.25 +Release: 1%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ -Patch1: file-4.24-lvm.patch -Patch2: file-4.24-oracle.patch -Patch3: file-4.24-ELF.patch -patch4: file-4.24-efi.patch -patch5: file-4.21-pybuild.patch -patch6: file-4.24-flc.patch -patch7: file-4.24-gfs2.patch +patch0: file-4.21-pybuild.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,13 +56,7 @@ file(1) command. %prep # Don't use -b -- it will lead to poblems when compiling magic file %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%patch0 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -142,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 21 2008 Tomas Smetana - 4.25-1 +- new upstream version; drop upstreamed patches + * Fri Jun 06 2008 Tomas Smetana - 4.24-4 - add GFS2 filesystem magic; thanks to Eric Sandeen - add LVM snapshots magic (#449755); thanks to Jason Farrell diff --git a/sources b/sources index 4165207..1a3b266 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1efef03c9aac5515538f04cf3fc73eba file-4.24.tar.gz +cdf1f90d2704e71118353c16c19898ba file-4.25.tar.gz