[rpms/file] f44: Fix file 5.48 regressions and update test expectations

[rpms/file] f44: Fix file 5.48 regressions and update test expectations

[Vincent Mihalkovic]

            A new commit has been pushed.

            Repo   : rpms/file
            Branch : f44
            Commit : b23a3bd73d3de15772fb2efa8808028b82a1f4b8
            Author : Vincent Mihalkovic <vmihalko@redhat.com>
            Date   : 2026-08-31T14:23:45+02:00
            Stats  : +38/-9 in 10 file(s)
            URL    : https://src.fedoraproject.org/rpms/file/c/b23a3bd73d3de15772fb2efa8808028b82a1f4b8?branch=f44

            Log:
            Fix file 5.48 regressions and update test expectations

- Backport the upstream Landlock decompressor fix
- Update test expectations for file 5.48

Resolves: rhbz#2513643
Resolves: rhbz#2427330

---
diff --git a/file-5.49-landlock-execute.patch b/file-5.49-landlock-execute.patch
new file mode 100644
index 0000000..9851e47
--- /dev/null
+++ b/file-5.49-landlock-execute.patch
@@ -0,0 +1,20 @@
+From: Christos Zoulas <christos@zoulas.com>
+Date: Thu, 27 Aug 2026 17:37:15 +0000
+Subject: PR/785: hexa: Disable execute restrictions for now. On NixOS and Fedora this breaks executing binaries like bzip2
+
+# Backport of upstream commit dcf3495219a0ccae60f10c00e6b16696c6fe3977
+# https://github.com/file/file/commit/dcf3495219a0ccae60f10c00e6b16696c6fe3977
+diff --git a/src/landlock.c b/src/landlock.c
+index 15b01d19..3136724f 100644
+--- a/src/landlock.c
++++ b/src/landlock.c
+@@ -108,7 +108,9 @@ enable_landlock(int flags, int action)
+ 
+ 	(void)memset(&attr, 0, sizeof(attr));
+ 	attr.handled_access_fs =
++#if 0
+ 	    LANDLOCK_ACCESS_FS_EXECUTE |
++#endif
+ 	    LANDLOCK_ACCESS_FS_WRITE_FILE |
+ 	    LANDLOCK_ACCESS_FS_READ_FILE |
+ 	    LANDLOCK_ACCESS_FS_READ_DIR |

diff --git a/file.spec b/file.spec
index 15ad027..750923a 100644
--- a/file.spec
+++ b/file.spec
@@ -15,7 +15,7 @@
 Summary: Utility for determining file types
 Name: file
 Version: 5.48
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Main license is BSD-2-Clause-Darwin
 # Shipped exceptions:
@@ -48,6 +48,10 @@ Patch3: file-5.45-readelf-limit-revert.patch
 
 Patch4: file-5.46-fix-tests-rpm-magic.patch
 
+# Disable Landlock execute restrictions so external decompressors can run
+# Upstream: https://github.com/file/file/commit/dcf3495219a0ccae60f10c00e6b16696c6fe3977
+Patch5: file-5.49-landlock-execute.patch
+
 URL: https://www.darwinsys.com/file/
 Requires: file-libs%{?_isa} = %{version}-%{release}
 BuildRequires: zlib-devel
@@ -229,6 +233,11 @@ make -C tests check
 %endif
 
 %changelog
+* Mon Aug 31 2026 Vincent Mihalkovic <vmihalko@redhat.com> - 5.48-2
+- Allow external decompressors to execute under Landlock
+  Resolves: rhbz#2513643
+  Resolves: rhbz#2427330
+
 * Fri Jul 10 2026 Vincent Mihalkovic <vmihalko@redhat.com> - 5.48-1
 - New upstream release 5.48; drop upstreamed patches
 - Fixes zipfile detection (rhbz#2427330)

diff --git a/tests/file-tests/reference/hta/access.hta.ref b/tests/file-tests/reference/hta/access.hta.ref
index 0258011..dbba28e 100644
--- a/tests/file-tests/reference/hta/access.hta.ref
+++ b/tests/file-tests/reference/hta/access.hta.ref
@@ -1 +1 @@
-HTML document, ASCII text
+Microsoft HTML Application (HTA), ASCII text

diff --git a/tests/file-tests/reference/hta/hello_world.hta.ref b/tests/file-tests/reference/hta/hello_world.hta.ref
index 0258011..dbba28e 100644
--- a/tests/file-tests/reference/hta/hello_world.hta.ref
+++ b/tests/file-tests/reference/hta/hello_world.hta.ref
@@ -1 +1 @@
-HTML document, ASCII text
+Microsoft HTML Application (HTA), ASCII text

diff --git a/tests/file-tests/reference/msi/SampleFirst_full.msi.ref b/tests/file-tests/reference/msi/SampleFirst_full.msi.ref
index faad2e8..42db532 100644
--- a/tests/file-tests/reference/msi/SampleFirst_full.msi.ref
+++ b/tests/file-tests/reference/msi/SampleFirst_full.msi.ref
@@ -1 +1 @@
-Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, MSI Installer, Code page: 1252, Title: Installation Database, Subject: Acme's Foobar 1.0 Installer, Author: file-test creator, Keywords: Installer, Comments: created following http://wix.tramontana.co.hu/tutorial, Template: Intel;1033, Revision Number: {F6B1C691-4136-4489-AD6A-DFE142735E4B}, Create Time/Date: Mon Mar 24 11:00:28 2014, Last Saved Time/Date: Mon Mar 24 11:00:28 2014, Number of Pages: 100, Number of Words: 2, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 2
+Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Microsoft Installer, Code page: 1252, Title: Installation Database, Subject: Acme's Foobar 1.0 Installer, Author: file-test creator, Keywords: Installer, Comments: created following http://wix.tramontana.co.hu/tutorial, Template: Intel;1033, Revision Number: {F6B1C691-4136-4489-AD6A-DFE142735E4B}, Create Time/Date: Mon Mar 24 11:00:28 2014, Last Saved Time/Date: Mon Mar 24 11:00:28 2014, Number of Pages: 100, Number of Words: 2, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 2

diff --git a/tests/file-tests/reference/msp/Patch_full.msp.ref b/tests/file-tests/reference/msp/Patch_full.msp.ref
index 4149f45..d45bfa0 100644
--- a/tests/file-tests/reference/msp/Patch_full.msp.ref
+++ b/tests/file-tests/reference/msp/Patch_full.msp.ref
@@ -1 +1 @@
-Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Code page: 1252, Title: Installation Database, Subject: Acme's Foobar 1.0 Installer, Author: Acme Ltd., Keywords: Installer, Comments: Foobar is a registered trademark of Acme Ltd., Create Time/Date: Mon Mar 24 11:33:32 2014, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 4, Template: Intel;1033, Last Saved By: Intel;1033, Revision Number: {3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}1.0.0;{3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}1.0.0;{11799D66-3206-495E-AA87-901734ECDAEA}, Number of Pages: 100, Number of Characters: 153223199
+Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Code page: 0, Title: Foobar 1.0.1 Patch, Subject: Small Update Patch, Author: Acme Ltd., Comments: Foobar 1.0.1 Patch, Template: {3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}, Last Saved By: :Sample.1;:#Sample.1, Revision Number: {0B607C62-DD6D-4AB4-B461-9133DB806A6E}, Create Time/Date: Mon Mar 24 11:35:10 2014, Last Saved Time/Date: Mon Mar 24 11:35:10 2014, Number of Words: 5, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 4

diff --git a/tests/file-tests/reference/onepkg/minimal-sample-2007.onepkg.ref b/tests/file-tests/reference/onepkg/minimal-sample-2007.onepkg.ref
index 5158338..6af52b3 100644
--- a/tests/file-tests/reference/onepkg/minimal-sample-2007.onepkg.ref
+++ b/tests/file-tests/reference/onepkg/minimal-sample-2007.onepkg.ref
@@ -1 +1 @@
-Microsoft Cabinet archive data, OneNote Package, 2620 bytes, 2 files, at 0x2c last modified Sun, Feb 14 2023 13:36:38 +A "Neuer Abschnitt 1.one" last modified Sun, Nov 05 1981 00:00:00 "Notizbuch \303\266ffnen.onetoc2", number 1, 1 datablock, 0x1203 compression
+Microsoft Cabinet archive data, OneNote Package, 2620 bytes, 2 files, at 0x2c last modified Feb 14 2023 13:36:38 +A "Neuer Abschnitt 1.one" last modified Nov 05 1981 00:00:00 "Notizbuch \303\266ffnen.onetoc2", number 1, 1 datablock, 0x1203 compression

diff --git a/tests/file-tests/reference/svg/esc.svg.ref b/tests/file-tests/reference/svg/esc.svg.ref
index 0d76182..9fcfda9 100644
--- a/tests/file-tests/reference/svg/esc.svg.ref
+++ b/tests/file-tests/reference/svg/esc.svg.ref
@@ -1 +1 @@
-SVG Scalable Vector Graphics image, ASCII text, with very long lines (4096)
+SVG Scalable Vector Graphics image

diff --git a/tests/file-tests/reference/ttf/NanumGothic.ttf.ref b/tests/file-tests/reference/ttf/NanumGothic.ttf.ref
index c8dff04..7fe5183 100644
--- a/tests/file-tests/reference/ttf/NanumGothic.ttf.ref
+++ b/tests/file-tests/reference/ttf/NanumGothic.ttf.ref
@@ -1 +1 @@
-TrueType Font data, 15 tables, 1st "OS/2", name offset 0x424104
+TrueType Font data, 15 tables (FontKit), 1st "OS/2", name offset 0x424104

diff --git a/tests/file-tests/reference/txt/dsn_15.txt.ref b/tests/file-tests/reference/txt/dsn_15.txt.ref
index 7f7bc56..d92a7fa 100644
--- a/tests/file-tests/reference/txt/dsn_15.txt.ref
+++ b/tests/file-tests/reference/txt/dsn_15.txt.ref
@@ -1 +1 @@
-RFC 822 mail, ASCII text
+RFC 822 mail text