From 1c2561b9b470163133c7de2ef6c9eed7eb0f6014 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 21 Jun 2026 11:26:32 +0300 Subject: [PATCH] Update package version to 5.48 --- info.yml | 6 ++--- recipe.sh | 8 ------- ...tches-too-many-unix-stanza-files-lik.patch | 23 ------------------ ...Revert-previous-and-always-set-offse.patch | 24 ------------------- 4 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 source-files/0001-Revert-PR-679-matches-too-many-unix-stanza-files-lik.patch delete mode 100644 source-files/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch diff --git a/info.yml b/info.yml index 26d9ece..43d2c10 100644 --- a/info.yml +++ b/info.yml @@ -1,7 +1,7 @@ name: file description: File type detection program -version: "5.47" -revision: 3 +version: "5.48" +revision: 1 url: https://www.darwinsys.com/file/ license: Custom maintainers: @@ -19,4 +19,4 @@ downloads: - url: https://astron.com/pub/file/file-${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 45672fec165cb4cc1358a2d76b5d57d22876dcb97ab169427ac385cbe1d5597a + checksum: ed14656883b23a364b4057c05595d93252da9bc473d30106519519d0da141283 diff --git a/recipe.sh b/recipe.sh index dbf0053..368486e 100644 --- a/recipe.sh +++ b/recipe.sh @@ -2,14 +2,6 @@ # 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 -# 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 # This function is used to compile the source code build() { diff --git a/source-files/0001-Revert-PR-679-matches-too-many-unix-stanza-files-lik.patch b/source-files/0001-Revert-PR-679-matches-too-many-unix-stanza-files-lik.patch deleted file mode 100644 index 7ac303f..0000000 --- a/source-files/0001-Revert-PR-679-matches-too-many-unix-stanza-files-lik.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f37cc42c535a08598d3ec4b4fa7aa73af7a8e223 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -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 diff --git a/source-files/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch b/source-files/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch deleted file mode 100644 index 538eef0..0000000 --- a/source-files/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c54605718190ad8fe9c25cb475f1f32ca7cd54f7 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -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) { -