rpms/file/F-13 file-5.04-html-regression.patch, NONE, 1.1 file-5.04-zmachine-magic-update.patch, NONE, 1.1 file.spec, 1.119, 1.120

Thu Jul 1 14:21:45 UTC 2010

Author: jkaluza

Update of /cvs/pkgs/rpms/file/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28414

Modified Files:
	file.spec 
Added Files:
	file-5.04-html-regression.patch 
	file-5.04-zmachine-magic-update.patch 
Log Message:
* Thu Jul 01 2010 Jan Kaluza <jkaluza at redhat.com> 5.04-5
- fix #608922 - updated z-machine magic
- fix #610067 - removed excessive HTML/SGML "magic patterns"


file-5.04-html-regression.patch:
 sgml |   23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

--- NEW FILE file-5.04-html-regression.patch ---

diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml
index 0a57375..1dceba5 100644
--- a/magic/Magdir/sgml
+++ b/magic/Magdir/sgml
@@ -34,21 +34,13 @@
 # HyperText Markup Language (HTML) is an SGML document type,
 # from Daniel Quinlan (quinlan at yggdrasil.com)
 # adapted to string extenstions by Anthon van der Neut <anthon at mnt.org)
-0	search/4096/cWbt	\<!doctype\ html	HTML document text
+0	search/1/cb	\<!doctype\ html	HTML document text
 !:mime	text/html
-0	search/4096/cwbt	\<head			HTML document text
+0	search/1/cb	\<head			HTML document text
 !:mime	text/html
-0	search/4096/cwbt	\<title			HTML document text
+0	search/1/cb	\<title			HTML document text
 !:mime	text/html
-0	search/4096/cwbt	\<html			HTML document text
-!:mime	text/html
-0	search/4096/cwbt	\<script 		HTML document text
-!:mime	text/html
-0	search/4096/cwbt	\<style 		HTML document text
-!:mime	text/html
-0	search/4096/cwbt	\<table			HTML document text
-!:mime	text/html
-0	search/4096/cwbt	\<a\ href=		HTML document text
+0	search/1/cb	\<html			HTML document text
 !:mime	text/html
 
 # Extensible markup language (XML), a subset of SGML
@@ -76,10 +68,9 @@
 
 
 # SGML, mostly from rph at sq
-0	search/4096/cwbt	\<!doctype		exported SGML document text
-0	search/4096/cwbt	\<!subdoc		exported SGML subdocument text
-0	search/4096/cwbt	\<!--			exported SGML document text
-!:strength - 10
+0	search/1/cb	\<!doctype		exported SGML document text
+0	search/1/cb	\<!subdoc		exported SGML subdocument text
+0	search/1/cb	\<!--			exported SGML document text
 
 # Web browser cookie files
 # (Mozilla, Galeon, Netscape 4, Konqueror..)

file-5.04-zmachine-magic-update.patch:
 adventure |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

--- NEW FILE file-5.04-zmachine-magic-update.patch ---
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.


Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/F-13/file.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- file.spec	27 May 2010 13:22:56 -0000	1.119
+++ file.spec	1 Jul 2010 14:21:44 -0000	1.120
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.04
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -16,6 +16,8 @@ Patch2: file-5.00-mdmp.patch
 Patch3: file-5.04-ulaw-segfault.patch
 Patch4: file-5.04-ruby-modules.patch
 Patch5: file-5.04-core-trim.patch
+Patch6: file-5.04-html-regression.patch
+Patch7: file-5.04-zmachine-magic-update.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +81,8 @@ file(1) command.
 %patch4 -p1
 #fixes #566305
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -155,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jul 01 2010 Jan Kaluza <jkaluza at redhat.com> 5.04-5
+- fix #608922 - updated z-machine magic
+- fix #610067 - removed excessive HTML/SGML "magic patterns"
+
 * Thu May 27 2010 Daniel Novotny <dnovotny at redhat.com> 5.04-4
 - fix #566305 - "file" may trim too much of command line from core file
 

