diff --git a/file-5.00-fdleak.patch b/file-5.00-fdleak.patch new file mode 100644 index 0000000..1cc9e10 --- /dev/null +++ b/file-5.00-fdleak.patch @@ -0,0 +1,11 @@ +diff -up file-5.00/src/compress.c.fdleak file-5.00/src/compress.c +--- file-5.00/src/compress.c.fdleak 2009-03-23 13:42:38.000000000 +0200 ++++ file-5.00/src/compress.c 2009-03-23 13:43:42.000000000 +0200 +@@ -486,6 +486,7 @@ err: + #else + (void)wait(NULL); + #endif ++ (void) close(fdin[0]); + return n; + } + } diff --git a/file-5.00-fonts-ttc-pfa.patch b/file-5.00-fonts-ttc-pfa.patch new file mode 100644 index 0000000..1e5ecde --- /dev/null +++ b/file-5.00-fonts-ttc-pfa.patch @@ -0,0 +1,20 @@ +diff -up file-5.00/magic/Magdir/fonts.ttcpfa file-5.00/magic/Magdir/fonts +--- file-5.00/magic/Magdir/fonts.ttcpfa 2009-03-23 11:44:36.000000000 +0100 ++++ file-5.00/magic/Magdir/fonts 2009-03-23 11:52:48.000000000 +0100 +@@ -9,6 +9,7 @@ + 0 search/1 %!PS-AdobeFont-1. PostScript Type 1 font text + >20 search/1 >\0 (%s) + 6 string %!PS-AdobeFont-1. PostScript Type 1 font program data ++0 string %!PS-AdobeFont-1. PostScript Type 1 font text + + # X11 font files in SNF (Server Natural Format) format + 0 belong 00000004 X11 SNF font data, MSB first +@@ -55,6 +56,8 @@ + 0 string \007\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font + 0 string \012\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font + ++0 string ttcf TrueType font collection data ++ + # Opentype font data from Avi Bercovich + 0 string OTTO OpenType font data + diff --git a/file.spec b/file.spec index cb433db..1357846 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.00 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -14,6 +14,8 @@ Patch0: file-4.21-pybuild.patch Patch1: file-5.00-devdrv.patch 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 Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,6 +68,10 @@ file(1) command. %patch2 -p1 #fixes #486105 %patch3 -p1 +#fixes #491594,#491595 +%patch4 -p1 +#fixes #491596 +%patch5 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -139,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* 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) + * Tue Feb 24 2009 Fedora Release Engineering - 5.00-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild