[file] fix #770006 - detect tnef files

Jan Kaluža jkaluza at fedoraproject.org
Mon Jan 2 12:01:41 UTC 2012


commit f66cec1e930f21de335d90534125017432e0f815
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Mon Jan 2 12:57:31 2012 +0100

    fix #770006 - detect tnef files

 file-tnef.patch |   12 ++++++++++++
 file.spec       |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/file-tnef.patch b/file-tnef.patch
new file mode 100644
index 0000000..1b8d377
--- /dev/null
+++ b/file-tnef.patch
@@ -0,0 +1,12 @@
+diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news
+index 96fa069..fb5e293 100644
+--- a/magic/Magdir/mail.news
++++ b/magic/Magdir/mail.news
+@@ -34,6 +34,7 @@
+ 
+ # TNEF files...
+ 0	lelong		0x223E9F78	Transport Neutral Encapsulation Format
++!:mime	application/vnd.ms-tnef
+ 
+ # From: Kevin Sullivan <ksulliva at psc.edu>
+ 0	string		*mbx*		MBX mail folder
diff --git a/file.spec b/file.spec
index dec4ba7..bf4df7a 100644
--- a/file.spec
+++ b/file.spec
@@ -5,12 +5,14 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 # Upstream says it's up to distributions to add a way to support local-magic.
 Patch0: file-localmagic.patch
+# sent upstream
+Patch1: file-tnef.patch
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +67,7 @@ file(1) command.
 # Don't use -b -- it will lead to poblems when compiling magic file!
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -149,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jan 02 2012 Jan Kaluza <jkaluza at redhat.com> - 5.10-2
+- fix #770006 - detect tnef files
+
 * Mon Jan 02 2012 Jan Kaluza <jkaluza at redhat.com> - 5.10-1
 - fix #771030 - update to file-5.10
 


More information about the scm-commits mailing list