diff --git a/file-5.04-generic-msdos.patch b/file-5.04-generic-msdos.patch new file mode 100644 index 0000000..9fe086c --- /dev/null +++ b/file-5.04-generic-msdos.patch @@ -0,0 +1,98 @@ +diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos +index d1a19a6..9e89f11 100644 +--- a/magic/Magdir/msdos ++++ b/magic/Magdir/msdos +@@ -319,9 +319,9 @@ + # but it isn't feasible to match all COM files since there must be at least + # two dozen different one-byte "magics". + # test too generic ? +-0 byte 0xe9 DOS executable (COM) +->0x1FE leshort 0xAA55 \b, boot code +->6 string SFX\ of\ LHarc (%s) ++#0 byte 0xe9 DOS executable (COM) ++#>0x1FE leshort 0xAA55 \b, boot code ++#>6 string SFX\ of\ LHarc (%s) + + # DOS device driver updated by Joerg Jenderek at May 2011 + # http://maben.homeip.net/static/S100/IBM/software/DOS/DOS%20techref/CHAPTER.009 +@@ -396,28 +396,28 @@ + #>4 uleshort&0x4000 0x4000 \b,control strings-support) + + # test too generic ? +-0 byte 0x8c DOS executable (COM) ++#0 byte 0x8c DOS executable (COM) + # updated by Joerg Jenderek at Oct 2008 + 0 ulelong 0xffff10eb DR-DOS executable (COM) + # byte 0xeb conflicts with "sequent" magic leshort 0xn2eb +-0 ubeshort&0xeb8d >0xeb00 ++#0 ubeshort&0xeb8d >0xeb00 + # DR-DOS STACKER.COM SCREATE.SYS missed +->0 byte 0xeb +->>0x1FE leshort 0xAA55 DOS executable (COM), boot code +->>85 string UPX DOS executable (COM), UPX compressed +->>4 string \ $ARX DOS executable (COM), ARX self-extracting archive +->>4 string \ $LHarc DOS executable (COM), LHarc self-extracting archive +->>0x20e string SFX\ by\ LARC DOS executable (COM), LARC self-extracting archive ++#>0 byte 0xeb ++#>>0x1FE leshort 0xAA55 DOS executable (COM), boot code ++#>>85 string UPX DOS executable (COM), UPX compressed ++#>>4 string \ $ARX DOS executable (COM), ARX self-extracting archive ++#>>4 string \ $LHarc DOS executable (COM), LHarc self-extracting archive ++#>>0x20e string SFX\ by\ LARC DOS executable (COM), LARC self-extracting archive + # updated by Joerg Jenderek at Oct 2008 + #0 byte 0xb8 COM executable +-0 uleshort&0x80ff 0x00b8 ++#0 uleshort&0x80ff 0x00b8 + # modified by Joerg Jenderek +->1 lelong !0x21cd4cff COM executable for DOS ++#>1 lelong !0x21cd4cff COM executable for DOS + # http://syslinux.zytor.com/comboot.php + # (32-bit COMBOOT) programs *.C32 contain 32-bit code and run in flat-memory 32-bit protected mode + # start with assembler instructions mov eax,21cd4cffh +-0 uleshort&0xc0ff 0xc0b8 +->1 lelong 0x21cd4cff COM executable (32-bit COMBOOT) ++#0 uleshort&0xc0ff 0xc0b8 ++#>1 lelong 0x21cd4cff COM executable (32-bit COMBOOT) + # syslinux:doc/comboot.txt + # A COM32R program must start with the byte sequence B8 FE 4C CD 21 (mov + # eax,21cd4cfeh) as a magic number. +@@ -437,27 +437,27 @@ + # GRR search is not working + #2 search/28 \xcd\x21 COM executable for MS-DOS + #WHICHFAT.cOM +-2 string \xcd\x21 COM executable for DOS ++#2 string \xcd\x21 COM executable for DOS + #DELTREE.cOM DELTREE2.cOM +-4 string \xcd\x21 COM executable for DOS ++#4 string \xcd\x21 COM executable for DOS + #IFMEMDSK.cOM ASSIGN.cOM COMP.cOM +-5 string \xcd\x21 COM executable for DOS ++#5 string \xcd\x21 COM executable for DOS + #DELTMP.COm HASFAT32.cOM +-7 string \xcd\x21 +->0 byte !0xb8 COM executable for DOS ++#7 string \xcd\x21 ++#>0 byte !0xb8 COM executable for DOS + #COMP.cOM MORE.COm +-10 string \xcd\x21 +->5 string !\xcd\x21 COM executable for DOS ++#10 string \xcd\x21 ++#>5 string !\xcd\x21 COM executable for DOS + #comecho.com +-13 string \xcd\x21 COM executable for DOS ++#13 string \xcd\x21 COM executable for DOS + #HELP.COm EDIT.coM +-18 string \xcd\x21 COM executable for MS-DOS ++#18 string \xcd\x21 COM executable for MS-DOS + #NWRPLTRM.COm +-23 string \xcd\x21 COM executable for MS-DOS ++#23 string \xcd\x21 COM executable for MS-DOS + #LOADFIX.cOm LOADFIX.cOm +-30 string \xcd\x21 COM executable for MS-DOS ++#30 string \xcd\x21 COM executable for MS-DOS + #syslinux.com 3.11 +-70 string \xcd\x21 COM executable for DOS ++#70 string \xcd\x21 COM executable for DOS + # many compressed/converted COMs start with a copy loop instead of a jump + 0x6 search/0xa \xfc\x57\xf3\xa5\xc3 COM executable for MS-DOS + 0x6 search/0xa \xfc\x57\xf3\xa4\xc3 COM executable for DOS diff --git a/file-5.04-man-return-code.patch b/file-5.04-man-return-code.patch new file mode 100644 index 0000000..699840e --- /dev/null +++ b/file-5.04-man-return-code.patch @@ -0,0 +1,16 @@ +diff --git a/doc/file.man b/doc/file.man +index fff7730..3a524f5 100644 +--- a/doc/file.man ++++ b/doc/file.man +@@ -542,6 +542,11 @@ program, and are not covered by the above license. + .Sh RETURN CODE + .Nm + returns 0 on success, and non-zero on error. ++.Pp ++If the file named by the file ++operand does not exist, cannot be read, or the type of the file named by ++the file operand cannot be determined, this is not be considered an error ++that affects the exit status. + .Sh BUGS + .Pp + Please report bugs and send patches to the bug tracker at diff --git a/file-5.04-volume_key.patch b/file-5.04-volume_key.patch new file mode 100644 index 0000000..b3c0860 --- /dev/null +++ b/file-5.04-volume_key.patch @@ -0,0 +1,10 @@ +diff --git a/magic/Magdir/securitycerts b/magic/Magdir/securitycerts +index 8785dd8..1c340be 100644 +--- a/magic/Magdir/securitycerts ++++ b/magic/Magdir/securitycerts +@@ -4,3 +4,5 @@ + 0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text + 0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text + 0 belong 0xedfeedfe Sun 'jks' Java Keystore File data ++ ++0 string \0volume_key volume_key escrow packet diff --git a/file-5.11-dump-twice.patch b/file-5.11-dump-twice.patch new file mode 100644 index 0000000..1273b50 --- /dev/null +++ b/file-5.11-dump-twice.patch @@ -0,0 +1,13 @@ +diff --git a/magic/Magdir/convex b/magic/Magdir/convex +index 6141a82..4e096b9 100644 +--- a/magic/Magdir/convex ++++ b/magic/Magdir/convex +@@ -30,8 +30,6 @@ + # The restore program uses these number to determine how the data is + # to be extracted. + # +-24 belong =60011 dump format, 4.1 BSD or earlier +-24 belong =60012 dump format, 4.2 or 4.3 BSD without IDC + 24 belong =60013 dump format, 4.2 or 4.3 BSD (IDC compatible) + 24 belong =60014 dump format, Convex Storage Manager by-reference dump + # diff --git a/file.spec b/file.spec index 312fc77..d400c9f 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.11 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -21,6 +21,10 @@ Patch6: file-5.11-ia64-swap.patch Patch7: file-4.17-rpm-name.patch Patch8: file-5.11-magicmgc-home.patch Patch9: file-5.11-compress.patch +Patch10: file-5.11-dump-twice.patch +Patch11: file-5.04-volume_key.patch +Patch12: file-5.04-man-return-code.patch +Patch13: file-5.04-generic-msdos.patch URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -83,6 +87,10 @@ file(1) command. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -158,6 +166,12 @@ cd python %endif %changelog +* Tue Dec 04 2012 Jan Kaluza - 5.11-7 +- removed duplicated patterns for backups generated by "dump" tool +- recognize volume_key escrow packets +- mention exit code in manpage +- remove weak msdos patterns + * Wed Nov 21 2012 Jan Kaluza - 5.11-6 - clean up the spec file