From cedcb6d131a2e4220d55430f0c53e0750493cd78 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 23 May 2011 11:34:24 +0200 Subject: [PATCH] backported patches to fix 5.07 regressions fix #706231 - fixed ZIP detection fix #705183, #705499 - removed weak DOS device driver pattern --- file-5.0.7-dos.patch | 32 ++++++++++++++++++++++++++++++++ file-5.0.7-zip.patch | 26 ++++++++++++++++++++++++++ file.spec | 11 ++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 file-5.0.7-dos.patch create mode 100644 file-5.0.7-zip.patch diff --git a/file-5.0.7-dos.patch b/file-5.0.7-dos.patch new file mode 100644 index 0000000..9e17355 --- /dev/null +++ b/file-5.0.7-dos.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 0000000..f16e312 --- /dev/null +++ b/file-5.0.7-zip.patch @@ -0,0 +1,26 @@ +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.spec b/file.spec index 0ade6e6..b6258d7 100644 --- a/file.spec +++ b/file.spec @@ -5,13 +5,15 @@ Summary: A utility for determining file types Name: file Version: 5.07 -Release: 1%{?dist} +Release: 2%{?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.05-rpm-archs.patch +Patch3: file-5.0.7-zip.patch +Patch4: file-5.0.7-dos.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +71,8 @@ file(1) command. %patch1 -p1 #fixes #676041 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -148,6 +152,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 23 2011 Jan Kaluza - 5.07-2 +- backported patches to fix 5.07 regressions +- fix #706231 - fixed ZIP detection +- fix #705183, #705499 - removed weak DOS device driver pattern + * Wed May 11 2011 Jan Kaluza - 5.07-1 - update to new upstream version 5.07 - remove unused patches