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

Resolves:#603040 - removed excessive HTML/SGML "magic patterns"

Browse Source
This commit is contained in:
Jan Kaluža 2010-06-11 12:14:59 +00:00
parent af58b03679
commit 02dc1e4953
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
file-5.04-html-regression.patch Normal file
View File

@ -0,0 +1,44 @@
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@yggdrasil.com)
# adapted to string extenstions by Anthon van der Neut <anthon@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@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..)

10
file.spec
View File

@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.04
Release: 8%{?dist}
Release: 9%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -20,6 +20,7 @@ Patch6: file-5.04-separ.patch
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
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -89,8 +90,8 @@ file(1) command.
%patch7 -p1
#fixes #566305
%patch8 -p1
#fixes #580046
%patch9 -p1
#fixes #603040
%patch10 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -167,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Fri Jun 11 2010 Jan Kaluza <jkaluza@redhat.com> 5.04-9
- removed excessive HTML/SGML "magic patterns" (#603040)
* Wed Apr 14 2010 Daniel Novotny <dnovotny@redhat.com> 5.04-8
- fix #580046 - the file command returns zero exit code
even in case of unexisting file being tested