rpms/file/devel file-4.26-devdrv.patch, NONE, 1.1 file.spec, 1.79, 1.80

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11478

Modified Files:
	file.spec 
Added Files:
	file-4.26-devdrv.patch 
Log Message:

fix #463809: rpmbuild rpmfcClassify: Assertion fails on some binary files


file-4.26-devdrv.patch:

--- NEW FILE file-4.26-devdrv.patch ---
diff -up file-4.26/magic/Magdir/msdos.devdrv file-4.26/magic/Magdir/msdos
--- file-4.26/magic/Magdir/msdos.devdrv	2008-10-07 16:00:29.000000000 +0200
+++ file-4.26/magic/Magdir/msdos	2008-10-07 16:02:01.000000000 +0200
@@ -293,22 +293,37 @@
 >10	string	>\x23			
 >>10	string	!\x2e			
 >>>17	string	<\x5B			
->>>>10	string	x			\b, name: %.8s
-#UDMA.SYS KEYB.SYS CMD640X2.SYS
+>>>>10	string	CMD640X2.SYS			\b, name: %.8s
+#UDMA.SYS
 >10	string	<\x41			
 >>12	string	>\x40			
 >>>10	string	!$			
->>>>12	string	x			\b, name: %.8s
-#BTCDROM.SYS ASPICD.SYS
+>>>>12	string	UDMA.SYS			\b, name: %.8s
+#CMD640X2.SYS
+>10	string	<\x41			
+>>12	string	>\x40			
+>>>10	string	!$			
+>>>>12	string	CMD640X2.SYS			\b, name: %.8s
+#KEYB.SYS
+>10	string	<\x41			
+>>12	string	>\x40			
+>>>10	string	!$			
+>>>>12	string	KEYB.SYS			\b, name: %.8s
+#BTCDROM.SYS
+>22	string	>\x40			
+>>22	string	<\x5B			
+>>>23	string	<\x5B			
+>>>>22	string	BTCDROM.SYS			\b, name: %.8s
+#ASPICD.SYS
 >22	string	>\x40			
 >>22	string	<\x5B			
 >>>23	string	<\x5B			
->>>>22	string	x			\b, name: %.8s
+>>>>22	string	ASPICD.SYS			\b, name: %.8s
 #ATAPICD.SYS
 >76	string	\0			
 >>77	string	>\x40			
 >>>77	string	<\x5B			
->>>>77	string	x			\b, name: %.8s
+>>>>77	string	ATAPICD.SYS			\b, name: %.8s
 #0	byte		0x8c		DOS executable (COM)
 # 0xeb conflicts with "sequent" magic
 #0	byte		0xeb		DOS executable (COM)


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- file.spec	15 Sep 2008 14:37:29 -0000	1.79
+++ file.spec	7 Oct 2008 14:57:51 -0000	1.80
@@ -5,12 +5,13 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 URL: http://www.darwinsys.com/file/
 patch0: file-4.21-pybuild.patch
+patch1: file-4.26-devdrv.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +58,8 @@
 # Don't use -b -- it will lead to poblems when compiling magic file
 %setup -q
 %patch0 -p1
+#fixes #463809
+%patch1 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -130,6 +133,11 @@
 %endif
 
 %changelog
+* Tue Oct 07 2008 Daniel Novotny <dnovotny at redhat.com> 4.26-2
+- fix #463809: rpmbuild rpmfcClassify: Assertion fails on some binary files
+  (false positive test on "DOS device driver" crashed file(1)
+   and rpmbuild(8) failed)  
+
 * Mon Sep 15 2008 Daniel Novotny <dnovotny at redhat.com> 4.26-1
 - new upstream version: fixes #462064