summaryrefslogtreecommitdiff
path: root/source/a/file
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-04-06 22:01:59 +0000
committerEric Hameleers <alien@slackware.com>2021-04-07 08:59:49 +0200
commit06a5fa6da374cc3dafd95295c5e7448f1cea9f88 (patch)
tree7d02c04eea3d5e5f844606e50be1e2518d4be33f /source/a/file
parent928db52b4905b2f48ad28d9965f859ef8247ad3e (diff)
downloadcurrent-06a5fa6da374cc3dafd95295c5e7448f1cea9f88.tar.gz
Tue Apr 6 22:01:59 UTC 202120210406220159
a/sysvinit-scripts-2.1-noarch-41.txz: Rebuilt. rc.S: don't clear /var/run. Thanks to upnort. kde/digikam-7.2.0-x86_64-2.txz: Rebuilt. Recompiled against opencv-4.5.2 (apparently the ABI changed). Thanks to etienne.
Diffstat (limited to 'source/a/file')
-rwxr-xr-xsource/a/file/file.SlackBuild11
-rw-r--r--source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch33
-rw-r--r--source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch61
-rw-r--r--source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch32
-rw-r--r--source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch102
-rw-r--r--source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch26
-rw-r--r--source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch22
-rw-r--r--source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch159
8 files changed, 445 insertions, 1 deletions
diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild
index 2554d14b..e70f55a1 100755
--- a/source/a/file/file.SlackBuild
+++ b/source/a/file/file.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=file
VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -100,6 +100,15 @@ zcat $CWD/file.PT_DYNAMIC.is.dynamically.linked.diff.gz | patch -p1 -E --verbose
zcat $CWD/file.zisofs.magic.gz >> magic/Magdir/compress
zcat $CWD/file.crdaregbin.magic.gz >> magic/Magdir/crdaregbin
+# Add some regression fixes from upstream:
+zcat $CWD/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch b/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch
new file mode 100644
index 00000000..47c8c2ae
--- /dev/null
+++ b/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch
@@ -0,0 +1,33 @@
+From 1c677c04c0fa43ecfeccdb9705dbbd19fb356891 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 4 Apr 2021 21:02:19 +0000
+Subject: [PATCH] Don't count each byte encounter as 1, count the total number
+ of bytes found (Anatol Belski). This makes it behave like 5.39.
+
+---
+ src/encoding.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/encoding.c b/src/encoding.c
+index c8b404390..c66703bb6 100644
+--- a/src/encoding.c
++++ b/src/encoding.c
+@@ -35,7 +35,7 @@
+ #include "file.h"
+
+ #ifndef lint
+-FILE_RCSID("@(#)$File: encoding.c,v 1.27 2021/02/05 21:33:49 christos Exp $")
++FILE_RCSID("@(#)$File: encoding.c,v 1.28 2021/04/04 21:02:19 christos Exp $")
+ #endif /* lint */
+
+ #include "magic.h"
+@@ -282,8 +282,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
+ } \
+ u = 0; \
+ for (i = 0; i < __arraycount(dist); i++) { \
+- if (dist[i]) \
+- u++; \
++ u+= dist[i]; \
+ } \
+ if (u < 3) \
+ return 0; \
diff --git a/source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch b/source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch
new file mode 100644
index 00000000..61919d5c
--- /dev/null
+++ b/source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch
@@ -0,0 +1,61 @@
+From 2f62d5544d13ca32dc09504ec70358db581e9e65 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Wed, 31 Mar 2021 19:51:14 +0000
+Subject: [PATCH] Improve 8086 relocatable detection (Joerg Jenderek)
+
+---
+ magic/Magdir/xenix | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/magic/Magdir/xenix b/magic/Magdir/xenix
+index 3e248de26..d5ab69e5d 100644
+--- a/magic/Magdir/xenix
++++ b/magic/Magdir/xenix
+@@ -1,6 +1,6 @@
+
+ #------------------------------------------------------------------------------
+-# $File: xenix,v 1.12 2021/02/23 00:51:10 christos Exp $
++# $File: xenix,v 1.13 2021/03/31 19:51:14 christos Exp $
+ # xenix: file(1) magic for Microsoft Xenix
+ #
+ # "Middle model" stuff, and "Xenix 8086 relocatable or 80286 small
+@@ -13,25 +13,35 @@
+ #
+ 0 string core core file (Xenix)
+ # URL: http://www.polarhome.com/service/man/?qf=86rel&tf=2&of=Xenix
++# http://fileformats.archiveteam.org/wiki/OMF
+ # Reference: http://www.azillionmonkeys.com/qed/Omfg.pdf
+ # Update: Joerg Jenderek
+ # recordtype~TranslatorHEADerRecord
+ 0 byte 0x80
+-# GRR: line above is too general as it catches also Extensible storage engine DataBase
++# GRR: line above is too general as it catches also Extensible storage engine DataBase,
++# all lif files like forth.lif hpcc88.lif lex90b.lif ( See ./lif)
++# and all compressed DEGAS low-res bitmaps like: MUNCHIE.PC1 PIDER1.PC1
+ # skip examples like GENA.SND Switch.Snd by looking for record length maximal 1024-3
+ >1 uleshort <1022
+ # skip examples like GAME.PICTURE Strange.Pic by looking for positive record length
+ >>1 uleshort >0
+ # skip examples like Xtable.Data FRACTAL.GEN SHR.VIEW by looking for positive string length
+ >>>3 ubyte >0
+-# skip examples like OMBRE.6 with "UUUUUU" by looking for filename like "hello.c"
+->>>>4 regex [a-zA-Z_/]{1,8}[.] 8086 relocatable (Microsoft)
++# skip examples like OMBRE.6 with "UUUUUU" name by looking for valid high second record type
++>>>>(1.s+3) ubyte >0x6D 8086 relocatable (Microsoft)
+ #!:mime application/octet-stream
+ !:mime application/x-object
+-!:ext o/a
++!:ext obj/o/a
++# T-module name often source name like "hello.c" or "jmppm32.asm" in JMPPM32.OBJ or
++# "kbhit" in KBHITS.OBJ or "CAUSEWAY_KERNAL" in CWAPI.OBJ
+ >>>>>3 pstring x \b, "%s"
++# data length probably lower 256 according to TrID obj_omf.trid.xml
++>>>>>1 uleshort x \b, 1st record data length %u
+ # checksum
+ #>>>>>(3.b+4) ubyte x \b, checksum 0x%2.2x
++# second recordtype: 96h~LNAMES 88h~COMENT 8CH~EXTDEF
++>>>>>(1.s+3) ubyte x \b, 2nd record type 0x%x
++>>>>>(1.s+4) uleshort x \b, 2nd record data length %u
+ 0 leshort 0xff65 x.out
+ >2 string __.SYMDEF randomized
+ >0 byte x archive
diff --git a/source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch b/source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch
new file mode 100644
index 00000000..1e80ac99
--- /dev/null
+++ b/source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch
@@ -0,0 +1,32 @@
+From 576d713ec955faafdc9d7b783f3f4c27b7bc1793 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Tue, 6 Apr 2021 15:43:11 +0000
+Subject: [PATCH] Add more ash paths from Cormac Stephenson
+
+---
+ magic/Magdir/commands | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/magic/Magdir/commands b/magic/Magdir/commands
+index 10f8d2b20..5f6be0cce 100644
+--- a/magic/Magdir/commands
++++ b/magic/Magdir/commands
+@@ -1,6 +1,6 @@
+
+ #------------------------------------------------------------------------------
+-# $File: commands,v 1.63 2020/06/06 15:36:30 christos Exp $
++# $File: commands,v 1.64 2021/04/06 15:43:11 christos Exp $
+ # commands: file(1) magic for various shells and interpreters
+ #
+ #0 string/w : shell archive or script for antique kernel text
+@@ -38,6 +38,10 @@
+ 0 search/1 #!/usr/bin/env\ zsh Paul Falstad's zsh script text executable
+ !:mime text/x-shellscript
+
++0 string/wt #!\ /bin/ash Neil Brown's ash script text executable
++!:mime text/x-shellscript
++0 string/wt #!\ /usr/bin/ash Neil Brown's ash script text executable
++!:mime text/x-shellscript
+ 0 string/wt #!\ /usr/local/bin/ash Neil Brown's ash script text executable
+ !:mime text/x-shellscript
+ 0 string/wt #!\ /usr/local/bin/ae Neil Brown's ae script text executable
diff --git a/source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch b/source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch
new file mode 100644
index 00000000..f026891f
--- /dev/null
+++ b/source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch
@@ -0,0 +1,102 @@
+From 64dcffa715049351327851c8b5a6f3430a32ff39 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 4 Apr 2021 18:24:34 +0000
+Subject: [PATCH] Add arm-coff (Mark Harmstone)
+
+---
+ magic/Magdir/arm | 41 +++++++++++++++++++++++++++++++++++++++++
+ magic/Magdir/coff | 7 ++++++-
+ magic/Makefile.am | 3 ++-
+ 3 files changed, 49 insertions(+), 2 deletions(-)
+ create mode 100644 magic/Magdir/arm
+
+diff --git a/magic/Magdir/arm b/magic/Magdir/arm
+new file mode 100644
+index 000000000..8869d1928
+--- /dev/null
++++ b/magic/Magdir/arm
+@@ -0,0 +1,41 @@
++#------------------------------------------------------------------------------
++# $File: arm,v 1.1 2021/04/04 18:24:34 christos Exp $
++# arm: file(1) magic for ARM COFF
++#
++# https://docs.microsoft.com/en-us/windows/win32/debug/pe-format
++
++# Aarch64
++0 leshort 0xaa64
++# test for unused flag bits in f_flags
++>18 uleshort&0x8E80 0
++# use little endian variant of subroutine to
++# display name+variables+flags for common object formated files
++>>0 use display-coff
++!:strength -10
++
++# ARM
++0 leshort 0x01c0
++# test for unused flag bits in f_flags
++>18 uleshort&0x8E80 0
++# use little endian variant of subroutine to
++# display name+variables+flags for common object formated files
++>>0 use display-coff
++!:strength -10
++
++# ARM Thumb
++0 leshort 0x01c2
++# test for unused flag bits in f_flags
++>18 uleshort&0x8E80 0
++# use little endian variant of subroutine to
++# display name+variables+flags for common object formated files
++>>0 use display-coff
++!:strength -10
++
++# ARMv7 Thumb
++0 leshort 0x01c4
++# test for unused flag bits in f_flags
++>18 uleshort&0x8E80 0
++# use little endian variant of subroutine to
++# display name+variables+flags for common object formated files
++>>0 use display-coff
++!:strength -10
+diff --git a/magic/Magdir/coff b/magic/Magdir/coff
+index 18e7b665e..5063bc19e 100644
+--- a/magic/Magdir/coff
++++ b/magic/Magdir/coff
+@@ -1,6 +1,6 @@
+
+ #------------------------------------------------------------------------------
+-# $File: coff,v 1.4 2021/02/10 00:37:02 christos Exp $
++# $File: coff,v 1.5 2021/04/04 18:24:34 christos Exp $
+ # coff: file(1) magic for Common Object Files not specific to known cpu types or manufactures
+ #
+ # COFF
+@@ -34,6 +34,11 @@
+ # https://msdn.microsoft.com/en-us/library/windows/desktop/ms680313(v=vs.85).aspx
+ >>>>0 uleshort 0x0200 Intel ia64
+ >>>>0 uleshort 0x8664 Intel amd64
++# ARM COFF (./arm)
++>>>>0 uleshort 0xaa64 Aarch64
++>>>>0 uleshort 0x01c0 ARM
++>>>>0 uleshort 0x01c2 ARM Thumb
++>>>>0 uleshort 0x01c4 ARMv7 Thumb
+ # TODO for other COFFs
+ #>>>>0 uleshort 0xABCD COFF_TEMPLATE
+ >>>>0 default x
+diff --git a/magic/Makefile.am b/magic/Makefile.am
+index 0eb5865b7..75d39bbde 100644
+--- a/magic/Makefile.am
++++ b/magic/Makefile.am
+@@ -1,5 +1,5 @@
+ #
+-# $File: Makefile.am,v 1.166 2021/03/14 16:24:18 christos Exp $
++# $File: Makefile.am,v 1.167 2021/04/04 18:24:34 christos Exp $
+ #
+ MAGIC_FRAGMENT_BASE = Magdir
+ MAGIC_DIR = $(top_srcdir)/magic
+@@ -29,6 +29,7 @@ $(MAGIC_FRAGMENT_DIR)/application \
+ $(MAGIC_FRAGMENT_DIR)/applix \
+ $(MAGIC_FRAGMENT_DIR)/apt \
+ $(MAGIC_FRAGMENT_DIR)/archive \
++$(MAGIC_FRAGMENT_DIR)/arm \
+ $(MAGIC_FRAGMENT_DIR)/asf \
+ $(MAGIC_FRAGMENT_DIR)/assembler \
+ $(MAGIC_FRAGMENT_DIR)/asterix \
diff --git a/source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch b/source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch
new file mode 100644
index 00000000..78f7d31c
--- /dev/null
+++ b/source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch
@@ -0,0 +1,26 @@
+From 6b34436ac766dae64749b8d14f18c6910be40131 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 5 Apr 2021 16:36:14 +0000
+Subject: [PATCH] remove "u" from the pattern (Joerg Jenderek)
+
+---
+ magic/Magdir/mail.news | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news
+index 3a2eeb962..6a2229107 100644
+--- a/magic/Magdir/mail.news
++++ b/magic/Magdir/mail.news
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: mail.news,v 1.26 2021/03/21 14:37:03 christos Exp $
++# $File: mail.news,v 1.27 2021/04/05 16:36:14 christos Exp $
+ # mail.news: file(1) magic for mail and news
+ #
+ # Unfortunately, saved netnews also has From line added in some news software.
+@@ -81,4 +81,4 @@
+ # File format spec: https://wiki.dovecot.org/Design/Dcrypt/#File_format
+ # From: Stephen Gildea
+ 0 string CRYPTED\003\007 Dovecot encrypted message
+->9 byte xu \b, dcrypt version %d
++>9 byte x \b, dcrypt version %d
diff --git a/source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch b/source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch
new file mode 100644
index 00000000..9fa3ab4f
--- /dev/null
+++ b/source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch
@@ -0,0 +1,22 @@
+From 9e2becec20d023409a1671bf10a682f699350e85 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 4 Apr 2021 21:03:43 +0000
+Subject: [PATCH] Encoding bug fix.
+
+---
+ ChangeLog | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 23a93cf4b..2238ba6f8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2021-04-04 17:02 Christos Zoulas <christos@zoulas.com>
++
++ * count the total bytes found not the total byte positions
++ in order to determine encoding (Anatol Belski)
++
+ 2021-03-30 20:21 Christos Zoulas <christos@zoulas.com>
+
+ * release 5.40
diff --git a/source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch b/source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch
new file mode 100644
index 00000000..c0cbf3cb
--- /dev/null
+++ b/source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch
@@ -0,0 +1,159 @@
+From f06015040e7ffb3be21bb7622f9f8291b749aaf9 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 4 Apr 2021 17:46:17 +0000
+Subject: [PATCH] Fix regression after unsigned/signed printing changes by
+ making types unsigned (Richard W.M. Jones)
+
+---
+ magic/Magdir/filesystems | 54 +++++++++++++++++++--------------------
+ magic/Magdir/linux | 30 +++++++++++-----------
+ tests/Makefile.am | 1 +
+ tests/ext4.result | 1 +
+ tests/ext4.testfile | Bin 0 -> 2048 bytes
+ 5 files changed, 44 insertions(+), 42 deletions(-)
+ create mode 100644 tests/ext4.result
+ create mode 100644 tests/ext4.testfile
+
+diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
+index 0cb45cbfe..81966d6cc 100644
+--- a/magic/Magdir/filesystems
++++ b/magic/Magdir/filesystems
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: filesystems,v 1.140 2021/02/23 00:51:10 christos Exp $
++# $File: filesystems,v 1.141 2021/04/04 17:46:17 christos Exp $
+ # filesystems: file(1) magic for different filesystems
+ #
+ 0 name partid
+@@ -1739,12 +1739,12 @@
+ >>>0x464 lelong >0x0000007 ext4 filesystem data
+ # else large INCOMPAT?
+ >>0x460 lelong >0x000003f ext4 filesystem data
+->0x468 belong x \b, UUID=%08x
+->0x46c beshort x \b-%04x
+->0x46e beshort x \b-%04x
+->0x470 beshort x \b-%04x
+->0x472 belong x \b-%08x
+->0x476 beshort x \b%04x
++>0x468 ubelong x \b, UUID=%08x
++>0x46c ubeshort x \b-%04x
++>0x46e ubeshort x \b-%04x
++>0x470 ubeshort x \b-%04x
++>0x472 ubelong x \b-%08x
++>0x476 ubeshort x \b%04x
+ >0x478 string >0 \b, volume name "%s"
+ # General flags for any ext* fs
+ >0x460 lelong &0x0000004 (needs journal recovery)
+@@ -1767,12 +1767,12 @@
+
+ # f2fs filesystem - Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
+ 0x400 lelong 0xF2F52010 F2FS filesystem
+->0x46c belong x \b, UUID=%08x
+->0x470 beshort x \b-%04x
+->0x472 beshort x \b-%04x
+->0x474 beshort x \b-%04x
+->0x476 belong x \b-%08x
+->0x47a beshort x \b%04x
++>0x46c ubelong x \b, UUID=%08x
++>0x470 ubeshort x \b-%04x
++>0x472 ubeshort x \b-%04x
++>0x474 ubeshort x \b-%04x
++>0x476 ubelong x \b-%08x
++>0x47a ubeshort x \b%04x
+ >0x147c lestring16 x \b, volume name "%s"
+
+ # Minix filesystems - Juan Cespedes <cespedes@debian.org>
+@@ -2296,20 +2296,20 @@
+ >>0x10060 string >\0 lockproto %s)
+
+ # Russell Coker <russell@coker.com.au>
+-0x10040 string _BHRfS_M BTRFS Filesystem
+->0x1012b string >\0 label "%s",
+->0x10090 lelong x sectorsize %d,
+->0x10094 lelong x nodesize %d,
+->0x10098 lelong x leafsize %d,
+->0x10020 belong x UUID=%08x-
+->0x10024 beshort x \b%04x-
+->0x10026 beshort x \b%04x-
+->0x10028 beshort x \b%04x-
+->0x1002a beshort x \b%04x
+->0x1002c belong x \b%08x,
+->0x10078 lequad x %lld/
+->0x10070 lequad x \b%lld bytes used,
+->0x10088 lequad x %lld devices
++0x10040 string _BHRfS_M BTRFS Filesystem
++>0x1012b string >\0 label "%s",
++>0x10090 lelong x sectorsize %d,
++>0x10094 lelong x nodesize %d,
++>0x10098 lelong x leafsize %d,
++>0x10020 ubelong x UUID=%08x-
++>0x10024 ubeshort x \b%04x-
++>0x10026 ubeshort x \b%04x-
++>0x10028 ubeshort x \b%04x-
++>0x1002a ubeshort x \b%04x
++>0x1002c ubelong x \b%08x,
++>0x10078 lequad x %lld/
++>0x10070 lequad x \b%lld bytes used,
++>0x10088 lequad x %lld devices
+
+ # dvdisaster's .ecc
+ # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
+diff --git a/magic/Magdir/linux b/magic/Magdir/linux
+index 693cef6f5..f25243e20 100644
+--- a/magic/Magdir/linux
++++ b/magic/Magdir/linux
+@@ -1,6 +1,6 @@
+
+ #------------------------------------------------------------------------------
+-# $File: linux,v 1.77 2021/02/24 23:05:02 christos Exp $
++# $File: linux,v 1.78 2021/04/04 17:46:17 christos Exp $
+ # linux: file(1) magic for Linux files
+ #
+ # Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
+@@ -83,20 +83,20 @@
+
+ # format v1, supported since 1998
+ 0 name linux-swap
+->0x400 lelong 1 little endian, version %u,
+->>0x404 lelong x size %u pages,
+->>0x408 lelong x %u bad pages,
+->0x400 belong 1 big endian, version %u,
+->>0x404 belong x size %u pages,
+->>0x408 belong x %u bad pages,
+->0x41c string \0 no label,
+->0x41c string >\0 LABEL=%s,
+->0x40c belong x UUID=%08x
+->0x410 beshort x \b-%04x
+->0x412 beshort x \b-%04x
+->0x414 beshort x \b-%04x
+->0x416 belong x \b-%08x
+->0x41a beshort x \b%04x
++>0x400 lelong 1 little endian, version %u,
++>>0x404 lelong x size %u pages,
++>>0x408 lelong x %u bad pages,
++>0x400 belong 1 big endian, version %u,
++>>0x404 belong x size %u pages,
++>>0x408 belong x %u bad pages,
++>0x41c string \0 no label,
++>0x41c string >\0 LABEL=%s,
++>0x40c ubelong x UUID=%08x
++>0x410 ubeshort x \b-%04x
++>0x412 ubeshort x \b-%04x
++>0x414 ubeshort x \b-%04x
++>0x416 ubelong x \b-%08x
++>0x41a ubeshort x \b%04x
+
+ 0xff6 string SWAPSPACE2 Linux swap file, 4k page size,
+ >0 use linux-swap
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index b38a25b3d..a63c2f65a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -7,6 +7,7 @@ regex-eol.magic \
+ CVE-2014-1943.testfile \
+ JW07022A.mp3.testfile \
+ escapevel.testfile \
++ext4.testfile \
+ fit-map-data.testfile \
+ gedcom.testfile \
+ hddrawcopytool.testfile \