Accepting request 143281 from Base:System

- Add file-5.11-extfs-minix.dif: 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)

OBS-URL: https://build.opensuse.org/request/show/143281
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=65
This commit is contained in:
Stephan Kulow 2012-11-28 09:18:49 +00:00 committed by Git OBS Bridge
commit 8ba54121cb
3 changed files with 103 additions and 0 deletions

92
file-5.11-extfs-minix.dif Normal file
View File

@ -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 <cespedes@debian.org>
-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 <cespedes@debian.org>
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 <cespedes@debian.org>
+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 <nathans@debian.org>
0 belong 0x0BE5A941 SGI disk label (volume header)

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Nov 26 15:23:01 UTC 2012 - werner@suse.de
- Add file-5.11-extfs-minix.dif: 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

View File

@ -60,6 +60,8 @@ Patch32: file-5.07-clicfs.dif
Patch33: file-ocloexec.patch
Patch34: file-endian.patch
Patch35: file-5.11-nitpick.dif
# PATCH-FEATURE-SLE file-5.11-extfs-minix.dif [bnc#788435]
Patch36: file-5.11-extfs-minix.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -126,6 +128,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