From fcc6529663cab638b06d7b58a1f8a5fb752f4756 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Thu, 23 Jul 2009 14:10:05 +0000 Subject: [PATCH] fix #510429 --- file-5.03-ifany.patch | 12 ++++++++++++ file.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 file-5.03-ifany.patch diff --git a/file-5.03-ifany.patch b/file-5.03-ifany.patch new file mode 100644 index 0000000..84dd35f --- /dev/null +++ b/file-5.03-ifany.patch @@ -0,0 +1,12 @@ +diff -up file-5.03/magic/Magdir/lisp.ifany file-5.03/magic/Magdir/lisp +--- file-5.03/magic/Magdir/lisp.ifany 2009-07-23 15:46:03.000000000 +0200 ++++ file-5.03/magic/Magdir/lisp 2009-07-23 15:46:17.000000000 +0200 +@@ -11,8 +11,6 @@ + #>2 search/4096 !\r Lisp/Scheme program text + #>2 search/4096 \r Windows INF file + +-0 search/4096 (if\ Lisp/Scheme program text +-!:mime text/x-lisp + 0 search/4096 (setq\ Lisp/Scheme program text + !:mime text/x-lisp + 0 search/4096 (defvar\ Lisp/Scheme program text diff --git a/file.spec b/file.spec index d88aada..47f7e58 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.03 -Release: 5%{?dist} +Release: 6%{?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.03-fonts-postscript.patch Patch4: file-5.03-xfsdump.patch +Patch5: file-5.03-ifany.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,6 +67,8 @@ file(1) command. %patch3 -p1 #fixes #513079 %patch4 -p1 +#fixes #510429 +%patch5 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -140,6 +143,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jul 23 2009 Daniel Novotny 5.03-6 +- fix #510429 - file is confused by string "/* (if any) */" + in C header and claims it "Lisp/Scheme program text" + * Wed Jul 22 2009 Daniel Novotny 5.03-5 - #513079 - RFE: file - recognize xfs metadump images