Compare commits

..

8 commits

Author SHA1 Message Date
Richard W.M. Jones
8829c783ae Add sv (Swedish) translations of man pages 2026-01-05 12:09:50 +00:00
Richard W.M. Jones
b3257761cf New upstream version 5.8.2 (RHBZ#2423317)
Remove patches which are included in this release.
2026-01-05 11:51:24 +00:00
Richard W.M. Jones
4dbfb6665e Add final workaround for "Failed to enable the sandbox" (RHEL-125143) 2025-11-23 19:09:51 +00:00
Richard W.M. Jones
6b51ecaa47 Add workaround for "Failed to enable the sandbox" (RHEL-125143)
Thanks: Lasse Collin
2025-11-22 19:32:59 +00:00
Adam Williamson
b7202e8874 Empty rebuild to try and fix gating issue 2025-07-24 15:53:28 +01:00
Siteshwar Vashisht
93e837ea6d Fix a shellcheck warning
Error: SHELLCHECK_WARNING (CWE-758): [#def1]
/etc/profile.d/colorxzgrep.sh:1:1: error[SC2148]: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.

Related: https://github.com/tukaani-project/xz/issues/174#issuecomment-2848635721

Signed-off-by: Siteshwar Vashisht <svashisht@redhat.com>
2025-05-08 10:23:58 +02:00
Adam Williamson
781e3e45cd drop gating.yaml
the gate on rpmdeplint was added to guard against the strict
version tie in perl-Compress-Raw-Lzma, but we were able to
remove that recently, so it's no longer an issue. The gate
causes a problem because rpmdeplint is only run on Rawhide, but
the policy was written to apply the gate to all branches, so
this prevents updates for non-Rawhide branches from going stable.
For simplicity's sake, let's just get rid of it.
2025-04-23 23:32:23 -07:00
Richard W.M. Jones
c19b7d7f71 Remove accidental ANSI escape sequence in comment
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2359454
2025-04-14 10:56:26 +01:00
6 changed files with 20 additions and 213 deletions

View file

@ -1,46 +0,0 @@
From ee75c76958dd891906745125590563ab64e85995 Mon Sep 17 00:00:00 2001
From: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun, 23 Nov 2025 20:13:37 +0200
Subject: [PATCH 1/4] Landlock: Cache the ABI version
In xz it can avoid up to two syscalls that query the ABI version.
---
src/common/my_landlock.h | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h
index e135d08c..379d7bd4 100644
--- a/src/common/my_landlock.h
+++ b/src/common/my_landlock.h
@@ -4,6 +4,10 @@
//
/// \file my_landlock.h
/// \brief Linux Landlock sandbox helper functions
+///
+/// \note This uses static variables to cache the Landlock ABI version.
+/// Only one file in an application should include this header.
+/// Only one thread should call these functions.
//
// Author: Lasse Collin
//
@@ -32,8 +36,16 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr)
{
memzero(attr, sizeof(*attr));
- const int abi_version = syscall(SYS_landlock_create_ruleset,
+ // Cache the Landlock ABI version:
+ // 0 = not checked yet
+ // -1 = Landlock not supported
+ // >0 = Landlock ABI version
+ static int abi_version = 0;
+
+ if (abi_version == 0)
+ abi_version = syscall(SYS_landlock_create_ruleset,
(void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION);
+
if (abi_version <= 0)
return -1;
--
2.51.1

View file

@ -1,87 +0,0 @@
From 2b2652e914b1c38d4c009a8dcac11dfee9c7e008 Mon Sep 17 00:00:00 2001
From: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun, 23 Nov 2025 20:13:49 +0200
Subject: [PATCH 2/4] Landlock: Workaround a bug in RHEL 9 kernel
If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container
on RHEL 9, xz will fail with the message "Failed to enable the sandbox".
RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support
Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL.
The issue is still present in 5.14.0-643.el9 (2025-11-22). Red Hat is
aware of the issue, but I don't know when it will be fixed.
The sandbox is meant to be transparent to users, thus there isn't and
won't be a command line option to disable it. Instead, add a workaround
to keep xz working on the buggy RHEL 9 kernels.
Reported-by: Richard W.M. Jones
Thanks-to: Pavel Raiskup
Tested-by: Orgad Shaneh
Tested-by: Richard W.M. Jones
Fixes: https://github.com/tukaani-project/xz/issues/199
Link: https://issues.redhat.com/browse/RHEL-125143
Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105
Link: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/65BDSY56R5ZJRTUC4B6CIVCVLY4LG4ME/
---
src/common/my_landlock.h | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h
index 379d7bd4..0f8e04e0 100644
--- a/src/common/my_landlock.h
+++ b/src/common/my_landlock.h
@@ -21,6 +21,7 @@
#include <linux/landlock.h>
#include <sys/syscall.h>
#include <sys/prctl.h>
+#include <sys/utsname.h>
/// \brief Initialize Landlock ruleset attributes to forbid everything
@@ -42,10 +43,28 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr)
// >0 = Landlock ABI version
static int abi_version = 0;
- if (abi_version == 0)
+ // Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30)
+ // claims ABI version 6 support, but as of 5.14.0-643.el9 (2025-11-22)
+ // it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream
+ // Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports.
+ // We assume that any kernel version 5.14 with ABI version 6 is buggy.
+ static bool is_rhel9 = false;
+
+ if (abi_version == 0) {
abi_version = syscall(SYS_landlock_create_ruleset,
(void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION);
+ if (abi_version == 6) {
+ static const char rel[] = "5.14.";
+ const size_t rel_len = sizeof(rel) - 1;
+
+ struct utsname un;
+ if (uname(&un) == 0 && strncmp(
+ un.release, rel, rel_len) == 0)
+ is_rhel9 = true;
+ }
+ }
+
if (abi_version <= 0)
return -1;
@@ -121,6 +140,12 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr)
#endif
FALLTHROUGH;
+ case 6:
+ if (is_rhel9)
+ attr->scoped &= ~LANDLOCK_SCOPE_SIGNAL;
+
+ FALLTHROUGH;
+
default:
// We only know about the features of the ABIs 1-6.
break;
--
2.51.1

View file

@ -1,59 +0,0 @@
From 8bb516887c1912106a72db96216cab46954e6190 Mon Sep 17 00:00:00 2001
From: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun, 23 Nov 2025 20:39:28 +0200
Subject: [PATCH 4/4] Landlock: Add missing #ifdefs
The build was broken on distros that have an old <sys/landlock.h>.
Fixes: 2b2652e914b1 ("Landlock: Workaround a bug in RHEL 9 kernel")
---
src/common/my_landlock.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h
index 0f8e04e0..5f761695 100644
--- a/src/common/my_landlock.h
+++ b/src/common/my_landlock.h
@@ -43,17 +43,20 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr)
// >0 = Landlock ABI version
static int abi_version = 0;
+#ifdef LANDLOCK_SCOPE_SIGNAL
// Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30)
// claims ABI version 6 support, but as of 5.14.0-643.el9 (2025-11-22)
// it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream
// Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports.
// We assume that any kernel version 5.14 with ABI version 6 is buggy.
static bool is_rhel9 = false;
+#endif
if (abi_version == 0) {
abi_version = syscall(SYS_landlock_create_ruleset,
(void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION);
+#ifdef LANDLOCK_SCOPE_SIGNAL
if (abi_version == 6) {
static const char rel[] = "5.14.";
const size_t rel_len = sizeof(rel) - 1;
@@ -63,6 +66,7 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr)
un.release, rel, rel_len) == 0)
is_rhel9 = true;
}
+#endif
}
if (abi_version <= 0)
@@ -141,8 +145,10 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr)
FALLTHROUGH;
case 6:
+#ifdef LANDLOCK_SCOPE_SIGNAL
if (is_rhel9)
attr->scoped &= ~LANDLOCK_SCOPE_SIGNAL;
+#endif
FALLTHROUGH;
--
2.51.1

View file

@ -1,3 +1,4 @@
# shellcheck shell=sh
/usr/libexec/grepconf.sh -c || return
alias xzgrep='xzgrep --color=auto' 2>/dev/null
alias xzegrep='xzegrep --color=auto' 2>/dev/null

View file

@ -1,2 +1,2 @@
SHA512 (xz-5.8.1.tar.gz) = 151b2a47fdf00274c4fd71ceada8fb6c892bdac44070847ebf3259e602b97c95ee5ee88974e03d7aa821ab4f16d5c38e50dfb2baf660cf39c199878a666e19ad
SHA512 (xz-5.8.1.tar.gz.sig) = 4a67ed623841d64a5826cef1d5e21f3567ba275ee8f725a1217f76ce2ba25a41c6e22e62f8c7cca74d0d6e8398e8ee8926eab722cc8c1b10c42e990c32765efd
SHA512 (xz-5.8.2.tar.gz) = 0b808fc8407e7c50da3a7b2db05be732c2fcd41850b92c7f5647181443483848ff359e176c816ce2038c115273f51575877c14f1356417cc9d53845841acb063
SHA512 (xz-5.8.2.tar.gz.sig) = 91c8d49d8ad0eb1e128203cf2c051fb200ec0e2b5eebea10a39945a998d24f11652a000faefa688d129327593043271314cbf115d78c21eeed738476dd2defb6

36
xz.spec
View file

@ -4,8 +4,8 @@
Summary: LZMA compression utilities
Name: xz
Epoch: 1
Version: 5.8.1
Release: 4%{?dist}
Version: 5.8.2
Release: 1%{?dist}
# liblzma - 0BSD
# xz{,dec}, lzma{dec,info} - 0BSD
@ -24,14 +24,6 @@ Source2: https://tukaani.org/misc/lasse_collin_pubkey.txt
Source100: colorxzgrep.sh
Source101: colorxzgrep.csh
# https://github.com/tukaani-project/xz/issues/199
# https://issues.redhat.com/browse/RHEL-125143
# Upstream in > 5.8.1
Patch: 0001-Landlock-Cache-the-ABI-version.patch
Patch: 0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch
#Patch: 0003-Update-THANKS.patch
Patch: 0004-Landlock-Add-missing-ifdefs.patch
URL: https://tukaani.org/%{name}/
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@ -146,12 +138,13 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%{_mandir}/man1/*xz*
%lang(de) %{_mandir}/de/man1/*xz*
%lang(fr) %{_mandir}/fr/man1/*xz*
%lang(ko) %{_mandir}/ko/man1/*xz*
%lang(ro) %{_mandir}/ro/man1/*xz*
%lang(uk) %{_mandir}/uk/man1/*xz*
%lang(it) %{_mandir}/it/man1/*xz*
%lang(sr) %{_mandir}/sr/man1/*xz*
%lang(ko) %{_mandir}/ko/man1/*xz*
%lang(pt_BR) %{_mandir}/pt_BR/man1/*xz*
%lang(ro) %{_mandir}/ro/man1/*xz*
%lang(sr) %{_mandir}/sr/man1/*xz*
%lang(sv) %{_mandir}/sv/man1/*xz*
%lang(uk) %{_mandir}/uk/man1/*xz*
%{profiledir}/*
@ -179,15 +172,20 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%{_mandir}/man1/*lz*
%lang(de) %{_mandir}/de/man1/*lz*
%lang(fr) %{_mandir}/fr/man1/*lz*
%lang(ko) %{_mandir}/ko/man1/*lz*
%lang(ro) %{_mandir}/ro/man1/*lz*
%lang(uk) %{_mandir}/uk/man1/*lz*
%lang(it) %{_mandir}/it/man1/*lz*
%lang(sr) %{_mandir}/sr/man1/*lz*
%lang(ko) %{_mandir}/ko/man1/*lz*
%lang(pt_BR) %{_mandir}/pt_BR/man1/*lz*
%lang(ro) %{_mandir}/ro/man1/*lz*
%lang(sr) %{_mandir}/sr/man1/*lz*
%lang(sv) %{_mandir}/sv/man1/*lz*
%lang(uk) %{_mandir}/uk/man1/*lz*
%changelog
* Mon Jan 05 2026 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.2-1
- New upstream version 5.8.2 (RHBZ#2423317)
- Remove patches which are included in this release.
* Sun Nov 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.1-4
- Add final workaround for "Failed to enable the sandbox" (RHEL-125143)
@ -195,7 +193,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
- Add workaround for "Failed to enable the sandbox" (RHEL-125143)
* Thu Apr 24 2025 Adam Williamson <awilliam@redhat.com> - 1:5.8.1-2
- Rebuild without changes to fix gating problem
- Empty rebuild to try and fix gating issue
* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.1-1
- New upstream version 5.8.1