rpms/file/devel file-4.23-ext4.patch,NONE,1.1 file.spec,1.68,1.69
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Fri Feb 1 08:55:58 UTC 2008
Author: tsmetana
Update of /cvs/pkgs/rpms/file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788
Modified Files:
file.spec
Added Files:
file-4.23-ext4.patch
Log Message:
* Fri Feb 01 2008 Tomas Smetana <tsmetana at redhat.com> - 4.23-3
- fix #430927 - detect ext4 filesystems
file-4.23-ext4.patch:
--- NEW FILE file-4.23-ext4.patch ---
diff -up file-4.23/magic/Magdir/filesystems.ext4 file-4.23/magic/Magdir/filesystems
--- file-4.23/magic/Magdir/filesystems.ext4 2008-02-01 09:45:02.000000000 +0100
+++ file-4.23/magic/Magdir/filesystems 2008-02-01 09:46:23.000000000 +0100
@@ -1025,19 +1025,42 @@
>&-1248 belong 0 TIME optimization
>&-1248 belong 1 SPACE optimization
-# ext2/ext3 filesystems - Andreas Dilger <adilger at turbolabs.com>
-0x438 leshort 0xEF53 Linux
->0x44c lelong x rev %d
->0x43e leshort x \b.%d
->0x45c lelong ^0x0000004 ext2 filesystem data
->>0x43a leshort ^0x0000001 (mounted or unclean)
->0x45c lelong &0x0000004 ext3 filesystem data
->>0x460 lelong &0x0000004 (needs journal recovery)
->0x43a leshort &0x0000002 (errors)
->0x460 lelong &0x0000001 (compressed)
-#>0x460 lelong &0x0000002 (filetype)
-#>0x464 lelong &0x0000001 (sparse_super)
->0x464 lelong &0x0000002 (large files)
+# ext2/ext3 filesystems - Andreas Dilger <adilger at dilger.ca>
+# ext4 filesystem - Eric Sandeen <sandeen at sandeen.net>
+0x438 leshort 0xEF53 Linux
+>0x44c lelong x rev %d
+>0x43e leshort x \b.%d
+# No journal? ext2
+>0x45c lelong ^0x0000004 ext2 filesystem data
+>>0x43a leshort ^0x0000001 (mounted or unclean)
+# Has a journal? ext3 or ext4
+>0x45c lelong &0x0000004
+# and small INCOMPAT?
+>>0x460 lelong <0x0000040
+# and small RO_COMPAT?
+>>>0x464 lelong <0x0000008 ext3 filesystem data
+# else large RO_COMPAT?
+>>>0x464 lelong >0x0000007 ext4 filesystem data
+# else large INCOMPAT?
+>>0x460 lelong >0x000003f ext4 filesystem data
+# General flags for any ext* fs
+>0x460 lelong &0x0000004 (needs journal recovery)
+>0x43a leshort &0x0000002 (errors)
+# INCOMPAT flags
+>0x460 lelong &0x0000001 (compressed)
+#>0x460 lelong &0x0000002 (filetype)
+#>0x460 lelong &0x0000010 (meta bg)
+>0x460 lelong &0x0000040 (extents)
+>0x460 lelong &0x0000080 (64bit)
+#>0x460 lelong &0x0000100 (mmp)
+#>0x460 lelong &0x0000200 (flex bg)
+# RO_INCOMPAT flags
+#>0x464 lelong &0x0000001 (sparse super)
+>0x464 lelong &0x0000002 (large files)
+>0x464 lelong &0x0000008 (huge files)
+#>0x464 lelong &0x0000010 (gdt checksum)
+#>0x464 lelong &0x0000020 (many subdirs)
+#>0x463 lelong &0x0000040 (extra isize)
# SGI disk labels - Nathan Scott <nathans at debian.org>
0 belong 0x0BE5A941 SGI disk label (volume header)
Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/file.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- file.spec 31 Jan 2008 11:05:12 -0000 1.68
+++ file.spec 1 Feb 2008 08:55:22 -0000 1.69
@@ -5,7 +5,7 @@
Summary: A utility for determining file types
Name: file
Version: 4.23
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -25,6 +25,7 @@
patch13: file-4.21-efi.patch
patch14: file-4.21-pybuild.patch
patch15: file-4.23-tryelf.patch
+patch15: file-4.23-ext4.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -156,6 +157,9 @@
%endif
%changelog
+* Fri Feb 01 2008 Tomas Smetana <tsmetana at redhat.com> - 4.23-3
+- fix #430927 - detect ext4 filesystems
+
* Thu Jan 31 2008 Tomas Smetana <tsmetana at redhat.com> - 4.23-2
- fix #430952 - wrong handling of ELF binaries
More information about the fedora-extras-commits
mailing list