import erofs-utils-1.8.2-2.el10

.erofs-utils.metadata

@@ -1 +1 @@
-6585f9dfdc12eb9235e1ee2c394fcdf141b5974e SOURCES/erofs-utils-1.7.1.tar.gz
+1d1e099d45db82961e26a37f059a5f51890fa681 SOURCES/erofs-utils-1.8.2.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/erofs-utils-1.7.1.tar.gz
+SOURCES/erofs-utils-1.8.2.tar.gz

SOURCES/erofs-utils-1.8.2-fix-all-fragments.patch

@@ -0,0 +1,51 @@
+From 882ad1c3157f7544bd4d004e3b6d744f0cbe3ffc Mon Sep 17 00:00:00 2001
+From: Gao Xiang <hsiangkao@linux.alibaba.com>
+Date: Sat, 12 Oct 2024 11:52:13 +0800
+Subject: erofs-utils: mkfs: fix `-Eall-fragments` for multi-threaded
+ compression
+
+If `-Eall-fragments` is specified when multi-threaded compression is
+enabled, it should only apply to the packed inode instead of other
+real inodes for now.
+
+Fixes: 10c1590c0920 ("erofs-utils: enable multi-threaded support for `-Eall-fragments`")
+Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
+Link: https://lore.kernel.org/r/20241012035213.3729725-1-hsiangkao@linux.alibaba.com
+---
+ lib/compress.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/lib/compress.c b/lib/compress.c
+index 5d6fb2a..cbd4620 100644
+--- a/lib/compress.c
++++ b/lib/compress.c
+@@ -1456,12 +1456,8 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos)
+ 	inode->idata_size = 0;
+ 	inode->fragment_size = 0;
+ 
+-	if (z_erofs_mt_enabled) {
+-		ictx = malloc(sizeof(*ictx));
+-		if (!ictx)
+-			return ERR_PTR(-ENOMEM);
+-		ictx->fd = dup(fd);
+-	} else {
++	if (!z_erofs_mt_enabled ||
++	    (cfg.c_all_fragments && !erofs_is_packed_inode(inode))) {
+ #ifdef EROFS_MT_ENABLED
+ 		pthread_mutex_lock(&g_ictx.mutex);
+ 		if (g_ictx.seg_num)
+@@ -1471,6 +1467,11 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos)
+ #endif
+ 		ictx = &g_ictx;
+ 		ictx->fd = fd;
++	} else {
++		ictx = malloc(sizeof(*ictx));
++		if (!ictx)
++			return ERR_PTR(-ENOMEM);
++		ictx->fd = dup(fd);
+ 	}
+ 
+ 	ictx->ccfg = &erofs_ccfg[inode->z_algorithmtype[0]];
+-- 
+cgit 1.2.3-korg
+

SPECS/erofs-utils.spec

@@ -2,30 +2,35 @@
 %bcond fuse     1
 %bcond lz4      %[ 0%{?fedora} >= 34 || 0%{?rhel} >=  9 ]
 %bcond lzma     %[ 0%{?fedora} >= 36 || 0%{?rhel} >= 10 ]
+%bcond qpl      %[ 0%{?fedora} >= 41 && "%{_arch}" == "x86_64" ]
 %bcond selinux  1
 %bcond uuid     1
 %bcond zlib     1
+%bcond zstd     1
 
 Name:           erofs-utils
-Version:        1.7.1
+Version:        1.8.2
-Release:        5%{?dist}
+Release:        2%{?dist}
 
 Summary:        Utilities for working with EROFS
 License:        GPL-2.0-only AND GPL-2.0-or-later AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-or-later OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-2-Clause) AND Unlicense
-URL:            https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
+URL:            https://erofs.docs.kernel.org/
 
-Source:         %{url}/snapshot/%{name}-%{version}.tar.gz
+Source:         https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/%{name}-%{version}.tar.gz
+Patch:          https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/patch/?id=882ad1c3157f7544bd4d004e3b6d744f0cbe3ffc#/%{name}-1.8.2-fix-all-fragments.patch
 
 BuildRequires:  %[ "%{toolchain}" == "clang" ? "clang compiler-rt" : "gcc" ]
 BuildRequires:  libtool
 BuildRequires:  make
 %{?with_deflate:BuildRequires:  pkgconfig(libdeflate)}
-%{?with_fuse:BuildRequires:  pkgconfig(fuse) >= 2.6}
+%{?with_fuse:BuildRequires:  pkgconfig(fuse3) >= 3.2}
 %{?with_lz4:BuildRequires:  lz4-devel >= 1.9.3}
-%{?with_lzma:BuildRequires:  xz-devel >= 5.4}
+%{?with_lzma:BuildRequires:  pkgconfig(liblzma) >= 5.4}
+%{?with_qpl:BuildRequires:  pkgconfig(qpl) >= 1.5.0}
 %{?with_selinux:BuildRequires:  pkgconfig(libselinux)}
 %{?with_uuid:BuildRequires:  pkgconfig(uuid)}
 %{?with_zlib:BuildRequires:  pkgconfig(zlib)}
+%{?with_zstd:BuildRequires:  pkgconfig(libzstd) >= 1.4.0}
 
 %description
 EROFS stands for Enhanced Read-Only File System.  It aims to be a general
@@ -37,7 +42,7 @@ This package includes tools to create, check, and extract EROFS images.
 %if %{with fuse}
 %package -n erofs-fuse
 Summary:        FUSE support for mounting EROFS images
-Requires:       fuse
+Requires:       fuse3
 
 %description -n erofs-fuse
 EROFS stands for Enhanced Read-Only File System.  It aims to be a general
@@ -49,18 +54,21 @@ This package includes erofsfuse to mount EROFS images.
 
 
 %prep
-%autosetup
+%autosetup -p1
 autoreconf -fi
 
 %build
 %configure \
+    --enable-multithreading \
     --%{?with_deflate:with}%{!?with_deflate:without}-libdeflate \
     --%{?with_fuse:enable}%{!?with_fuse:disable}-fuse \
     --%{?with_lz4:enable}%{!?with_lz4:disable}-lz4 \
     --%{?with_lzma:enable}%{!?with_lzma:disable}-lzma \
+    --%{?with_qpl:with}%{!?with_qpl:without}-qpl \
     --%{?with_selinux:with}%{!?with_selinux:without}-selinux \
     --%{?with_uuid:with}%{!?with_uuid:without}-uuid \
-    --%{?with_zlib:with}%{!?with_zlib:without}-zlib
+    --%{?with_zlib:with}%{!?with_zlib:without}-zlib \
+    --%{?with_zstd:with}%{!?with_zstd:without}-libzstd
 %make_build
 
 %install
@@ -87,6 +95,11 @@ autoreconf -fi
 
 
 %changelog
+* Wed Nov 20 2024 Abhi Das <adas@redhat.com> - 1.8.2-2	
+- Rebase to 1.8.2-2 for zstd and multithreading support and 
+  Remove erroneously added gating.yaml
+  Resolves: RHEL-68370
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.7.1-5
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018
@@ -97,75 +110,3 @@ autoreconf -fi
 * Wed Jul 17 2024 Abhi Das <adas@redhat.com> - 1.7.1-4
 - Import 1.7.1 to RHEL
 
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Oct 20 2023 David Michael <fedora.dm0@gmail.com> - 1.7.1-1
-- Update to the 1.7.1 release.
-
-* Thu Sep 21 2023 David Michael <fedora.dm0@gmail.com> - 1.7-1
-- Update to the 1.7 release.
-
-* Tue Aug 29 2023 David Michael <fedora.dm0@gmail.com> - 1.6-3
-- Backport patches for CVE-2023-33551 and CVE-2023-33552.
-- Change conditional build feature defaults for supporting EPEL 9.
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Mar 11 2023 David Michael <fedora.dm0@gmail.com> - 1.6-1
-- Update to the 1.6 release.
-
-* Wed Jan 25 2023 David Michael <fedora.dm0@gmail.com> - 1.5-4
-- Enable MicroLZMA support.
-- Switch the License tag to SPDX, and ship matching noneffective license files.
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 David Michael <fedora.dm0@gmail.com> - 1.5-1
-- Update to the 1.5 release.
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Nov 25 2021 David Michael <fedora.dm0@gmail.com> - 1.4-2
-- Backport the patch to install a man page for fsck.
-- Backport the patch to fix dump output.
-
-* Sun Nov 21 2021 David Michael <fedora.dm0@gmail.com> - 1.4-1
-- Update to the 1.4 release.
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 31 2021 David Michael <fedora.dm0@gmail.com> - 1.3-1
-- Update to the 1.3 release.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Jan 09 2021 David Michael <fedora.dm0@gmail.com> - 1.2.1-1
-- Update to the 1.2.1 release.
-
-* Thu Dec 10 2020 David Michael <fedora.dm0@gmail.com> - 1.2-1
-- Update to the 1.2 release.
-- Split FUSE support into an independent subpackage.
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Apr 13 2020 David Michael <fedora.dm0@gmail.com> - 1.1-1
-- Update to the 1.1 release.
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Nov 25 2019 David Michael <fedora.dm0@gmail.com> - 1.0-1
-- Initial package.