update to new version 5.41
This commit is contained in:
Vincent Mihalkovic
parent
3f1280fe40
commit
41b34e83c7
@ -1,319 +0,0 @@
|
||||
diff --git a/magic/Magdir/python b/magic/Magdir/python
|
||||
index 9d306c0..bc5163e 100644
|
||||
--- a/magic/Magdir/python
|
||||
+++ b/magic/Magdir/python
|
||||
@@ -10,211 +10,211 @@
|
||||
# MAGIC as specified in Python/import.c (1.0 to 3.7)
|
||||
# two bytes of magic followed by "\r\n" in little endian order
|
||||
0 belong 0x02099900 python 1.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x03099900 python 1.1/1.2 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x892e0d0a python 1.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x04170d0a python 1.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x994e0d0a python 1.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xfcc40d0a python 1.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xfdc40d0a python 1.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x87c60d0a python 2.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x88c60d0a python 2.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2aeb0d0a python 2.1 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2beb0d0a python 2.1 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2ded0d0a python 2.2 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2eed0d0a python 2.2 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x3bf20d0a python 2.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x3cf20d0a python 2.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x45f20d0a python 2.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x59f20d0a python 2.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x63f20d0a python 2.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x6df20d0a python 2.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x6ef20d0a python 2.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x77f20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x81f20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x8bf20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x8cf20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x95f20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x9ff20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xa9f20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xb3f20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xb4f20d0a python 2.5 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xc7f20d0a python 2.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xd1f20d0a python 2.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xd2f20d0a python 2.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xdbf20d0a python 2.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xe5f20d0a python 2.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xeff20d0a python 2.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xf9f20d0a python 2.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x03f30d0a python 2.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x04f30d0a python 2.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xb80b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xc20b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xcc0b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xd60b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xe00b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xea0b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xf40b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xf50b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xff0b0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x090c0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x130c0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x1d0c0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x1f0c0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x270c0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x3b0c0d0a python 3.0 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x450c0d0a python 3.1 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x4f0c0d0a python 3.1 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x580c0d0a python 3.2 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x620c0d0a python 3.2 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x6c0c0d0a python 3.2 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x760c0d0a python 3.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x800c0d0a python 3.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x8a0c0d0a python 3.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x940c0d0a python 3.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x9e0c0d0a python 3.3 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xb20c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xbc0c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xc60c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xd00c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xda0c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xe40c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xee0c0d0a python 3.4 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0xf80c0d0a python 3.5.1- byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x020d0d0a python 3.5.1- byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x0c0d0d0a python 3.5.1- byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x160d0d0a python 3.5.1- byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x170d0d0a python 3.5.2+ byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x200d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x210d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2a0d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2b0d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2c0d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2d0d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x2f0d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x300d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x310d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x320d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x330d0d0a python 3.6 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x3e0d0d0a python 3.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x3f0d0d0a python 3.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x400d0d0a python 3.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x410d0d0a python 3.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x420d0d0a python 3.7 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x480d0d0a python 3.8 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x490d0d0a python 3.8 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x520d0d0a python 3.8 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x530d0d0a python 3.8 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x540d0d0a python 3.8 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x550d0d0a python 3.8 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x5c0d0d0a python 3.9 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x5d0d0d0a python 3.9 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x5e0d0d0a python 3.9 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x5f0d0d0a python 3.9 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x600d0d0a python 3.9 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
0 belong 0x610d0d0a python 3.9 byte-compiled
|
||||
-!:mime text/x-bytecode.python
|
||||
+!:mime application/x-bytecode.python
|
||||
|
||||
0 search/1/w #!\040/usr/bin/python Python script text executable
|
||||
!:strength + 15
|
||||
@ -1,147 +0,0 @@
|
||||
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
|
||||
@ -1,37 +0,0 @@
|
||||
From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Mon, 19 Apr 2021 17:01:45 +0000
|
||||
Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
|
||||
|
||||
---
|
||||
magic/Magdir/compress | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/magic/Magdir/compress b/magic/Magdir/compress
|
||||
index 64d11a736..41a65738f 100644
|
||||
--- a/magic/Magdir/compress
|
||||
+++ b/magic/Magdir/compress
|
||||
@@ -1,5 +1,5 @@
|
||||
#------------------------------------------------------------------------------
|
||||
-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
|
||||
+# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
|
||||
# compress: file(1) magic for pure-compression formats (no archives)
|
||||
#
|
||||
# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
|
||||
@@ -265,14 +265,13 @@
|
||||
|
||||
# http://tukaani.org/xz/xz-file-format.txt
|
||||
0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
|
||||
+!:strength * 2
|
||||
+!:mime application/x-xz
|
||||
>7 byte&0xf 0x0 NONE
|
||||
>7 byte&0xf 0x1 CRC32
|
||||
>7 byte&0xf 0x4 CRC64
|
||||
>7 byte&0xf 0xa SHA-256
|
||||
|
||||
-!:strength * 2
|
||||
-!:mime application/x-xz
|
||||
-
|
||||
# https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
|
||||
0 string LRZI LRZIP compressed data
|
||||
>4 byte x - version %d
|
||||
18
file.spec
18
file.spec
@ -14,8 +14,8 @@
|
||||
|
||||
Summary: Utility for determining file types
|
||||
Name: file
|
||||
Version: 5.40
|
||||
Release: 9%{?dist}
|
||||
Version: 5.41
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Source0: http://ftp.astron.com/pub/file/file-%{version}.tar.gz
|
||||
|
||||
@ -26,13 +26,6 @@ Patch0: file-localmagic.patch
|
||||
Patch1: file-4.17-rpm-name.patch
|
||||
Patch2: file-5.04-volume_key.patch
|
||||
|
||||
# Upstream commit 9b0459afab309a82aa4e46f73a4e50dd641f3d39
|
||||
Patch3: file-5.40-magic-xzip.patch
|
||||
# Upstream commit f06015040e7ffb3be21bb7622f9f8291b749aaf9
|
||||
Patch4: file-5.40-magic-unsigned.patch
|
||||
# Upstream commit 7d9b0f0d853957ad88dae0f440fecd58d2740ca7
|
||||
Patch5: file-5.40-magic-python.patch
|
||||
|
||||
URL: https://www.darwinsys.com/file/
|
||||
Requires: file-libs%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: zlib-devel
|
||||
@ -170,14 +163,14 @@ make -C tests check
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc ChangeLog README
|
||||
%doc ChangeLog
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*
|
||||
%config(noreplace) %{_sysconfdir}/magic
|
||||
|
||||
%files libs
|
||||
%license COPYING
|
||||
%doc ChangeLog README
|
||||
%doc ChangeLog
|
||||
%{_libdir}/*so.*
|
||||
%{_datadir}/magic*
|
||||
%{_mandir}/man5/*
|
||||
@ -215,6 +208,9 @@ make -C tests check
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 19 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.41-1
|
||||
- update to new version 5.41
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.40-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (file-5.40.tar.gz) = 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
|
||||
SHA512 (file-5.41.tar.gz) = bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
|
||||
|
||||
Loading…
Reference in New Issue
Block a user