rpms/file/devel file-5.04-squashfs.patch, NONE, 1.1 file.spec, 1.120, 1.121

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23616

Modified Files:
	file.spec 
Added Files:
	file-5.04-squashfs.patch 
Log Message:
fix #550212


file-5.04-squashfs.patch:
 filesystems |   30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

--- NEW FILE file-5.04-squashfs.patch ---
diff -up file-5.04/magic/Magdir/filesystems.squashfs file-5.04/magic/Magdir/filesystems
--- file-5.04/magic/Magdir/filesystems.squashfs	2010-03-24 12:51:05.000000000 +0100
+++ file-5.04/magic/Magdir/filesystems	2010-03-24 13:15:20.000000000 +0100
@@ -1363,28 +1363,46 @@
 >28	beshort <3
 >>8	belong	x	%d bytes,
 >28	beshort >2
->>63	bequad x	%lld bytes,
+>>28 beshort <4
+>>>63	bequad x	%lld bytes,
+>>28 beshort >3
+>>>40	bequad x	%lld bytes,
 #>>67	belong	x	%d bytes,
 >4	belong	x	%d inodes,
 >28	beshort <2
 >>32	beshort	x	blocksize: %d bytes,
 >28	beshort >1
->>51	belong	x	blocksize: %d bytes,
->39	bedate	x	created: %s
+>>28 beshort <4
+>>>51	belong	x	blocksize: %d bytes,
+>>28 beshort >3
+>>>12	belong	x	blocksize: %d bytes,
+>28 beshort <4
+>>39	bedate	x	created: %s
+>28 beshort >3
+>>8	bedate	x	created: %s
 0	string	hsqs	Squashfs filesystem, little endian,
 >28	leshort	x	version %d.
 >30	leshort	x	\b%d,
 >28	leshort <3
 >>8	lelong	x	%d bytes,
 >28	leshort >2
->>63	lequad x	%lld bytes,
+>>28 leshort <4
+>>>63	lequad x	%lld bytes,
+>>28 leshort >3
+>>>40	lequad x	%lld bytes,
 #>>63	lelong	x	%d bytes,
 >4	lelong	x	%d inodes,
 >28	leshort <2
 >>32	leshort	x	blocksize: %d bytes,
 >28	leshort >1
->>51	lelong	x	blocksize: %d bytes,
->39	ledate	x	created: %s
+>>28 leshort <4
+>>>51	lelong	x	blocksize: %d bytes,
+>>28 leshort >3
+>>>12	lelong	x	blocksize: %d bytes,
+>28 leshort <4
+>>39	ledate	x	created: %s
+>28 leshort >3
+>>8	ledate	x	created: %s
 
 0	string		td\000		floppy image data (TeleDisk)
 


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- file.spec	24 Mar 2010 09:31:24 -0000	1.120
+++ file.spec	24 Mar 2010 13:09:22 -0000	1.121
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.04
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch3: file-5.04-ulaw-segfault.patch
 Patch4: file-5.04-ruby-modules.patch
 Patch5: file-5.04-filesystem.patch
 Patch6: file-5.04-separ.patch
+Patch7: file-5.04-squashfs.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +83,8 @@ file(1) command.
 %patch5 -p1
 #fixes #575184
 %patch6 -p1
+#fixes #550212
+%patch7 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -158,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 24 2010 Daniel Novotny <dnovotny at redhat.com> 5.04-6
+- fix #550212 - 'file' gives bad meta-data for squashfs-4.0 
+
 * Wed Mar 24 2010 Daniel Novotny <dnovotny at redhat.com> 5.04-5
 - fix #575184 - file command does not print separator 
   when --print0 option is used