From fb15f1742087615590052be0e3392465460597a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= <jkaluza@fedoraproject.org>
Date: Tue, 29 Jun 2010 10:34:01 +0000
Subject: [PATCH] - fix #608922 - updated z-machine magic

---
 file-5.04-zmachine-magic-update.patch | 30 +++++++++++++++++++++++++++
 file.spec                             |  8 ++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 file-5.04-zmachine-magic-update.patch

diff --git a/file-5.04-zmachine-magic-update.patch b/file-5.04-zmachine-magic-update.patch
new file mode 100644
index 0000000..e5d0a42
--- /dev/null
+++ b/file-5.04-zmachine-magic-update.patch
@@ -0,0 +1,30 @@
+diff --git a/magic/Magdir/adventure b/magic/Magdir/adventure
+index 5087ce6..a693213 100644
+--- a/magic/Magdir/adventure
++++ b/magic/Magdir/adventure
+@@ -18,17 +18,14 @@
+ #------------------------------------------------------------------------------
+ # Z-machine:  file(1) magic for Z-machine binaries.
+ #
+-# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which
+-# appears to be a version-0 Z-machine binary.
+-#
+-# The (false match) message is to correct that behavior.  Perhaps it is
+-# not needed.
+-#
+-16	belong&0xfe00f0f0	0x3030	Infocom game data
+->0	ubyte			0	(false match)
+->0	ubyte			>0	(Z-machine %d,
+->>2	ubeshort		x	Release %d /
+->>18	string			>\0	Serial %.6s)
++# The first byte is the Z-machine version number, which is always between
++# 1 and 8.
++0	ubyte			>0
++>0	ubyte			<9
++>>16	belong&0xfe00f0f0	0x3030	Infocom game data
++>>>0	ubyte			>0	(Z-machine %d,
++>>>>2	ubeshort		x	Release %d /
++>>>>18	string			>\0	Serial %.6s)
+ 
+ #------------------------------------------------------------------------------
+ # Glulx:  file(1) magic for Glulx binaries.
diff --git a/file.spec b/file.spec
index f104e65..43650f7 100644
--- a/file.spec
+++ b/file.spec
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.04
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -21,6 +21,7 @@ Patch7: file-5.04-squashfs.patch
 Patch8: file-5.04-core-trim.patch
 Patch9: file-5.04-retval.patch
 Patch10: file-5.04-html-regression.patch
+Patch11: file-5.04-zmachine-magic-update.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,6 +93,8 @@ file(1) command.
 %patch8 -p1
 #fixes #603040
 %patch10 -p1
+#fixes #608922
+%patch11 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -168,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jun 29 2010 Jan Kaluza <jkaluza@redhat.com> 5.04-10
+- fix #608922 - updated z-machine magic
+
 * Fri Jun 11 2010 Jan Kaluza <jkaluza@redhat.com> 5.04-9
 - removed excessive HTML/SGML "magic patterns" (#603040)