rpms/file
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix #608922 - updated z-machine magic

Browse Source
This commit is contained in:
Jan Kaluža 2010-06-29 10:34:01 +00:00
parent 02dc1e4953
commit fb15f17420
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
file-5.04-zmachine-magic-update.patch Normal file
View File

@ -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.

8
file.spec
View File

@ -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)