Fix regressions

This commit is contained in:
2026-05-06 20:56:22 +03:00
parent a893053851
commit e38294d006
4 changed files with 56 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: file name: file
description: File type detection program description: File type detection program
version: "5.47" version: "5.47"
revision: 1 revision: 2
url: https://www.darwinsys.com/file/ url: https://www.darwinsys.com/file/
license: Custom license: Custom
maintainers: maintainers:
@@ -0,0 +1,23 @@
From f37cc42c535a08598d3ec4b4fa7aa73af7a8e223 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <[email protected]>
Date: Wed, 25 Mar 2026 22:10:22 +0000
Subject: [PATCH 1/1] Revert PR/679: matches too many unix stanza files (like
toml). https://bbs.archlinux.org/viewtopic.php?pid=2292157#p2292157
---
magic/Magdir/windows | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/magic/Magdir/windows b/magic/Magdir/windows
index eb5b8b3d..05eb1d01 100644
--- a/magic/Magdir/windows
+++ b/magic/Magdir/windows
@@ -1260,7 +1260,7 @@
>>>>>&0 ubyte x
# characters, digits, underscore and white space followed by right bracket
# terminated by CR implies section line to skip BOOTLOG.TXT DETLOG.TXT
->>>>>>&-1 regex/T \^([A-Za-z0-9_\(\)\ ]+)\][\r\n] Generic INItialization configuration [%-.40s
+>>>>>>&-1 regex/T \^([A-Za-z0-9_\(\)\ ]+)\]\r Generic INItialization configuration [%-.40s
# NETDEF.INF multiarc.ini
#!:mime application/x-setupscript
!:mime application/x-wine-extension-ini
@@ -0,0 +1,24 @@
From c54605718190ad8fe9c25cb475f1f32ca7cd54f7 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <[email protected]>
Date: Sun, 12 Apr 2026 22:15:14 +0000
Subject: [PATCH] PR/725: inliniac: Revert previous and always set offset.
---
src/softmagic.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/softmagic.c b/src/softmagic.c
index 9aaf8b3e..7cf7c798 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -1577,8 +1577,7 @@ normal:
ms->offset = offset;
ms->eoffset = 0;
} else {
- if (b->fd != -1)
- ms->offset = ms->eoffset + offset;
+ ms->offset = ms->eoffset + offset;
}
}
if ((ms->flags & MAGIC_DEBUG) != 0) {
+8
View File
@@ -2,6 +2,14 @@
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
# The prepare function is executed in the root of the temp directory
# This function is used for putting downloaded files to the correct location or applying patches
prepare() {
cd "$BPM_SOURCE"
patch -Np1 -i "$BPM_WORKDIR"/0001-Revert-PR-679-matches-too-many-unix-stanza-files-lik.patch
patch -Np1 -i "$BPM_WORKDIR"/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
}
# The build function is executed in the source directory # The build function is executed in the source directory
# This function is used to compile the source code # This function is used to compile the source code
build() { build() {