diff --git a/file-5.11-extfs-minix.dif b/file-5.11-extfs-minix.dif new file mode 100644 index 0000000..62fce10 --- /dev/null +++ b/file-5.11-extfs-minix.dif @@ -0,0 +1,92 @@ +--- magic/Magdir/filesystems ++++ magic/Magdir/filesystems 2012-11-26 15:19:17.434507842 +0000 +@@ -881,44 +881,6 @@ + # FATX + 0 string FATX FATX filesystem data + +- +-# Minix filesystems - Juan Cespedes +-0x410 leshort 0x137f +-!:strength / 2 +->0x402 beshort < 100 Minix filesystem, V1, %d zones +->0x1e string minix \b, bootable +-0x410 beshort 0x137f +-!:strength / 2 +->0x402 beshort < 100 Minix filesystem, V1 (big endian), %d zones +->0x1e string minix \b, bootable +-0x410 leshort 0x138f +-!:strength / 2 +->0x402 beshort < 100 Minix filesystem, V1, 30 char names, %d zones +->0x1e string minix \b, bootable +-0x410 beshort 0x138f +-!:strength / 2 +->0x402 beshort < 100 Minix filesystem, V1, 30 char names (big endian), %d zones +->0x1e string minix \b, bootable +-0x410 leshort 0x2468 +->0x402 beshort < 100 Minix filesystem, V2, %d zones +->0x1e string minix \b, bootable +-0x410 beshort 0x2468 +->0x402 beshort < 100 Minix filesystem, V2 (big endian), %d zones +->0x1e string minix \b, bootable +- +-0x410 leshort 0x2478 +->0x402 beshort < 100 Minix filesystem, V2, 30 char names, %d zones +->0x1e string minix \b, bootable +-0x410 leshort 0x2478 +->0x402 beshort < 100 Minix filesystem, V2, 30 char names, %d zones +->0x1e string minix \b, bootable +-0x410 beshort 0x2478 +->0x402 beshort !0 Minix filesystem, V2, 30 char names (big endian), %d zones +->0x1e string minix \b, bootable +-0x410 leshort 0x4d5a +->0x402 beshort !0 Minix filesystem, V3, %d zones +->0x1e string minix \b, bootable +- + # romfs filesystems - Juan Cespedes + 0 string -rom1fs- romfs filesystem, version 1 + >8 belong x %d bytes, +@@ -1157,6 +1119,44 @@ + #>0x464 lelong &0x0000020 (many subdirs) + #>0x463 lelong &0x0000040 (extra isize) + ++ ++# Minix filesystems - Juan Cespedes ++0x410 leshort 0x137f ++!:strength / 2 ++>0x402 beshort < 100 Minix filesystem, V1, %d zones ++>0x1e string minix \b, bootable ++0x410 beshort 0x137f ++!:strength / 2 ++>0x402 beshort < 100 Minix filesystem, V1 (big endian), %d zones ++>0x1e string minix \b, bootable ++0x410 leshort 0x138f ++!:strength / 2 ++>0x402 beshort < 100 Minix filesystem, V1, 30 char names, %d zones ++>0x1e string minix \b, bootable ++0x410 beshort 0x138f ++!:strength / 2 ++>0x402 beshort < 100 Minix filesystem, V1, 30 char names (big endian), %d zones ++>0x1e string minix \b, bootable ++0x410 leshort 0x2468 ++>0x402 beshort < 100 Minix filesystem, V2, %d zones ++>0x1e string minix \b, bootable ++0x410 beshort 0x2468 ++>0x402 beshort < 100 Minix filesystem, V2 (big endian), %d zones ++>0x1e string minix \b, bootable ++ ++0x410 leshort 0x2478 ++>0x402 beshort < 100 Minix filesystem, V2, 30 char names, %d zones ++>0x1e string minix \b, bootable ++0x410 leshort 0x2478 ++>0x402 beshort < 100 Minix filesystem, V2, 30 char names, %d zones ++>0x1e string minix \b, bootable ++0x410 beshort 0x2478 ++>0x402 beshort !0 Minix filesystem, V2, 30 char names (big endian), %d zones ++>0x1e string minix \b, bootable ++0x410 leshort 0x4d5a ++>0x402 beshort !0 Minix filesystem, V3, %d zones ++>0x1e string minix \b, bootable ++ + # SGI disk labels - Nathan Scott + 0 belong 0x0BE5A941 SGI disk label (volume header) + diff --git a/file.changes b/file.changes index 4f2331b..5cb7951 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 26 15:23:01 UTC 2012 - werner@suse.de + +- Change detection order of ext2/3/4 fs and minix to avoid the for + the free inode numbers 4991,5007,9320,9336 and multiple of 65536 + the ext2/3/4 fs will be detected as minix fs (bnc#788435) + ------------------------------------------------------------------- Sat Oct 27 18:37:13 UTC 2012 - coolo@suse.com diff --git a/file.spec b/file.spec index 818ef67..1243551 100644 --- a/file.spec +++ b/file.spec @@ -60,6 +60,7 @@ Patch32: file-5.07-clicfs.dif Patch33: file-ocloexec.patch Patch34: file-endian.patch Patch35: file-5.11-nitpick.dif +Patch36: file-5.11-extfs-minix.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -126,6 +127,7 @@ to develop applications that require the magic "file" interface. %patch33 -p0 -b .clexe %patch34 -p0 -b .endian %patch35 -p0 -b .nitpick +%patch36 -p0 -b .extnotminix %patch -b .0 %build export LANG=POSIX