rpms/file/F-8 file-4.21-hang.patch,NONE,1.1 file.spec,1.66,1.67

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/file/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23147

Modified Files:
	file.spec 
Added Files:
	file-4.21-hang.patch 
Log Message:
* Tue Jan 29 2008 Tomas Smetana <tsmetana at redhat.com> - 4.21-5
- fix #316501 - file hugging cpu


file-4.21-hang.patch:

--- NEW FILE file-4.21-hang.patch ---
diff -up file-4.21/magic/Magdir/msdos.hang file-4.21/magic/Magdir/msdos
--- file-4.21/magic/Magdir/msdos.hang	2008-01-28 12:25:35.000000000 +0100
+++ file-4.21/magic/Magdir/msdos	2008-01-29 09:36:53.000000000 +0100
@@ -18,9 +18,6 @@
 100	regex/c =^[\ \t]{0,10}say\ ['"]	     OS/2 REXX batch file text
 
 
-100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
-100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
-
 0	leshort		0x14c	MS Windows COFF Intel 80386 object file
 #>4	ledate		x	stamp %s
 0	leshort		0x166	MS Windows COFF MIPS R4000 object file


Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/F-8/file.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- file.spec	24 Jan 2008 11:52:49 -0000	1.66
+++ file.spec	29 Jan 2008 08:44:20 -0000	1.67
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.21
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -26,6 +26,8 @@
 patch24: file-4.21-msoffice.patch
 patch25: file-4.21-efi.patch
 patch26: file-4.21-pybuild.patch
+patch26: file-4.21-pybuild.patch
+patch27: file-4.21-hang.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,6 +88,7 @@
 %patch24 -p1 -b .msoffice
 %patch25 -p1 -b .efi
 %patch26 -p1 -b .pybuild
+%patch27 -p1 -b .hang
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -157,6 +160,9 @@
 %endif
 
 %changelog
+* Tue Jan 29 2008 Tomas Smetana <tsmetana at redhat.com> - 4.21-5
+- fix #316501 - file hugging cpu
+
 * Thu Jan 24 2008 Tomas Smetana <tsmetana at redhat.com> - 4.21-4
 - build a separate python-magic package; thanks to Terje Rosten
 - add PE32/PE32+ magic