import UBI file-5.45-8.el10

This commit is contained in:
eabdullin 2025-11-11 21:55:59 +00:00
parent dad3d40604
commit f4904027c2
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,23 @@
From aa86458e499d6279c2fd18e98425e6ae891d0f33 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 10 Mar 2025 20:51:11 +0000
Subject: [PATCH] PR/624: vmihalko: Use the bcachefs-uuid for erofs
---
magic/Magdir/filesystems | 5 +++--
1 file changed, 2 insertions(+), 1 deletions(-)
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 533518aeb..28178d1b6 100644
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -2654,7 +2654,8 @@
#>1060 lelong x \b, blocks=%d
#>1064 lelong x \b, metadata@%#x
#>1068 lelong x \b, xattr@%#x
->1072 guid x \b, uuid=%s
+>1072 guid x \b, uuid=
+>1072 use bcachefs-uuid
>1088 string >0 \b, name=%s
>1104 lelong >0 \b, incompat:
>>1104 lelong &1 LZ4_0PADDING

View File

@ -15,7 +15,7 @@
Summary: Utility for determining file types
Name: file
Version: 5.45
Release: 7%{?dist}
Release: 8%{?dist}
# Main license is BSD-2-Clause-Darwin
# Shipped exceptions:
@ -49,6 +49,9 @@ Patch3: file-5.45-readelf-limit-revert.patch
# upstream commit: https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1
Patch4: file-5.45-time-t.patch
# upstream: https://github.com/file/file/commit/aa86458e499d6279c2fd18e98425e6ae891d0f33
Patch6: file-5.47-erofs-magic.patch
URL: https://www.darwinsys.com/file/
Requires: file-libs%{?_isa} = %{version}-%{release}
BuildRequires: zlib-devel
@ -232,6 +235,10 @@ make -C tests check
%endif
%changelog
* Wed Mar 26 2025 Vincent Mihalkovic <vmihalko@redhat.com> - 5.45-8
- magic: Use the bcachefs-uuid for erofs
Resolves: RHEL-76142
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.45-7
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
@ -239,7 +246,7 @@ make -C tests check
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.45-6
- Bump release for June 2024 mass rebuild
* Thu Feb 14 2024 Vincent Mihalkovic <vmihalko@redhat.com> - 5.45-5
* Wed Feb 14 2024 Vincent Mihalkovic <vmihalko@redhat.com> - 5.45-5
- fix license of the file-libs subpackage
* Tue Feb 06 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.45-4