commit deca1a2

Michael Forney  ·  2026-03-03 23:08:32 +0000 UTC
parent a32dd91 
xz: Fix build on musl < 1.2.5

We could also just add a probe test, but since we can check for it
with the preprocessor, just do that.
3 files changed,  +32, -1
M .gitmodules
A pkg/xz/patch/0001-Make-use-of-linux-landlock-conditional-on-syscall-av.patch
M pkg/xz/ver
M .gitmodules
+1, -0 
1@@ -127,6 +127,7 @@
2 [submodule "pkg/xz/src"]
3 	path = pkg/xz/src
4 	url = https://github.com/tukaani-project/xz.git
5+	ignore = all
6 [submodule "pkg/zlib/src"]
7 	path = pkg/zlib/src
8 	url = https://github.com/madler/zlib
A pkg/xz/patch/0001-Make-use-of-linux-landlock-conditional-on-syscall-av.patch
+30, -0 
 1@@ -0,0 +1,30 @@
 2+From 938c7df38eee723e8baa459c9457968fdd63c952 Mon Sep 17 00:00:00 2001
 3+From: Michael Forney <mforney@mforney.org>
 4+Date: Tue, 3 Mar 2026 15:06:24 -0800
 5+Subject: [PATCH] Make use of linux landlock conditional on syscall
 6+ availability
 7+
 8+This is also checked in the configure test, but to simplify building
 9+on oasis, just use the preprocessor.
10+---
11+ src/xz/sandbox.h | 4 ++++
12+ 1 file changed, 4 insertions(+)
13+
14+diff --git a/src/xz/sandbox.h b/src/xz/sandbox.h
15+index 98b9862a..866b1478 100644
16+--- a/src/xz/sandbox.h
17++++ b/src/xz/sandbox.h
18+@@ -9,6 +9,10 @@
19+ //
20+ ///////////////////////////////////////////////////////////////////////////////
21+ 
22++#if !defined(SYS_landlock_create_ruleset) || !defined(SYS_landlock_restrict_self)
23++# undef HAVE_LINUX_LANDLOCK
24++#endif
25++
26+ #if defined(HAVE_PLEDGE) || defined(HAVE_LINUX_LANDLOCK) \
27+ 		|| defined(HAVE_CAP_RIGHTS_LIMIT)
28+ #	define ENABLE_SANDBOX 1
29+-- 
30+2.49.0
31+
M pkg/xz/ver
+1, -1 
1@@ -1 +1 @@
2-5.8.1 r0
3+5.8.1 r1