rpms/file/devel file-4.24-gfs2.patch, NONE, 1.1 file-4.24-lvm.patch, NONE, 1.1 file.spec, 1.75, 1.76
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Fri Jun 6 11:32:47 UTC 2008
Author: tsmetana
Update of /cvs/pkgs/rpms/file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26391
Modified Files:
file.spec
Added Files:
file-4.24-gfs2.patch file-4.24-lvm.patch
Log Message:
* Fri Jun 06 2008 Tomas Smetana <tsmetana at redhat.com> - 4.24-4
- add GFS2 filesystem magic; thanks to Eric Sandeen
- add LVM snapshots magic (#449755); thanks to Jason Farrell
file-4.24-gfs2.patch:
--- NEW FILE file-4.24-gfs2.patch ---
diff -up file-4.24/magic/Magdir/filesystems.orig file-4.24/magic/Magdir/filesystems
--- file-4.24/magic/Magdir/filesystems.orig 2008-06-04 08:16:57.000000000 +0200
+++ file-4.24/magic/Magdir/filesystems 2008-06-04 08:19:34.000000000 +0200
@@ -1302,3 +1302,9 @@
# really le32 operation,destination,payloadsize (but quite predictable)
# 01 00 00 00 00 00 00 c0 00 02 00 00
0 string \1\0\0\0\0\0\0\300\0\2\0\0 Marvell Libertas firmware
+
+# From Eric Sandeen
+# GFS2
+0x10000 belong 0x01161970 GFS2 Filesystem
+>0x10024 belong x (blocksize %d,
+>0x10060 string >\0 lockproto %s)
file-4.24-lvm.patch:
--- NEW FILE file-4.24-lvm.patch ---
diff -up file-4.24/magic/Magdir/linux.orig file-4.24/magic/Magdir/linux
--- file-4.24/magic/Magdir/linux.orig 2008-06-04 08:21:06.000000000 +0200
+++ file-4.24/magic/Magdir/linux 2008-06-04 08:23:04.000000000 +0200
@@ -231,6 +231,14 @@
0x618 string LVM2\ 001 LVM2 (Linux Logical Volume Manager)
>(0x614.l+0x600) string >\0 , UUID: %s
+# LVM snapshot
+# from Jason Farrel
+0 string SnAp LVM Snapshot (CopyOnWrite store)
+>4 lelong !0 - valid,
+>4 lelong 0 - invalid,
+>8 lelong x version = %d,
+>12 lelong x chunk_size = %d
+
# SE Linux policy database
0 lelong 0xf97cff8c SE Linux policy
>16 lelong x v%d
Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/file.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- file.spec 4 Jun 2008 05:42:07 -0000 1.75
+++ file.spec 6 Jun 2008 11:32:05 -0000 1.76
@@ -5,17 +5,18 @@
Summary: A utility for determining file types
Name: file
Version: 4.24
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
URL: http://www.darwinsys.com/file/
-Patch1: file-4.24-selinux.patch
+Patch1: file-4.24-lvm.patch
Patch2: file-4.24-oracle.patch
Patch3: file-4.24-ELF.patch
patch4: file-4.24-efi.patch
patch5: file-4.21-pybuild.patch
patch6: file-4.24-flc.patch
+patch7: file-4.24-gfs2.patch
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +68,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@@ -136,10 +138,14 @@
%doc python/README COPYING python/example.py
%{python_sitearch}/magic.so
%if 0%{?fedora} >= 9
-%{python_sitearch}/*egg-info
+#%{python_sitearch}/*egg-info
%endif
%changelog
+* Fri Jun 06 2008 Tomas Smetana <tsmetana at redhat.com> - 4.24-4
+- add GFS2 filesystem magic; thanks to Eric Sandeen
+- add LVM snapshots magic (#449755); thanks to Jason Farrell
+
* Wed Jun 04 2008 Tomas Smetana <tsmetana at redhat.com> - 4.24-3
- drop patches that do nothing in recent build system
- create the text magic file during installation
More information about the scm-commits
mailing list