[pull] master from void-linux:master

common/chroot-style/bwrap.sh

@@ -21,11 +21,11 @@ fi
 if [ -z "$XBPS_TEMP_MASTERDIR" ]; then
 	exec bwrap --bind "$MASTERDIR" / \
 		--ro-bind "$DISTDIR" /void-packages \
-		--dev /dev --tmpfs /tmp --proc /proc \
+		--dev /dev --tmpfs /tmp --proc /proc --ro-bind /sys /sys \
 		${HOSTDIR:+--bind "$HOSTDIR" /host} ${EXTRA_ARGS} "$@"
 else
 	exec bwrap --overlay-src "$MASTERDIR" --tmp-overlay / \
 		--ro-bind "$DISTDIR" /void-packages \
-		--dev /dev --tmpfs /tmp --proc /proc \
+		--dev /dev --tmpfs /tmp --proc /proc --ro-bind /sys /sys \
 		${HOSTDIR:+--bind "$HOSTDIR" /host} ${EXTRA_ARGS} "$@"
 fi

srcpkgs/LibreCAD/template

@@ -1,6 +1,6 @@
 # Template file for 'LibreCAD'
 pkgname=LibreCAD
-version=2.2.1.2
+version=2.2.1.5
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config ImageMagick qt5-host-tools"
@@ -10,7 +10,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://librecad.org"
 distfiles="https://github.com/librecad/librecad/archive/refs/tags/v${version}.tar.gz"
-checksum=2b961cb916a7415d97f427f824c1830e06d4832cc376fea38b27cb456ee95a8e
+checksum=703f6e6701b7ee47769b6def271fa025ef32e31ee193e2ba69a2c47fff8da459
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel"
+	configure_args+=" LIBS+=-lexecinfo"
+fi
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr"

srcpkgs/MangoHud/template

@@ -1,7 +1,7 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
-version=0.8.2
-revision=2
+version=0.8.4
+revision=1
 build_style=meson
 configure_args="-Dwith_xnvctrl=disabled
  -Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
@@ -12,9 +12,12 @@ short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/flightlessmango/MangoHud"
+changelog="https://github.com/flightlessmango/MangoHud/releases"
 distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${version}/MangoHud-v${version}-Source-DFSG.tar.xz"
-checksum=d5198ebf6cfdd2d8457c06bb11fdc3145012b666e81e669c958986675379e306
+checksum=5411681fff30082ae9fc09bf27794c3ef3cd3b5ab27783fea4e2f0e899d591a3
+
 python_version=3
+
 lib32files="/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

srcpkgs/linux6.18/files/arm64-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.18.41 Kernel Configuration
+# Linux/arm64 6.18.42 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405"
 CONFIG_CC_IS_GCC=y
@@ -2403,6 +2403,7 @@ CONFIG_CXL_PORT=m
 CONFIG_CXL_SUSPEND=y
 CONFIG_CXL_REGION=y
 # CONFIG_CXL_REGION_INVALIDATION_TEST is not set
+CONFIG_CXL_RAS=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -7781,6 +7782,7 @@ CONFIG_HT16K33=m
 # CONFIG_MAX6959 is not set
 # CONFIG_SEG_LED_GPIO is not set
 CONFIG_PANEL=m
+CONFIG_GPU_BUDDY=y
 CONFIG_TEGRA_HOST1X_CONTEXT_BUS=y
 CONFIG_TEGRA_HOST1X=m
 CONFIG_TEGRA_HOST1X_FIREWALL=y

srcpkgs/linux6.18/files/i386-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.18.41 Kernel Configuration
+# Linux/i386 6.18.42 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
 CONFIG_CC_IS_GCC=y
@@ -2162,6 +2162,7 @@ CONFIG_CXL_PORT=m
 CONFIG_CXL_SUSPEND=y
 CONFIG_CXL_REGION=y
 # CONFIG_CXL_REGION_INVALIDATION_TEST is not set
+CONFIG_CXL_RAS=y
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
@@ -6568,6 +6569,7 @@ CONFIG_AGP_VIA=m
 # CONFIG_AGP_EFFICEON is not set
 CONFIG_INTEL_GTT=m
 CONFIG_VGA_SWITCHEROO=y
+CONFIG_GPU_BUDDY=y
 CONFIG_DRM=m
 
 #

srcpkgs/linux6.18/files/x86_64-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.18.41 Kernel Configuration
+# Linux/x86_64 6.18.42 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
 CONFIG_CC_IS_GCC=y
@@ -6837,6 +6837,7 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_VIA=m
 CONFIG_INTEL_GTT=m
 CONFIG_VGA_SWITCHEROO=y
+CONFIG_GPU_BUDDY=y
 CONFIG_DRM=m
 
 #

srcpkgs/linux6.18/template

@@ -1,6 +1,6 @@
 # Template file for 'linux6.18'
 pkgname=linux6.18
-version=6.18.41
+version=6.18.42
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -18,7 +18,7 @@ rc*) distfiles="https://git.kernel.org/torvalds/t/linux-${version%.*}-${version#
 esac
 
 checksum="9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b
- 28c327c663991f98233fb900d0ae9d92e41c5120aa4a21a2290773b672a2b2fb"
+ ee8388ac892ed1e3cd1d4b11eaa5c61af3d8f19d3a4e4c0d47551e0b59ddedd5"
 
 python_version=3
 

srcpkgs/linux7.1/files/arm64-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 7.1.5 Kernel Configuration
+# Linux/arm64 7.1.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405"
 CONFIG_CC_IS_GCC=y

srcpkgs/linux7.1/files/i386-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 7.1.5 Kernel Configuration
+# Linux/i386 7.1.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
 CONFIG_CC_IS_GCC=y
@@ -7174,7 +7174,7 @@ CONFIG_SND_SOC_AMD_YC_MACH=m
 CONFIG_SND_AMD_ACP_CONFIG=m
 CONFIG_SND_SOC_AMD_ACP_COMMON=m
 CONFIG_SND_SOC_ACPI_AMD_MATCH=m
-CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS=m
+CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS=y
 CONFIG_SND_SOC_AMD_ACP_PDM=m
 CONFIG_SND_SOC_AMD_ACP_LEGACY_COMMON=m
 CONFIG_SND_SOC_AMD_ACP_I2S=m

srcpkgs/linux7.1/files/x86_64-dotconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 7.1.5 Kernel Configuration
+# Linux/x86_64 7.1.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405"
 CONFIG_CC_IS_GCC=y
@@ -7470,7 +7470,7 @@ CONFIG_SND_SOC_AMD_YC_MACH=m
 CONFIG_SND_AMD_ACP_CONFIG=m
 CONFIG_SND_SOC_AMD_ACP_COMMON=m
 CONFIG_SND_SOC_ACPI_AMD_MATCH=m
-CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS=m
+CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS=y
 CONFIG_SND_SOC_AMD_ACP_PDM=m
 CONFIG_SND_SOC_AMD_ACP_LEGACY_COMMON=m
 CONFIG_SND_SOC_AMD_ACP_I2S=m

srcpkgs/linux7.1/template

@@ -1,6 +1,6 @@
 # Template file for 'linux7.1'
 pkgname=linux7.1
-version=7.1.5
+version=7.1.6
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -18,7 +18,7 @@ rc*) distfiles="https://git.kernel.org/torvalds/t/linux-${version%.*}-${version#
 esac
 
 checksum="691f44797fbe790dc8a321604c927087526ad27b6d649925d60f8eed0a2564a0
- 02719bbfb0de85dfe6d7b9222ca5997fab35cf9588e9175bacbe257a461166f2"
+ 954e84929e253d11ce1ca90449c47d8b6a3967a3419bdc31f6e2ae1a6c73512a"
 
 python_version=3
 

srcpkgs/nsjail/patches/0001-Fix-inherited-rlimit-handling-for-CLI-options.patch

@@ -0,0 +1,141 @@
+Patch-Source: https://github.com/google/nsjail/commits/dc5338c63708a8984839fe96a90cc074c877b25d
+From dc5338c63708a8984839fe96a90cc074c877b25d Mon Sep 17 00:00:00 2001
+From: n-agi <akanagi95@gmail.com>
+Date: Thu, 19 Mar 2026 11:17:29 +0000
+Subject: [PATCH] Fix inherited rlimit handling for CLI options
+
+---
+ cmdline.cc | 79 ++++++++++++++++++++++++++++++++++++++++--------------
+ cmdline.h  |  1 +
+ 2 files changed, 60 insertions(+), 20 deletions(-)
+
+diff --git a/cmdline.cc b/cmdline.cc
+index bb903ec..17f1b6c 100644
+--- a/cmdline.cc
++++ b/cmdline.cc
+@@ -327,6 +327,25 @@ void logParams(nsj_t* nsj) {
+ 	}
+ }
+
++nsjail::RLimit parseRLimitType(int res, const char* optarg) {
++	if (strcasecmp(optarg, "def") == 0 || strcasecmp(optarg, "soft") == 0) {
++		return nsjail::RLimit::SOFT;
++	}
++	if (strcasecmp(optarg, "max") == 0 || strcasecmp(optarg, "hard") == 0) {
++		return nsjail::RLimit::HARD;
++	}
++	if (strcasecmp(optarg, "inf") == 0) {
++		return nsjail::RLimit::INF;
++	}
++	if (util::isANumber(optarg)) {
++		return nsjail::RLimit::VALUE;
++	}
++	LOG_F("RLIMIT %s (%d) needs a numeric value or 'max'/'hard'/'def'/'soft'/'inf' "
++	      "value (%s provided)",
++	    util::rLimName(res).c_str(), res, QC(optarg));
++	abort();
++}
++
+ uint64_t parseRLimit(int res, const char* optarg, unsigned long mul) {
+ 	if (strcasecmp(optarg, "inf") == 0) {
+ 		return RLIM64_INFINITY;
+@@ -550,44 +569,64 @@ std::unique_ptr<nsj_t> parseArgs(int argc, char* argv[]) {
+ 			exit(0);
+ 			break;
+ 		case 0x0201:
+-			nsj->njc.set_rlimit_as(parseRLimit(RLIMIT_AS, optarg, 1));
+-			nsj->njc.set_rlimit_as_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_as_type(parseRLimitType(RLIMIT_AS, optarg));
++			if (nsj->njc.rlimit_as_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_as(parseRLimit(RLIMIT_AS, optarg, 1));
++			}
+ 			break;
+ 		case 0x0202:
+-			nsj->njc.set_rlimit_core(parseRLimit(RLIMIT_CORE, optarg, 1));
+-			nsj->njc.set_rlimit_core_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_core_type(parseRLimitType(RLIMIT_CORE, optarg));
++			if (nsj->njc.rlimit_core_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_core(parseRLimit(RLIMIT_CORE, optarg, 1));
++			}
+ 			break;
+ 		case 0x0203:
+-			nsj->njc.set_rlimit_cpu(parseRLimit(RLIMIT_CPU, optarg, 1));
+-			nsj->njc.set_rlimit_cpu_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_cpu_type(parseRLimitType(RLIMIT_CPU, optarg));
++			if (nsj->njc.rlimit_cpu_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_cpu(parseRLimit(RLIMIT_CPU, optarg, 1));
++			}
+ 			break;
+ 		case 0x0204:
+-			nsj->njc.set_rlimit_fsize(parseRLimit(RLIMIT_FSIZE, optarg, 1));
+-			nsj->njc.set_rlimit_fsize_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_fsize_type(parseRLimitType(RLIMIT_FSIZE, optarg));
++			if (nsj->njc.rlimit_fsize_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_fsize(parseRLimit(RLIMIT_FSIZE, optarg, 1));
++			}
+ 			break;
+ 		case 0x0205:
+-			nsj->njc.set_rlimit_nofile(parseRLimit(RLIMIT_NOFILE, optarg, 1));
+-			nsj->njc.set_rlimit_nofile_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_nofile_type(parseRLimitType(RLIMIT_NOFILE, optarg));
++			if (nsj->njc.rlimit_nofile_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_nofile(parseRLimit(RLIMIT_NOFILE, optarg, 1));
++			}
+ 			break;
+ 		case 0x0206:
+-			nsj->njc.set_rlimit_nproc(parseRLimit(RLIMIT_NPROC, optarg, 1));
+-			nsj->njc.set_rlimit_nproc_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_nproc_type(parseRLimitType(RLIMIT_NPROC, optarg));
++			if (nsj->njc.rlimit_nproc_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_nproc(parseRLimit(RLIMIT_NPROC, optarg, 1));
++			}
+ 			break;
+ 		case 0x0207:
+-			nsj->njc.set_rlimit_stack(parseRLimit(RLIMIT_STACK, optarg, 1));
+-			nsj->njc.set_rlimit_stack_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_stack_type(parseRLimitType(RLIMIT_STACK, optarg));
++			if (nsj->njc.rlimit_stack_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_stack(parseRLimit(RLIMIT_STACK, optarg, 1));
++			}
+ 			break;
+ 		case 0x0209:
+-			nsj->njc.set_rlimit_memlock(parseRLimit(RLIMIT_MEMLOCK, optarg, 1));
+-			nsj->njc.set_rlimit_memlock_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_memlock_type(parseRLimitType(RLIMIT_MEMLOCK, optarg));
++			if (nsj->njc.rlimit_memlock_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_memlock(parseRLimit(RLIMIT_MEMLOCK, optarg, 1));
++			}
+ 			break;
+ 		case 0x0210:
+-			nsj->njc.set_rlimit_rtprio(parseRLimit(RLIMIT_RTPRIO, optarg, 1));
+-			nsj->njc.set_rlimit_rtprio_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_rtprio_type(parseRLimitType(RLIMIT_RTPRIO, optarg));
++			if (nsj->njc.rlimit_rtprio_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_rtprio(parseRLimit(RLIMIT_RTPRIO, optarg, 1));
++			}
+ 			break;
+ 		case 0x0211:
+-			nsj->njc.set_rlimit_msgqueue(parseRLimit(RLIMIT_MSGQUEUE, optarg, 1));
+-			nsj->njc.set_rlimit_msgqueue_type(nsjail::RLimit::VALUE);
++			nsj->njc.set_rlimit_msgqueue_type(parseRLimitType(RLIMIT_MSGQUEUE, optarg));
++			if (nsj->njc.rlimit_msgqueue_type() == nsjail::RLimit::VALUE) {
++				nsj->njc.set_rlimit_msgqueue(parseRLimit(RLIMIT_MSGQUEUE, optarg, 1));
++			}
+ 			break;
+ 		case 0x0208:
+ 			nsj->njc.set_disable_rl(true);
+diff --git a/cmdline.h b/cmdline.h
+index 74b9e5f..6a8611e 100644
+--- a/cmdline.h
++++ b/cmdline.h
+@@ -31,6 +31,7 @@
+
+ namespace cmdline {
+
++nsjail::RLimit parseRLimitType(int res, const char* optarg);
+ uint64_t parseRLimit(int res, const char* optarg, unsigned long mul);
+ void logParams(nsj_t* nsj);
+ void addEnv(nsj_t* nsj, const std::string& env);
+-- 
+2.53.0
+