diff --git a/file-5.04-filesystem.patch b/file-5.04-filesystem.patch new file mode 100644 index 0000000..cced0ba --- /dev/null +++ b/file-5.04-filesystem.patch @@ -0,0 +1,23 @@ +diff -up file-5.04/magic/Magdir/filesystems.minix file-5.04/magic/Magdir/filesystems +--- file-5.04/magic/Magdir/filesystems.minix 2010-03-11 15:26:17.000000000 +0100 ++++ file-5.04/magic/Magdir/filesystems 2010-03-11 15:28:41.000000000 +0100 +@@ -884,15 +884,19 @@ + + # Minix filesystems - Juan Cespedes + 0x410 leshort 0x137f ++!:strength / 2 + >0x402 beshort < 100 Minix filesystem, V1, %d zones + >0x1e string minix \b, bootable + 0x410 beshort 0x137f ++!:strength / 2 + >0x402 beshort < 100 Minix filesystem, V1 (big endian), %d zones + >0x1e string minix \b, bootable + 0x410 leshort 0x138f ++!:strength / 2 + >0x402 beshort < 100 Minix filesystem, V1, 30 char names, %d zones + >0x1e string minix \b, bootable + 0x410 beshort 0x138f ++!:strength / 2 + >0x402 beshort < 100 Minix filesystem, V1, 30 char names (big endian), %d zones + >0x1e string minix \b, bootable + 0x410 leshort 0x2468 diff --git a/file.spec b/file.spec index cf9a2dc..1335ac7 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.04 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -15,6 +15,7 @@ Patch1: file-5.00-devdrv.patch Patch2: file-5.00-mdmp.patch Patch3: file-5.04-ulaw-segfault.patch Patch4: file-5.04-ruby-modules.patch +Patch5: file-5.04-filesystem.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +77,8 @@ file(1) command. %patch3 -p1 #fixes #562840 %patch4 -p1 +#fixes #570785 +%patch5 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -152,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Mar 11 2010 Daniel Novotny 5.04-4 +- fix #570785 - "file" misidentifies filesystem type + * Tue Feb 09 2010 Daniel Novotny 5.04-3 - fix #562840 - [PATCH] Add matches for ruby modules