From bcae6767ebbfc804e363c6cded7610f269fa9704 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Jan 12 2009 12:05:30 +0000 Subject: fix bz#479300 --- diff --git a/file-4.26-btrfs.patch b/file-4.26-btrfs.patch new file mode 100644 index 0000000..a48fd8d --- /dev/null +++ b/file-4.26-btrfs.patch @@ -0,0 +1,18 @@ +diff -up file-4.26/magic/Magdir/filesystems.btrfs file-4.26/magic/Magdir/filesystems +--- file-4.26/magic/Magdir/filesystems.btrfs 2009-01-12 12:50:33.000000000 +0100 ++++ file-4.26/magic/Magdir/filesystems 2009-01-12 12:53:30.000000000 +0100 +@@ -1324,6 +1324,14 @@ + >0x10024 belong x (blocksize %d, + >0x10060 string >\0 lockproto %s) + ++# BTRFS ++0x10040 string _BHRfS_M BTRFS Filesystem ++>0x1012b string >\0 (label "%s", ++>0x10090 lelong x sectorsize %d, ++>0x10094 lelong x nodesize %d, ++>0x10098 lelong x leafsize %d) ++ ++ + # dvdisaster's .ecc + # From: "Nelson A. de Oliveira" + 0 string *dvdisaster* dvdisaster error correction file diff --git a/file.spec b/file.spec index ca5f105..bfe70c1 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 4.26 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -15,6 +15,7 @@ Patch1: file-4.26-devdrv.patch Patch2: file-4.26-mime-encoding.patch Patch3: file-4.26-perl5.patch Patch4: file-4.26-graphviz-latex.patch +Patch5: file-4.26-btrfs.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +70,8 @@ file(1) command. %patch3 -p1 #fixes #474156 %patch4 -p1 +#fixes #479300 +%patch5 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -142,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 12 2009 Daniel Novotny 4.26-8 +- fix #479300 - add btrfs filesystem magic + * Mon Dec 15 2008 Daniel Novotny 4.26-7 - fix the LaTex issue in bz#474156