diff --git a/.gitignore b/.gitignore index aeed781..087ffb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ file-5.04.tar.gz /file-5.05.tar.gz /file-5.07.tar.gz +/file-5.08.tar.gz diff --git a/file-5.0.7-dos.patch b/file-5.0.7-dos.patch deleted file mode 100644 index 9e17355..0000000 --- a/file-5.0.7-dos.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 19f5096d0b4c1a49af6cc4e0d086d6128c493bd8 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Wed, 18 May 2011 18:11:23 +0000 -Subject: [PATCH] Fixed 0 file problem. - ---- - magic/Magdir/msdos | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos -index 731d50b..f8852cb 100644 ---- a/magic/Magdir/msdos -+++ b/magic/Magdir/msdos -@@ -389,10 +389,11 @@ - >>4 uleshort&0x4842 >0 \bsupport - >0 ubyte x \b) - # DOS driver cmd640x.sys has 0x12 instead of 0xffffffff for pointer field to next device header --0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable ( -->4 uleshort&0x8000 0x8000 \bcharacter device driver -->>10 string x %-.8s -->4 uleshort&0x4000 0x4000 \b,control strings-support) -+# Too weak, matches files that only contain 0's -+#0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable ( -+#>4 uleshort&0x8000 0x8000 \bcharacter device driver -+#>>10 string x %-.8s -+#>4 uleshort&0x4000 0x4000 \b,control strings-support) - - # test too generic ? - 0 byte 0x8c DOS executable (COM) --- -1.7.4.1 - diff --git a/file-5.0.7-zip.patch b/file-5.0.7-zip.patch deleted file mode 100644 index f16e312..0000000 --- a/file-5.0.7-zip.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e990dc53f658cb67ec7b33c32e0bc24e65801792 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sat, 14 May 2011 15:04:15 +0000 -Subject: [PATCH] small archive - ---- - magic/Magdir/archive | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/magic/Magdir/archive b/magic/Magdir/archive -index e84c8e3..5ad1ce3 100644 ---- a/magic/Magdir/archive -+++ b/magic/Magdir/archive -@@ -654,6 +654,9 @@ - >>>>78 string -template Template - !:mime application/vnd.oasis.opendocument.image-template - -+>26 byte x Zip archive data -+ -+ - # StarView Metafile - # From Pierre Ducroquet - 0 string VCLMTF StarView MetaFile --- -1.7.4.1 - diff --git a/file-5.04-zip64.patch b/file-5.04-zip64.patch deleted file mode 100644 index e4115ee..0000000 --- a/file-5.04-zip64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/magic/Magdir/archive b/magic/Magdir/archive -index c998e5b..4da532a 100644 ---- a/magic/Magdir/archive -+++ b/magic/Magdir/archive -@@ -688,6 +688,7 @@ - >>4 byte 0x0b \b, at least v1.1 to extract - >>0x161 string WINZIP \b, WinZIP self-extracting - >>4 byte 0x14 \b, at least v2.0 to extract -+>>4 byte 0x2d Zip64, at least v3.0 to extract - - # Zoo archiver - 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/file-5.05-rpm-archs.patch b/file-5.05-rpm-archs.patch deleted file mode 100644 index 23d2fb4..0000000 --- a/file-5.05-rpm-archs.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm -index c40e1b5..d252ced 100644 ---- a/magic/Magdir/rpm -+++ b/magic/Magdir/rpm -@@ -21,12 +21,29 @@ - >>>8 beshort 8 RS6000 - >>>8 beshort 9 IA64 - >>>8 beshort 10 Sparc64 -+>>>8 beshort 11 MIPSel -+>>>8 beshort 12 ARM -+>>>8 beshort 13 MiNT -+>>>8 beshort 14 S/390 -+>>>8 beshort 15 S/390x -+>>>8 beshort 16 PowerPC64 -+>>>8 beshort 17 SuperH -+>>>8 beshort 18 Xtensa - - #delta RPM Daniel Novotny (dnovotny@redhat.com) - 0 string drpm Delta RPM - !:mime application/x-rpm - >12 string x %s -- -+>>>8 beshort 1 i386/x86_64 -+>>>8 beshort 2 Alpha/Sparc64 -+>>>8 beshort 3 Sparc -+>>>8 beshort 4 MIPS -+>>>8 beshort 5 PowerPC -+>>>8 beshort 6 68000 -+>>>8 beshort 7 SGI -+>>>8 beshort 8 RS6000 -+>>>8 beshort 9 IA64 -+>>>8 beshort 10 Sparc64 - >>>8 beshort 11 MIPSel - >>>8 beshort 12 ARM - >>>8 beshort 13 MiNT -@@ -42,3 +59,21 @@ - 0 string drpm Delta RPM - !:mime application/x-rpm - >12 string x %s -+>>>8 beshort 1 i386/x86_64 -+>>>8 beshort 2 Alpha/Sparc64 -+>>>8 beshort 3 Sparc -+>>>8 beshort 4 MIPS -+>>>8 beshort 5 PowerPC -+>>>8 beshort 6 68000 -+>>>8 beshort 7 SGI -+>>>8 beshort 8 RS6000 -+>>>8 beshort 9 IA64 -+>>>8 beshort 10 Sparc64 -+>>>8 beshort 11 MIPSel -+>>>8 beshort 12 ARM -+>>>8 beshort 13 MiNT -+>>>8 beshort 14 S/390 -+>>>8 beshort 15 S/390x -+>>>8 beshort 16 PowerPC64 -+>>>8 beshort 17 SuperH -+>>>8 beshort 18 Xtensa diff --git a/file-5.07-rpm-archs.patch b/file-5.07-rpm-archs.patch deleted file mode 100644 index 5d9a600..0000000 --- a/file-5.07-rpm-archs.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm -index c40e1b5..0cc0813 100644 ---- a/magic/Magdir/rpm -+++ b/magic/Magdir/rpm -@@ -4,23 +4,31 @@ - # - # RPM: file(1) magic for Red Hat Packages Erik Troan (ewt@redhat.com) - # --0 beshort 0xedab -->2 beshort 0xeedb RPM -+0 belong 0xedabeedb RPM - !:mime application/x-rpm -->>4 byte x v%d -->>5 byte x \b.%d -->>6 beshort 1 src -->>6 beshort 0 bin -->>>8 beshort 1 i386/x86_64 -->>>8 beshort 2 Alpha/Sparc64 -->>>8 beshort 3 Sparc -->>>8 beshort 4 MIPS -->>>8 beshort 5 PowerPC -->>>8 beshort 6 68000 -->>>8 beshort 7 SGI -->>>8 beshort 8 RS6000 -->>>8 beshort 9 IA64 -->>>8 beshort 10 Sparc64 -+>4 byte x v%d -+>5 byte x \b.%d -+>6 beshort 1 src -+>6 beshort 0 bin -+>>8 beshort 1 i386/x86_64 -+>>8 beshort 2 Alpha/Sparc64 -+>>8 beshort 3 Sparc -+>>8 beshort 4 MIPS -+>>8 beshort 5 PowerPC -+>>8 beshort 6 68000 -+>>8 beshort 7 SGI -+>>8 beshort 8 RS6000 -+>>8 beshort 9 IA64 -+>>8 beshort 10 Sparc64 -+>>8 beshort 11 MIPSel -+>>8 beshort 12 ARM -+>>8 beshort 13 MiNT -+>>8 beshort 14 S/390 -+>>8 beshort 15 S/390x -+>>8 beshort 16 PowerPC64 -+>>8 beshort 17 SuperH -+>>8 beshort 18 Xtensa -+>>8 beshort 255 noarch - - #delta RPM Daniel Novotny (dnovotny@redhat.com) - 0 string drpm Delta RPM diff --git a/file-dell-bios.patch b/file-dell-bios.patch deleted file mode 100644 index 45633d1..0000000 --- a/file-dell-bios.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos -index f8852cb..36bd51c 100644 ---- a/magic/Magdir/msdos -+++ b/magic/Magdir/msdos -@@ -841,7 +841,12 @@ - # Dell's .hdr - 0 string $RBU - >23 string Dell %s system BIOS -->48 string x version %.3s -+>5 byte 2 -+>>48 byte x version %d. -+>>49 byte x \b%d. -+>>50 byte x \b%d -+>5 byte <2 -+>>48 string x version %.3s - - # Type: Microsoft DirectDraw Surface - # URL: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/DDSFileReference/ddsfileformat.asp diff --git a/file-postscript.patch b/file-postscript.patch deleted file mode 100644 index df5a2a7..0000000 --- a/file-postscript.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/magic/Magdir/printer b/magic/Magdir/printer -index 342dd28..e2b0b76 100644 ---- a/magic/Magdir/printer -+++ b/magic/Magdir/printer -@@ -5,7 +5,7 @@ - # - - # PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com) --0 string/t %! PostScript document text -+0 string %! PostScript document text - !:mime application/postscript - !:apple ASPSTEXT - >2 string PS-Adobe- conforming diff --git a/file.spec b/file.spec index e494bd4..432ec8d 100644 --- a/file.spec +++ b/file.spec @@ -4,18 +4,12 @@ Summary: A utility for determining file types Name: file -Version: 5.07 -Release: 5%{?dist} +Version: 5.08 +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-5.04-zip64.patch -Patch2: file-5.07-rpm-archs.patch -Patch3: file-5.0.7-zip.patch -Patch4: file-5.0.7-dos.patch -Patch5: file-dell-bios.patch -Patch6: file-postscript.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,14 +63,6 @@ file(1) command. # Don't use -b -- it will lead to poblems when compiling magic file %setup -q -#fixes #637785 -%patch1 -p1 -#fixes #676041 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -156,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Aug 04 2011 Jan Kaluza - 5.08-1 +- fix #728181 - update to file-5.08 +- remove unused patches + * Tue Jun 14 2011 Jan Kaluza - 5.07-5 - fix #712991 - include RPM noarch in /usr/share/magic diff --git a/sources b/sources index 74f305e..02f4e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8d1f9a8a644067bd0a703cebf3f4858 file-5.07.tar.gz +6a2a263c20278f01fe3bb0f720b27d4e file-5.08.tar.gz