diff --git a/file-dell-bios.patch b/file-dell-bios.patch new file mode 100644 index 0000000..45633d1 --- /dev/null +++ b/file-dell-bios.patch @@ -0,0 +1,18 @@ +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.spec b/file.spec index b6258d7..8181b1d 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.07 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -14,6 +14,7 @@ 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 +Patch5: file-dell-bios.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,6 +74,7 @@ file(1) command. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%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 +154,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jun 09 2011 Jan Kaluza - 5.07-3 +- fix #709953 - add support for BIOS version detection + * Mon May 23 2011 Jan Kaluza - 5.07-2 - backported patches to fix 5.07 regressions - fix #706231 - fixed ZIP detection