From 6156fb0e12371bc61be504dda7c8f8e203e5abd4 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Fri, 17 Apr 2009 09:26:31 +0000 Subject: [PATCH] fix #485835 --- file-5.00-mdmp.patch | 10 ++++++++++ file.spec | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 file-5.00-mdmp.patch diff --git a/file-5.00-mdmp.patch b/file-5.00-mdmp.patch new file mode 100644 index 0000000..eda0979 --- /dev/null +++ b/file-5.00-mdmp.patch @@ -0,0 +1,10 @@ +diff -up file-5.00/magic/Magdir/misctools.mdmp file-5.00/magic/Magdir/misctools +--- file-5.00/magic/Magdir/misctools.mdmp 2009-04-16 15:29:06.000000000 +0200 ++++ file-5.00/magic/Magdir/misctools 2009-04-16 15:32:23.000000000 +0200 +@@ -19,3 +19,6 @@ + # Extension: .lo + # Submitted by: Abel Cheung + 0 search/80 .lo\ -\ a\ libtool\ object\ file libtool object file ++ ++# From: Daniel Novotny ++0 string MDMP\x93\xA7 MDUMP crash report data diff --git a/file.spec b/file.spec index 1357846..b848258 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.00 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch2: file-5.00-non-english-word.patch Patch3: file-5.00-thumbs-db.patch Patch4: file-5.00-fonts-ttc-pfa.patch Patch5: file-5.00-fdleak.patch +Patch6: file-5.00-mdmp.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +73,8 @@ file(1) command. %patch4 -p1 #fixes #491596 %patch5 -p1 +#fixes #485835 +%patch6 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -145,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Apr 17 2009 Daniel Novotny 5.00-6 +- fix #485835 (MDUMP files) + * Mon Mar 23 2009 Daniel Novotny 5.00-5 - added two font definitions (#491594, #491595) and a fix for file descriptor leak when MAGIC_COMPRESS used (#491596)