From 224a5258370ee211dadbf5dba8c6eda37011b583 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Jan 28 2016 13:21:54 +0000
Subject: fix #1302297 - fix misdetection of some Perl scripts as Minix filesystem


---

diff --git a/file-5.25-minix.patch b/file-5.25-minix.patch
new file mode 100644
index 0000000..079c578
--- /dev/null
+++ b/file-5.25-minix.patch
@@ -0,0 +1,90 @@
+diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
+index 16a6cc4..0f73021 100644
+--- a/magic/Magdir/filesystems
++++ b/magic/Magdir/filesystems
+@@ -1720,44 +1720,59 @@
+ # Minix filesystems - Juan Cespedes <cespedes@debian.org>
+ 0x410	leshort		0x137f
+ !:strength / 2
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V1, 14 char names, %d zones
+->0x1e	string		minix		\b, bootable
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V1, 14 char names, %d zones
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	beshort		0x137f
+ !:strength / 2
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V1 (big endian), %d zones
+->0x1e	string		minix		\b, bootable
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V1 (big endian), %d zones
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	leshort		0x138f
+ !:strength / 2
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V1, 30 char names, %d zones
+->0x1e	string		minix		\b, bootable
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V1, 30 char names, %d zones
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	beshort		0x138f
+ !:strength / 2
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V1, 30 char names (big endian), %d zones
+->0x1e	string		minix		\b, bootable
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V1, 30 char names (big endian), %d zones
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	leshort		0x2468
+->0x402	beshort		< 100
+->>0x402	beshort		> -1		Minix filesystem, V2, 14 char names
+->0x1e	string		minix		\b, bootable
++!:strength / 2
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V2, 14 char names
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	beshort		0x2468
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V2 (big endian)
+->0x1e	string		minix		\b, bootable
++!:strength / 2
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V2 (big endian)
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	leshort		0x2478
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V2, 30 char names
+->0x1e	string		minix		\b, bootable
++!:strength / 2
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V2, 30 char names
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	leshort		0x2478
+->0x402	beshort		< 100
+->0x402	beshort		> -1		Minix filesystem, V2, 30 char names
+->0x1e	string		minix		\b, bootable
++!:strength / 2
++>0x412	ubyte		< 2
++>>0x402	beshort		< 100
++>>>0x402	beshort		> -1		Minix filesystem, V2, 30 char names
++>>>>0x1e	string		minix		\b, bootable
+ 0x410	beshort		0x2478
+->0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian)
+->0x1e	string		minix		\b, bootable
++!:strength / 2
++>0x412	ubyte		< 2
++>>0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian)
++>>>0x1e	string		minix		\b, bootable
+ 0x418	leshort		0x4d5a
++!:strength / 2
+ >0x402	beshort		<100
+ >>0x402	beshort		> -1		Minix filesystem, V3, 60 char names
+ 
diff --git a/file.spec b/file.spec
index 1b4acbd..4cc6eba 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.25
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -23,6 +23,7 @@ Patch14: file-5.19-cafebabe.patch
 Patch15: file-5.22-awk-perl.patch
 Patch17: file-5.24-varied.patch
 Patch18: file-trunk-msx-binary.patch
+Patch19: file-5.25-minix.patch
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRequires: zlib-devel
@@ -95,6 +96,7 @@ file(1) command.
 %patch15 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 # Patches can generate *.orig files, which can't stay in the magic dir,
 # otherwise there will be problems with compiling magic file!
@@ -202,6 +204,9 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Thu Jan 28 2016 Jan Kaluza <jkaluza@redhat.com> - 5.25-5
+- fix #1302297 - fix misdetection of some Perl scripts as Minix filesystem
+
 * Wed Jan 06 2016 Jan Kaluza <jkaluza@redhat.com> - 5.25-4
 - fix #1291903 - fix misdetection of some text files as MSX binary files