SLFO-pool/file
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main file revision 051aa3071dce1618c65a0ad04e4ca577

Browse Source
This commit is contained in:
Adrian Schröter 2024-12-13 10:56:38 +01:00
parent d4a637686e
commit 7848f8e7ae
20 changed files with 271 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dc71304b.patch
View File

@ -1,27 +0,0 @@
From dc71304b3b1fd2ed5f7098d59fb7f6ef10cfdc85 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sat, 31 Dec 2022 20:24:08 +0000
Subject: [PATCH] pyzip improvements (FC Stegerman)
---
magic/Magdir/archive | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- magic/Magdir/archive
+++ magic/Magdir/archive 2023-01-11 12:59:19.451975877 +0000
@@ -1876,9 +1876,14 @@
# https://en.wikipedia.org/wiki/ZIP_(file_format)#End_of_central_directory_record_(EOCD)
# by Michal Gorny <mgorny@gentoo.org>
-2 uleshort 0
->&-22 string PK\005\006 Zip archive, with extra data prepended
+>&-22 string PK\005\006
+# without #!
+>>0 string !#! Zip archive, with extra data prepended
!:mime application/zip
!:ext zip/cbz
+# with #!
+>>0 string/w #!\ a
+>>>&-1 string/T x %s script executable (Zip archive)
# ACE archive (from http://www.wotsit.org/download.asp?f=ace)
# by Stefan `Sec` Zehl <sec@42.org>

2
file-4.24-autoconf.dif
View File

@ -38,7 +38,7 @@
#include <stdint.h>
#endif
@@ -542,4 +545,5 @@ typedef struct {
@@ -573,4 +576,5 @@ typedef struct {
#define DF_1_STUB 0x04000000 /* Stub */
#define DF_1_PIE 0x08000000 /* Position Independent Executable */

8
file-5.17-option.dif
View File

@ -2,7 +2,7 @@ Index: file-5.43/src/file.c
===================================================================
--- file-5.43.orig/src/file.c
+++ file-5.43/src/file.c
@@ -260,6 +260,8 @@ main(int argc, char *argv[])
@@ -265,6 +265,8 @@ main(int argc, char *argv[])
break;
case 'e':
case OPT_EXCLUDE_QUIET:
@ -11,7 +11,7 @@ Index: file-5.43/src/file.c
for (i = 0; i < __arraycount(nv); i++)
if (strcmp(nv[i].name, optarg) == 0)
break;
@@ -272,7 +274,7 @@ main(int argc, char *argv[])
@@ -277,7 +279,7 @@ main(int argc, char *argv[])
break;
case 'f':
@ -20,7 +20,7 @@ Index: file-5.43/src/file.c
usage();
if (magic == NULL)
if ((magic = load(magicfile, flags)) == NULL)
@@ -282,6 +284,8 @@ main(int argc, char *argv[])
@@ -287,6 +289,8 @@ main(int argc, char *argv[])
++didsomefiles;
break;
case 'F':
@ -29,7 +29,7 @@ Index: file-5.43/src/file.c
separator = optarg;
break;
case 'i':
@@ -294,6 +298,8 @@ main(int argc, char *argv[])
@@ -299,6 +303,8 @@ main(int argc, char *argv[])
action = FILE_LIST;
break;
case 'm':

22
file-5.18-javacheck.dif
View File

@ -1,13 +1,17 @@
Index: magic/Magdir/cafebabe
===================================================================
--- magic/Magdir/cafebabe.orig
+++ magic/Magdir/cafebabe
@@ -17,7 +17,7 @@
### JAVA START ###
# Reference: http://en.wikipedia.org/wiki/Java_class_file
# Update: Joerg Jenderek
---
magic/Magdir/cafebabe | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- magic/Magdir/cafebabe
+++ magic/Magdir/cafebabe 2024-11-28 08:56:12.978938091 +0000
@@ -32,7 +32,7 @@
# Reference: https://opensource.apple.com/source/cctools/cctools-949.0.1/
# include/mach-o/fat.h
# include/mach/machine.h
-0 belong 0xcafebabe
+0 belong 0xcafebabe Cafe Babe
>4 ubelong >30 compiled Java class data,
!:mime application/x-java-applet
#!:mime application/java-byte-code
>4 belong 1 Mach-O universal binary with 1 architecture:
!:mime application/x-mach-binary
>>8 use mach-o \b

2
file-5.19-biorad.dif
View File

@ -6,7 +6,7 @@ Index: magic/Magdir/images
===================================================================
--- magic/Magdir/images.orig
+++ magic/Magdir/images
@@ -2167,6 +2167,8 @@
@@ -2378,6 +2378,8 @@
# https://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
# Samples: https://www.loci.wisc.edu/software/sample-data
14 uleshort <2

2
file-5.19-printf.dif
View File

@ -6,7 +6,7 @@ Index: src/apprentice.c
===================================================================
--- src/apprentice.c.orig
+++ src/apprentice.c
@@ -2623,7 +2623,7 @@ check_format_type(const char *ptr, int t
@@ -2647,7 +2647,7 @@ check_format_type(const char *ptr, int t
}
} else
h = 0;

19
file-5.19-zip2.0.dif
View File

@ -1,20 +1,19 @@
---
magic/Magdir/archive | 5 +++++
1 file changed, 5 insertions(+)
magic/Magdir/archive | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: magic/Magdir/archive
===================================================================
--- magic/Magdir/archive.orig
+++ magic/Magdir/archive
@@ -1504,6 +1504,11 @@
--- magic/Magdir/archive
+++ magic/Magdir/archive 2024-11-28 08:59:31.099299217 +0000
@@ -1793,7 +1793,11 @@
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
!:mime application/zip
!:ext zip/cbz
-
+>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract
+>>34 ubelong 0x74797065 \b, mime type
+>>>38 regex application/[a-z+-]+ \b %s
+!:mime application/unknown+zip
+!:mime application/unknown+zip
+!:ext zip/cbz
# Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
0 string PK\005\006 Zip archive data (empty)
0 string PK\003\004
!:strength +1

4
file-5.22-elf.dif
View File

@ -6,7 +6,7 @@ Index: src/readelf.c
===================================================================
--- src/readelf.c.orig
+++ src/readelf.c
@@ -828,7 +828,7 @@ do_core_note(struct magic_set *ms, unsig
@@ -884,7 +884,7 @@ do_core_note(struct magic_set *ms, unsig
default:
if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
@ -15,7 +15,7 @@ Index: src/readelf.c
unsigned char c;
/*
* Extract the program name. We assume
@@ -840,7 +840,9 @@ do_core_note(struct magic_set *ms, unsig
@@ -896,7 +896,9 @@ do_core_note(struct magic_set *ms, unsig
* If the characters aren't all printable,
* reject it.
*/

2
file-5.28-btrfs-image.dif
View File

@ -17,7 +17,7 @@ Index: file-5.43/magic/Magdir/filesystems
===================================================================
--- file-5.43.orig/magic/Magdir/filesystems
+++ file-5.43/magic/Magdir/filesystems
@@ -2257,20 +2257,29 @@
@@ -2277,20 +2277,29 @@
>>0x10060 string >\0 lockproto %s)
# Russell Coker <russell@coker.com.au>

BIN
file-5.44.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

6
file-5.44.tar.gz.asc
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQS+BJlbqPkO0MDBdsRxESqxbLM7OgUCY6nndwAKCRBxESqxbLM7
OiUWAJ9ygauXJ3pohF38SQuLYu+J8qayuwCeIFPcEukUyNuYv04B9FIXkumreI8=
=/CFO
-----END PGP SIGNATURE-----

170
file-5.44.dif → file-5.46.dif
View File

@ -10,8 +10,8 @@
8 files changed, 313 insertions(+), 68 deletions(-)
--- magic/Magdir/elf
+++ magic/Magdir/elf 2023-01-09 14:36:25.751054574 +0000
@@ -152,7 +152,7 @@
+++ magic/Magdir/elf 2023-07-28 09:42:01.845813939 +0000
@@ -154,7 +154,7 @@
>18 leshort 47 Renesas H8/300H,
>18 leshort 48 Renesas H8S,
>18 leshort 49 Renesas H8/500,
@ -20,58 +20,59 @@
>18 leshort 51 Stanford MIPS-X,
>18 leshort 52 Motorola Coldfire,
>18 leshort 53 Motorola M68HC12,
--- magic/Magdir/linux
+++ magic/Magdir/linux 2023-01-09 14:36:25.751054574 +0000
@@ -140,27 +140,31 @@
# All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
# Linux kernel boot images (i386 arch) (Wolfram Kleff)
# URL: https://www.kernel.org/doc/Documentation/x86/boot.txt
-514 string HdrS Linux kernel
+514 string HdrS Linux
!:strength + 55
# often no extension like in linux, vmlinuz, bzimage or memdisk but sometimes
# Acronis Recovery kernel64.dat and Plop Boot Manager plpbtrom.bin
# DamnSmallLinux 1.5 damnsmll.lnx
!:ext /dat/bin/lnx
->510 leshort 0xAA55 x86 boot executable
->>518 leshort >0x1ff
->>>529 byte 0 zImage,
->>>529 byte 1 bzImage,
->>>526 lelong >0
->>>>(526.s+0x200) string >\0 version %s,
->>498 leshort 1 RO-rootFS,
->>498 leshort 0 RW-rootFS,
->>508 leshort >0 root_dev %#X,
->>502 leshort >0 swap_dev %#X,
->>504 leshort >0 RAMdisksize %u KB,
->>506 leshort 0xFFFF Normal VGA
->>506 leshort 0xFFFE Extended VGA
->>506 leshort 0xFFFD Prompt for Videomode
->>506 leshort >0 Video mode %d
+>510 leshort 0xAA55 \b/x86 Kernel
+>510 leshort <0xAA55 Kernel
+>510 leshort >0xAA55 Kernel
+>518 leshort 0x0105 \b, Setup Version 0x105, zImage
+>518 leshort >0x0105 \b, Setup Version %#x
+>518 leshort >0x1ff
+>>529 byte 0 \b, zImage
+>>529 byte 1 \b, bzImage
+>>526 lelong >0
+>>>(526.s+0x200) string >\0 \b, Version %s
+>>498 leshort 1 \b, RO-rootFS
+>>498 leshort 0 \b, RW-rootFS
+>>508 leshort >0 \b, root_dev %#X
+>>502 leshort >0 \b, swap_dev %#X
+>>504 leshort >0 \b, RAMdisksize %u KB
+>>506 leshort 0xFFFF \b, Normal VGA
+>>506 leshort 0xFFFE \b, Extended VGA
+>>506 leshort 0xFFFD \b, Prompt for Videomode
+>>506 leshort >0 \b, Video mode %d
# This also matches new kernels, which were caught above by "HdrS".
0 belong 0xb8c0078e Linux kernel
>0x1e3 string Loading version 1.3.79 or older
! Does not fit anymore !!
!--- magic/Magdir/linux
!+++ magic/Magdir/linux 2023-07-28 09:42:01.845813939 +0000
!@@ -140,27 +140,31 @@
! # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
! # Linux kernel boot images (i386 arch) (Wolfram Kleff)
! # URL: https://www.kernel.org/doc/Documentation/x86/boot.txt
!-514 string HdrS Linux kernel
!+514 string HdrS Linux
! !:strength + 55
! # often no extension like in linux, vmlinuz, bzimage or memdisk but sometimes
! # Acronis Recovery kernel64.dat and Plop Boot Manager plpbtrom.bin
! # DamnSmallLinux 1.5 damnsmll.lnx
! !:ext /dat/bin/lnx
!->510 leshort 0xAA55 x86 boot executable
!->>518 leshort >0x1ff
!->>>529 byte 0 zImage,
!->>>529 byte 1 bzImage,
!->>>526 lelong >0
!->>>>(526.s+0x200) string >\0 version %s,
!->>498 leshort 1 RO-rootFS,
!->>498 leshort 0 RW-rootFS,
!->>508 leshort >0 root_dev %#X,
!->>502 leshort >0 swap_dev %#X,
!->>504 leshort >0 RAMdisksize %u KB,
!->>506 leshort 0xFFFF Normal VGA
!->>506 leshort 0xFFFE Extended VGA
!->>506 leshort 0xFFFD Prompt for Videomode
!->>506 leshort >0 Video mode %d
!+>510 leshort 0xAA55 \b/x86 Kernel
!+>510 leshort <0xAA55 Kernel
!+>510 leshort >0xAA55 Kernel
!+>518 leshort 0x0105 \b, Setup Version 0x105, zImage
!+>518 leshort >0x0105 \b, Setup Version %#x
!+>518 leshort >0x1ff
!+>>529 byte 0 \b, zImage
!+>>529 byte 1 \b, bzImage
!+>>526 lelong >0
!+>>>(526.s+0x200) string >\0 \b, Version %s
!+>>498 leshort 1 \b, RO-rootFS
!+>>498 leshort 0 \b, RW-rootFS
!+>>508 leshort >0 \b, root_dev %#X
!+>>502 leshort >0 \b, swap_dev %#X
!+>>504 leshort >0 \b, RAMdisksize %u KB
!+>>506 leshort 0xFFFF \b, Normal VGA
!+>>506 leshort 0xFFFE \b, Extended VGA
!+>>506 leshort 0xFFFD \b, Prompt for Videomode
!+>>506 leshort >0 \b, Video mode %d
! # This also matches new kernels, which were caught above by "HdrS".
! 0 belong 0xb8c0078e Linux kernel
! >0x1e3 string Loading version 1.3.79 or older
--- magic/Magdir/msad
+++ magic/Magdir/msad 2023-01-09 14:36:25.751054574 +0000
+++ magic/Magdir/msad 2023-07-28 09:42:01.845813939 +0000
@@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------
+# msad: file(1) magic for msad
@ -79,20 +80,21 @@
+# This must precede the heuristic for raw G3 data
+4 string Standard\ Jet\ DB Microsoft Access Database
--- magic/Magdir/msdos
+++ magic/Magdir/msdos 2023-01-09 14:36:25.751054574 +0000
@@ -296,9 +296,9 @@
>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>(0x3c.l+22) leshort&0x1000 >0 system file
+++ magic/Magdir/msdos 2024-11-28 10:44:09.616373881 +0000
@@ -331,10 +331,10 @@
# Check for presence of COM Runtime descriptor
>>(0x3c.l+24) leshort 0x010b
->>>(0x3c.l+232) lelong >0 Mono/.Net assembly
+>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly
>>>(0x3c.l+116) leshort >14
->>>>(0x3c.l+232) lelong >0 Mono/.Net assembly
+>>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly
>>(0x3c.l+24) leshort 0x020b
->>>(0x3c.l+248) lelong >0 Mono/.Net assembly
+>>>(0x3c.l+248) lelong >0 \b, Mono/.Net assembly
>>>(0x3c.l+132) leshort >14
->>>>(0x3c.l+248) lelong >0 Mono/.Net assembly
+>>>>(0x3c.l+248) lelong >0 \b, Mono/.Net assembly
# hooray, there's a DOS extender using the PE format, with a valid PE
# executable inside (which just prints a message and exits if run in win)
@@ -1020,7 +1020,7 @@
@@ -1499,7 +1499,7 @@
>1 leshort <-259
# that offset must be accessible
# add 10000h to jump at end of 64 KiB segment, add 1 for jump instruction and 2 for 16-bit offset
@ -102,7 +104,7 @@
#>>>&-1 ubelong x \b, NEXT instruction %#8.8x
>>>0 use msdos-com
--- magic/Makefile.am
+++ magic/Makefile.am 2023-01-09 14:37:10.602219227 +0000
+++ magic/Makefile.am 2023-07-28 09:42:01.849813866 +0000
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -120,7 +122,7 @@
$(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
@@ -105,7 +104,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
@@ -106,7 +105,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/espressif \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@ -128,7 +130,7 @@
$(MAGIC_FRAGMENT_DIR)/finger \
$(MAGIC_FRAGMENT_DIR)/firmware \
$(MAGIC_FRAGMENT_DIR)/flash \
@@ -152,6 +150,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -153,6 +151,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@ -137,7 +139,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
@@ -162,7 +162,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
@@ -165,7 +165,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@ -145,7 +147,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/locoscript \
@@ -170,7 +169,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -173,7 +172,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
$(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
@ -153,7 +155,7 @@
$(MAGIC_FRAGMENT_DIR)/macos \
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
@@ -194,11 +192,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -197,11 +195,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -166,7 +168,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/msx \
@@ -262,6 +260,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \
@@ -265,6 +263,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/ringdove \
$(MAGIC_FRAGMENT_DIR)/riff \
@ -175,7 +177,7 @@
$(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rpmsg \
@@ -353,9 +353,21 @@ EXTRA_DIST = \
@@ -358,9 +358,21 @@ EXTRA_DIST = \
$(MAGIC_DIR)/scripts/create_filemagic_flac \
$(MAGIC_FRAGMENTS)
@ -199,7 +201,7 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@@ -367,19 +379,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
@@ -372,19 +384,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE)
endif
@ -239,8 +241,8 @@
+# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic
--- magic/Makefile.in
+++ magic/Makefile.in 2023-01-09 14:37:31.561828862 +0000
@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
+++ magic/Makefile.in 2023-07-28 09:42:01.849813866 +0000
@@ -284,7 +284,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -249,7 +251,7 @@
MAGIC_FRAGMENTS = \
$(MAGIC_DIR)/Header \
$(MAGIC_DIR)/Localstuff \
@@ -298,7 +298,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
@@ -302,7 +302,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \
$(MAGIC_FRAGMENT_DIR)/apache \
$(MAGIC_FRAGMENT_DIR)/apl \
@ -257,7 +259,7 @@
$(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
@@ -379,7 +378,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
@@ -384,7 +383,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/espressif \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@ -265,7 +267,7 @@
$(MAGIC_FRAGMENT_DIR)/finger \
$(MAGIC_FRAGMENT_DIR)/firmware \
$(MAGIC_FRAGMENT_DIR)/flash \
@@ -426,6 +424,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -431,6 +429,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@ -274,7 +276,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
@@ -436,7 +436,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
@@ -443,7 +443,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@ -282,7 +284,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/locoscript \
@@ -444,7 +443,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -451,7 +450,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \
$(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
@ -290,7 +292,7 @@
$(MAGIC_FRAGMENT_DIR)/macos \
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
@@ -468,11 +466,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -475,11 +473,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -303,7 +305,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/msx \
@@ -536,6 +534,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \
@@ -543,6 +541,8 @@ $(MAGIC_FRAGMENT_DIR)/qt \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/ringdove \
$(MAGIC_FRAGMENT_DIR)/riff \
@ -312,7 +314,7 @@
$(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rpmsg \
@@ -627,10 +627,22 @@ EXTRA_DIST = \
@@ -636,10 +636,22 @@ EXTRA_DIST = \
$(MAGIC_DIR)/scripts/create_filemagic_flac \
$(MAGIC_FRAGMENTS)
@ -336,7 +338,7 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
@@ -855,23 +867,25 @@ uninstall-am: uninstall-pkgdataDATA
@@ -863,23 +875,25 @@ uninstall-am: uninstall-pkgdataDATA
.PRECIOUS: Makefile
@ -379,7 +381,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- src/Makefile.am
+++ src/Makefile.am 2023-01-09 14:36:25.751054574 +0000
+++ src/Makefile.am 2023-07-28 09:42:01.849813866 +0000
@@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
@ -387,7 +389,7 @@
nodist_include_HEADERS = magic.h
--- src/dcore.c
+++ src/dcore.c 2023-01-09 14:36:25.751054574 +0000
+++ src/dcore.c 2023-07-28 09:42:01.865813574 +0000
@@ -0,0 +1,207 @@
+/*
+ * Show goo about ELF core files

BIN
file-5.46.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
file-5.46.tar.gz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQS+BJlbqPkO0MDBdsRxESqxbLM7OgUCZ0c+EQAKCRBxESqxbLM7
OkFvAJ9cMVrW0aZfXPN6kqU7zi5Sgy43xQCg6WRiqMb4bQZy/F1i11rmP7+Mx7Q=
=y7Gw
-----END PGP SIGNATURE-----

35
file-seccomp.patch Normal file
View File

@ -0,0 +1,35 @@
From 3cb58bb51d47b8e61611350324b751eaa46166a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 8 Nov 2024 08:28:12 +0100
Subject: [PATCH] Allow getrandom, rseq, and prctl for glibc malloc
glibc uses getrandom in malloc, rseq, and prctl in various other
places, allow these syscalls in seccomp filter.
```
export GLIBC_TUNABLES=glibc.mem.decorate_maps=1
make check
```
Signed-off-by: Werner Fink <werner@suse.de>
---
src/seccomp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/seccomp.c b/src/seccomp.c
index ce824330..8a2c8a4c 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -80,6 +80,9 @@ enable_sandbox(void)
if (ctx == NULL)
return -1;
+ ALLOW_RULE(prctl);
+ ALLOW_RULE(getrandom);
+ ALLOW_RULE(rseq);
ALLOW_RULE(access);
ALLOW_RULE(brk);
ALLOW_RULE(close);
--
2.43.0

4
file-secure_getenv.patch
View File

@ -6,7 +6,7 @@
--- file-5.42/configure.ac
+++ file-5.42/configure.ac 2022-06-13 08:34:50.347521415 +0000
@@ -130,6 +130,8 @@ if test "$enable_xzlib" != "no"; then
@@ -138,6 +138,8 @@ if test "$enable_xzlib" != "no"; then
fi
AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include <signal.h>])
@ -17,7 +17,7 @@
AC_TYPE_SIZE_T
--- file-5.42/src/file.h
+++ file-5.42/src/file.h 2022-06-13 08:34:50.347521415 +0000
@@ -709,4 +709,12 @@ static const char *rcsid(const char *p)
@@ -735,4 +735,12 @@ static const char *rcsid(const char *p)
#define __RCSID(a)
#endif

72
file.changes
View File

@ -1,3 +1,75 @@
-------------------------------------------------------------------
Thu Nov 28 10:51:57 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Update to 5.46:
* Add OFFPOSITIVE
* avoid leaking symbols in libmagic
* PR/562: jsummers: Search/regex offsets are absolute to the
beginning of the file, so adjust them by subtracting the
offset that the "use" starts so that we don't double-count it.
* PR/543: matshch: bump nbuf so we can get the flags into the buffer.
* Add Android elf notes (enh)
* Add limit for number of magic warnings allowed
* check regex bounds (found by clusterfuzz)
- Remove patch file-5.45-type_t.dif now upstream
- Port patches
* file-4.24-autoconf.dif
* file-5.17-option.dif
* file-5.18-javacheck.dif
* file-5.19-biorad.dif
* file-5.19-printf.dif
* file-5.19-zip2.0.dif
* file-5.22-elf.dif
* file-5.28-btrfs-image.dif
* file-5.45-type_t.dif
* file-secure_getenv.patch
- Port patch file-5.45.dif and rename it to file-5.46.dif
* Note that our kernel magics do not fit anymore as
upstream now has a huge rework and extended features
-------------------------------------------------------------------
Thu Nov 7 20:11:48 UTC 2024 - Cristian Rodríguez <crrodriguez@opensuse.org>
- file-seccomp.patch: glibc uses getrandom in malloc, rseq and prctl
in various other places, allow these syscalls in seccomp filter.
-------------------------------------------------------------------
Mon Feb 26 09:11:40 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Prepare for RPM 4.20
-------------------------------------------------------------------
Mon Jul 31 09:44:14 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Add patch file-5.45-type_t.dif
* Partly upstream check of type_t is wide on 32bit systems
* Extend (auto)configure to enable wide type_t type if possible
-------------------------------------------------------------------
Fri Jul 28 11:51:24 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- On 32bit systems define _TIME_BITS=64 to make it build
-------------------------------------------------------------------
Fri Jul 28 09:48:53 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update to 5.45:
* PR/465: psrok1: Avoid muslc asctime_r crash
* add SIMH tape format support
* bump the max size of the elf section notes to be read to 128K
and make it configurable
* PR/415: Fix decompression with program returning empty
* PR/408: fix -p with seccomp
* PR/412: fix MinGW compilation
- Remove upstream patch dc71304b.patch
- Modify patches
* file-5.17-option.dif
* file-5.19-biorad.dif
* file-5.19-zip2.0.dif
* file-5.22-elf.dif
* file-secure_getenv.patch
- Port and rename patch file-5.44.dif now file-5.45.dif
-------------------------------------------------------------------
Thu May 4 14:15:38 UTC 2023 - Frederic Crozat <fcrozat@suse.com>

52
file.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package file
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -34,7 +34,7 @@ Obsoletes: file-64bit
%endif
#
# Set Version also in python-magic.spec
Version: 5.44
Version: 5.46
Release: 0
Summary: A Tool to Determine File Types
License: BSD-2-Clause
@ -44,7 +44,7 @@ Source2: baselibs.conf
Source3: file-rpmlintrc
Source4: https://www.astron.com/pub/file/file-%{version}.tar.gz.asc
Source5: file.keyring
Patch0: file-5.44.dif
Patch0: file-5.46.dif
Patch1: file-5.19-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
@ -63,8 +63,7 @@ Patch31: file-5.19-biorad.dif
Patch32: file-5.19-clicfs.dif
Patch37: file-secure_getenv.patch
Patch39: file-5.28-btrfs-image.dif
# PATCH-FIX-UPSTREAM
Patch42: dc71304b.patch
Patch43: file-seccomp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global magicdir %{_datadir}/file
@ -109,26 +108,26 @@ to develop applications that require the magic "file" interface.
%prep
%setup -q -n file-%{version}
%patch42 -p0
%patch1 -p0 -b .misc
%patch4 -p0 -b .conf
%patch5 -p0 -b .tex
%patch7 -p0 -b .ssd
%patch8 -p0 -b .xen
%patch9 -p0 -b .elf
%patch10 -p0 -b .prtf
%patch12 -p1 -b .opt
%patch13 -p0 -b .scri
%patch15 -p0 -b .xcur
%patch22 -p0 -b .cromfs
%patch25 -p0 -b .javacheck
%patch26 -p0 -b .solv
%patch27 -p0 -b .zip2.0
%patch31 -p0 -b .biorad
%patch32 -p0 -b .clicfs
%patch37 -p1 -b .getenv
%patch39 -p1 -b .btrfs
%patch0 -b .0
%patch -P 1 -p0 -b .misc
%patch -P 4 -p0 -b .conf
%patch -P 5 -p0 -b .tex
%patch -P 7 -p0 -b .ssd
%patch -P 8 -p0 -b .xen
%patch -P 9 -p0 -b .elf
%patch -P 10 -p0 -b .prtf
%patch -P 12 -p1 -b .opt
%patch -P 13 -p0 -b .scri
%patch -P 15 -p0 -b .xcur
%patch -P 22 -p0 -b .cromfs
%patch -P 25 -p0 -b .javacheck
%patch -P 26 -p0 -b .solv
%patch -P 27 -p0 -b .zip2.0
%patch -P 31 -p0 -b .biorad
%patch -P 32 -p0 -b .clicfs
%patch -P 37 -p1 -b .getenv
%patch -P 39 -p1 -b .btrfs
%patch -P 0 -b .0
%patch -P 43 -p1 -b .seccomp
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
rm -fv src/magic.h
@ -162,6 +161,8 @@ install -s dcore %{buildroot}%{_bindir}
rm -f %{buildroot}%{_libdir}/*.la
%check
# Test if prctl is still allowed by the seccomp filter.
export GLIBC_TUNABLES=glibc.mem.decorate_maps=1
# Standard checks
make check
# Check out that the binary does not bail out:
@ -174,6 +175,7 @@ for dir in %{_bindir} /%{_lib} %{_libdir} ; do
xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic
done
unset LD_LIBRARY_PATH
unset GLIBC_TUNABLES
%post -n %libname -p /sbin/ldconfig

5
python-magic.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 9 14:18:25 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Don't use `setup.py test`, that is now not allowed.
-------------------------------------------------------------------
Thu May 4 14:15:38 UTC 2023 - Frederic Crozat <fcrozat@suse.com>

8
python-magic.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-magic
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global _miscdir %{_datadir}/misc
Name: python-magic
Version: 5.44
Version: 5.46
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause AND BSD-4-Clause
@ -60,9 +60,7 @@ popd
export LC_ALL=C.UTF-8
pushd python
%python_flavored_alternatives
%{python_expand # indicate a writeable .pth directory for tests
python%{$python_version} setup.py test
}
%pyunittest -v tests
popd
%files %{python_files}