add php mime fix. patch from mailinglist

diff --git a/001949.patch b/001949.patch
new file mode 100644 (file)
index 0000000..40ef6b7
--- /dev/null
+++ b/001949.patch
@@ -0,0 +1,23 @@
+
+http://mx.gw.com/pipermail/file/2016/001949.html
+
+Unfortunately some new magic is problematic; here's a patch.
+
+christo
+
+Index: commands
+===================================================================
+RCS file: /p/file/cvsroot/file/magic/Magdir/commands,v
+retrieving revision 1.53
+diff -u -u -r1.53 commands
+--- commands   23 Feb 2016 12:35:20 -0000      1.53
++++ commands   17 Apr 2016 13:51:29 -0000
+@@ -101,7 +101,7 @@
+ 0     string  =<?php
+ >5    regex   [\ \n]
+ >>6   string  /*\ Smarty\ version             Smarty compiled template
+->24   regex   [0-9.]+                         \b, version %s
++>>>24 regex   [0-9.]+                         \b, version %s
+ !:mime        text/x-php
+ 
+ 0     string          Zend\x00                PHP script Zend Optimizer data

diff --git a/file.spec b/file.spec
index 2caa5d2d6ae7b33a13bcdc6d6ea550feedf0647d..80e78a560774adb1c74f0c2f6c440c9661352914 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -30,7 +30,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
 Version:       5.26
-Release:       1.1
+Release:       1.8
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Patch0:               %{name}-selinux.patch
 Patch1:                searchpath.patch
 Patch2:                automake.patch
 Patch4:                name-use-count.patch
+Patch5:                001949.patch
 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -270,6 +271,7 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch1 -p1
 %patch2 -p1
 %patch4 -p1
+%patch5 -p0 -d magic/Magdir
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac