From 6d65cac50e7ef46d8dd085565d270358f2750e92 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Aug 2026 16:06:18 +0200 Subject: [PATCH 01/11] xbps-src: add read only /sys bind to bwrap chroot style The other chroot styles do the same and not being able to read some sysfs files breaks some tests. --- common/chroot-style/bwrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/chroot-style/bwrap.sh b/common/chroot-style/bwrap.sh index e586c47c94021a..30bed2de8267b0 100755 --- a/common/chroot-style/bwrap.sh +++ b/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 From 28e68b49d18f3ba12e819a937c30e333a343117a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Aug 2026 19:20:59 +0200 Subject: [PATCH 02/11] linux6.18: update to 6.18.42. --- srcpkgs/linux6.18/files/arm64-dotconfig | 4 +++- srcpkgs/linux6.18/files/i386-dotconfig | 4 +++- srcpkgs/linux6.18/files/x86_64-dotconfig | 3 ++- srcpkgs/linux6.18/template | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/linux6.18/files/arm64-dotconfig b/srcpkgs/linux6.18/files/arm64-dotconfig index b7f252d1875b83..ecce5f97d513f9 100644 --- a/srcpkgs/linux6.18/files/arm64-dotconfig +++ b/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 diff --git a/srcpkgs/linux6.18/files/i386-dotconfig b/srcpkgs/linux6.18/files/i386-dotconfig index 9ad977c35efd26..b51491607d8046 100644 --- a/srcpkgs/linux6.18/files/i386-dotconfig +++ b/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 # diff --git a/srcpkgs/linux6.18/files/x86_64-dotconfig b/srcpkgs/linux6.18/files/x86_64-dotconfig index d8df153eb1eec9..6bd2f43a1ccd64 100644 --- a/srcpkgs/linux6.18/files/x86_64-dotconfig +++ b/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 # diff --git a/srcpkgs/linux6.18/template b/srcpkgs/linux6.18/template index 959b98efee1db8..02fd917ea81be0 100644 --- a/srcpkgs/linux6.18/template +++ b/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 " @@ -18,7 +18,7 @@ rc*) distfiles="https://git.kernel.org/torvalds/t/linux-${version%.*}-${version# esac checksum="9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b - 28c327c663991f98233fb900d0ae9d92e41c5120aa4a21a2290773b672a2b2fb" + ee8388ac892ed1e3cd1d4b11eaa5c61af3d8f19d3a4e4c0d47551e0b59ddedd5" python_version=3 From ff6fcddab9640177e01279eb2f9e090ee245d77a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Aug 2026 20:28:33 +0200 Subject: [PATCH 03/11] linux7.1: update to 7.1.6. --- srcpkgs/linux7.1/files/arm64-dotconfig | 2 +- srcpkgs/linux7.1/files/i386-dotconfig | 4 ++-- srcpkgs/linux7.1/files/x86_64-dotconfig | 4 ++-- srcpkgs/linux7.1/template | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/linux7.1/files/arm64-dotconfig b/srcpkgs/linux7.1/files/arm64-dotconfig index fd4c36dd909f58..33dcb378a70028 100644 --- a/srcpkgs/linux7.1/files/arm64-dotconfig +++ b/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 diff --git a/srcpkgs/linux7.1/files/i386-dotconfig b/srcpkgs/linux7.1/files/i386-dotconfig index d1ec6dd45b3f3d..96ba0f32751dc3 100644 --- a/srcpkgs/linux7.1/files/i386-dotconfig +++ b/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 diff --git a/srcpkgs/linux7.1/files/x86_64-dotconfig b/srcpkgs/linux7.1/files/x86_64-dotconfig index 1f70b673846171..29a352be61ca89 100644 --- a/srcpkgs/linux7.1/files/x86_64-dotconfig +++ b/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 diff --git a/srcpkgs/linux7.1/template b/srcpkgs/linux7.1/template index 8fdcd79f09200f..b9b6ef7a52da8a 100644 --- a/srcpkgs/linux7.1/template +++ b/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 " @@ -18,7 +18,7 @@ rc*) distfiles="https://git.kernel.org/torvalds/t/linux-${version%.*}-${version# esac checksum="691f44797fbe790dc8a321604c927087526ad27b6d649925d60f8eed0a2564a0 - 02719bbfb0de85dfe6d7b9222ca5997fab35cf9588e9175bacbe257a461166f2" + 954e84929e253d11ce1ca90449c47d8b6a3967a3419bdc31f6e2ae1a6c73512a" python_version=3 From aafd28874d8fb12e1e39ffa8c85e7e230bf32be3 Mon Sep 17 00:00:00 2001 From: wbp Date: Mon, 3 Aug 2026 14:42:04 -0700 Subject: [PATCH 04/11] xfd: update to 1.1.5 --- srcpkgs/xfd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xfd/template b/srcpkgs/xfd/template index 5b560bde2d58bb..f15b5aa972d818 100644 --- a/srcpkgs/xfd/template +++ b/srcpkgs/xfd/template @@ -1,6 +1,6 @@ # Template file for 'xfd' pkgname=xfd -version=1.1.4 +version=1.1.5 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config" @@ -9,8 +9,8 @@ short_desc="Display all the characters in an X font" maintainer="Orphaned " license="MIT" homepage="https://wiki.freedesktop.org/xorg/" -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=d5470ffb66fd45a1e1b03d6df01f12d4caf0cf675cde0345cda237243e9076fd +distfiles="${XORG_SITE}/app/xfd-${version}.tar.xz" +checksum=9048aafba291e3baaab2e76fc298195ec58d82827649b9ee60af6838a1059475 post_install() { vlicense COPYING From f24b07542a41cdd56e13aa0819b22a209e994584 Mon Sep 17 00:00:00 2001 From: dogknowsnx Date: Mon, 3 Aug 2026 21:45:22 +0200 Subject: [PATCH 05/11] uosc: update to 5.13.0 --- srcpkgs/uosc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/uosc/template b/srcpkgs/uosc/template index db4a13fd1b1d00..e271047d3c354e 100644 --- a/srcpkgs/uosc/template +++ b/srcpkgs/uosc/template @@ -1,7 +1,7 @@ # Template file for 'uosc' pkgname=uosc -version=5.12.0 -revision=3 +version=5.13.0 +revision=1 conf_files="/etc/mpv/script-opts/uosc.conf" depends="mpv" short_desc="Feature-rich minimalist proximity-based UI for MPV player" @@ -10,7 +10,7 @@ license="LGPL-2.1-or-later" homepage="https://github.com/tomasklaen/uosc" changelog="https://github.com/tomasklaen/uosc/releases" distfiles="https://github.com/tomasklaen/uosc/archive/refs/tags/${version}.tar.gz" -checksum=a84476d6826406f1eb0815c2ce0c1318858f18de8d77c47b4387175641a13ba9 +checksum=18fb38bd7d3ff3ca03f394b4d57daaa5a3f68051dcc31fdbfff3fbc874468913 do_install() { vinstall src/uosc.conf 0644 etc/mpv/script-opts From c63194994368bc29cf2e225b39a893b4e1b12be6 Mon Sep 17 00:00:00 2001 From: kpnc Date: Mon, 20 Jul 2026 18:42:51 +0530 Subject: [PATCH 06/11] LibreCAD: update to 2.2.1.5 information: libexecinfo-devel added to makedepends. fix: indentation errors conditional statement for libexecinfo --- srcpkgs/LibreCAD/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template index 9ee2cf8ae270a8..c17fbeff49f642 100644 --- a/srcpkgs/LibreCAD/template +++ b/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 " 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" From 96b2d86a79b6c255ccb22b96b033ba494d83dedd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Aug 2026 23:53:18 +0200 Subject: [PATCH 07/11] nsjail: update to 3.6. --- ...ited-rlimit-handling-for-CLI-options.patch | 141 +++++++++++++++++ srcpkgs/nsjail/patches/32bitint.patch | 10 -- srcpkgs/nsjail/patches/cpp17.patch | 11 -- srcpkgs/nsjail/patches/lfs64.patch | 144 ------------------ srcpkgs/nsjail/patches/log.patch | 24 --- srcpkgs/nsjail/template | 21 ++- 6 files changed, 151 insertions(+), 200 deletions(-) create mode 100644 srcpkgs/nsjail/patches/0001-Fix-inherited-rlimit-handling-for-CLI-options.patch delete mode 100644 srcpkgs/nsjail/patches/32bitint.patch delete mode 100644 srcpkgs/nsjail/patches/cpp17.patch delete mode 100644 srcpkgs/nsjail/patches/lfs64.patch delete mode 100644 srcpkgs/nsjail/patches/log.patch diff --git a/srcpkgs/nsjail/patches/0001-Fix-inherited-rlimit-handling-for-CLI-options.patch b/srcpkgs/nsjail/patches/0001-Fix-inherited-rlimit-handling-for-CLI-options.patch new file mode 100644 index 00000000000000..31ca5f7830517c --- /dev/null +++ b/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 +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 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 + diff --git a/srcpkgs/nsjail/patches/32bitint.patch b/srcpkgs/nsjail/patches/32bitint.patch deleted file mode 100644 index 055caa909e365a..00000000000000 --- a/srcpkgs/nsjail/patches/32bitint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/macros.h 2022-11-22 22:25:15.000000000 +0100 -+++ - 2023-07-14 21:21:14.506361610 +0200 -@@ -65,6 +65,6 @@ - #endif - - #define NS_VALSTR_STRUCT(x) \ -- { (uint64_t) x, #x } -+ { (long unsigned int) x, #x } - - #endif /* NS_COMMON_H */ diff --git a/srcpkgs/nsjail/patches/cpp17.patch b/srcpkgs/nsjail/patches/cpp17.patch deleted file mode 100644 index 384ff7b512582d..00000000000000 --- a/srcpkgs/nsjail/patches/cpp17.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2022-11-22 22:25:15.000000000 +0100 -+++ - 2023-07-08 16:35:16.308351723 +0200 -@@ -32,7 +32,7 @@ - -Ikafel/include - - CXXFLAGS += $(USER_DEFINES) $(COMMON_FLAGS) $(shell pkg-config --cflags protobuf) \ -- -std=c++14 -fno-exceptions -Wno-unused -Wno-unused-parameter -+ -std=c++17 -fno-exceptions -Wno-unused -Wno-unused-parameter - LDFLAGS += -pie -Wl,-z,noexecstack -lpthread $(shell pkg-config --libs protobuf) - - BIN = nsjail diff --git a/srcpkgs/nsjail/patches/lfs64.patch b/srcpkgs/nsjail/patches/lfs64.patch deleted file mode 100644 index 8bc7c2e399e99e..00000000000000 --- a/srcpkgs/nsjail/patches/lfs64.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/cmdline.cc b/cmdline.cc -index 46365cf..1419412 100644 ---- a/cmdline.cc -+++ b/cmdline.cc -@@ -332,7 +332,7 @@ uint64_t parseRLimit(int res, const char *optarg, unsigned long mul) { - return RLIM64_INFINITY; - } - struct rlimit64 cur; -- if (getrlimit64(res, &cur) == -1) { -+ if (util::getrlimit(res, &cur) == -1) { - PLOG_F("getrlimit(%d)", res); - } - if (strcasecmp(optarg, "def") == 0 || strcasecmp(optarg, "soft") == 0) { -diff --git a/contain.cc b/contain.cc -index bac5152..f0c8581 100644 ---- a/contain.cc -+++ b/contain.cc -@@ -141,53 +141,53 @@ static bool containSetLimits(nsjconf_t* nsjconf) { - - struct rlimit64 rl; - rl.rlim_cur = rl.rlim_max = nsjconf->rl_as; -- if (setrlimit64(RLIMIT_AS, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_AS, %" PRIu64 ")", nsjconf->rl_as); -+ if (util::setrlimit(RLIMIT_AS, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_AS, %" PRIu64 ")", nsjconf->rl_as); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_core; -- if (setrlimit64(RLIMIT_CORE, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_CORE, %" PRIu64 ")", nsjconf->rl_core); -+ if (util::setrlimit(RLIMIT_CORE, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_CORE, %" PRIu64 ")", nsjconf->rl_core); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_cpu; -- if (setrlimit64(RLIMIT_CPU, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_CPU, %" PRIu64 ")", nsjconf->rl_cpu); -+ if (util::setrlimit(RLIMIT_CPU, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_CPU, %" PRIu64 ")", nsjconf->rl_cpu); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_fsize; -- if (setrlimit64(RLIMIT_FSIZE, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_FSIZE, %" PRIu64 ")", nsjconf->rl_fsize); -+ if (util::setrlimit(RLIMIT_FSIZE, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_FSIZE, %" PRIu64 ")", nsjconf->rl_fsize); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_nofile; -- if (setrlimit64(RLIMIT_NOFILE, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_NOFILE, %" PRIu64 ")", nsjconf->rl_nofile); -+ if (util::setrlimit(RLIMIT_NOFILE, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_NOFILE, %" PRIu64 ")", nsjconf->rl_nofile); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_nproc; -- if (setrlimit64(RLIMIT_NPROC, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_NPROC, %" PRIu64 ")", nsjconf->rl_nproc); -+ if (util::setrlimit(RLIMIT_NPROC, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_NPROC, %" PRIu64 ")", nsjconf->rl_nproc); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_stack; -- if (setrlimit64(RLIMIT_STACK, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_STACK, %" PRIu64 ")", nsjconf->rl_stack); -+ if (util::setrlimit(RLIMIT_STACK, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_STACK, %" PRIu64 ")", nsjconf->rl_stack); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_mlock; -- if (setrlimit64(RLIMIT_MEMLOCK, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_MEMLOCK, %" PRIu64 ")", nsjconf->rl_mlock); -+ if (util::setrlimit(RLIMIT_MEMLOCK, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_MEMLOCK, %" PRIu64 ")", nsjconf->rl_mlock); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_rtpr; -- if (setrlimit64(RLIMIT_RTPRIO, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_RTPRIO, %" PRIu64 ")", nsjconf->rl_rtpr); -+ if (util::setrlimit(RLIMIT_RTPRIO, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_RTPRIO, %" PRIu64 ")", nsjconf->rl_rtpr); - return false; - } - rl.rlim_cur = rl.rlim_max = nsjconf->rl_msgq; -- if (setrlimit64(RLIMIT_MSGQUEUE, &rl) == -1) { -- PLOG_E("setrlimit64(0, RLIMIT_MSGQUEUE , %" PRIu64 ")", nsjconf->rl_msgq); -+ if (util::setrlimit(RLIMIT_MSGQUEUE, rl) == -1) { -+ PLOG_E("util::setrlimit(0, RLIMIT_MSGQUEUE , %" PRIu64 ")", nsjconf->rl_msgq); - return false; - } - return true; -diff --git a/util.cc b/util.cc -index c05cb50..7f9d1fc 100644 ---- a/util.cc -+++ b/util.cc -@@ -337,4 +337,12 @@ long syscall(long sysno, uintptr_t a0, uintptr_t a1, uintptr_t a2, uintptr_t a3, - return ::syscall(sysno, a0, a1, a2, a3, a4, a5); - } - -+long setrlimit(int res, const struct rlimit64& newlim) { -+ return util::syscall(__NR_prlimit64, 0, res, (uintptr_t)&newlim, (uintptr_t) nullptr); -+} -+ -+long getrlimit(int res, struct rlimit64* curlim) { -+ return util::syscall(__NR_prlimit64, 0, res, (uintptr_t) nullptr, (uintptr_t)curlim); -+} -+ - } // namespace util -diff --git a/util.h b/util.h -index b0f401a..d2ebd16 100644 ---- a/util.h -+++ b/util.h -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -41,6 +42,14 @@ - - #define QC(x) (util::StrQuote(x).c_str()) - -+#if !defined(RLIM64_INFINITY) -+#define RLIM64_INFINITY (~0ULL) -+struct rlimit64 { -+ uint64_t rlim_cur; -+ uint64_t rlim_max; -+}; -+#endif /* !defined(RLIM64_INFINITY) */ -+ - namespace util { - - ssize_t readFromFd(int fd, void* buf, size_t len); -@@ -60,6 +69,8 @@ const std::string timeToStr(time_t t); - std::vector strSplit(const std::string str, char delim); - long syscall(long sysno, uintptr_t a0 = 0, uintptr_t a1 = 0, uintptr_t a2 = 0, uintptr_t a3 = 0, - uintptr_t a4 = 0, uintptr_t a5 = 0); -+long setrlimit(int res, const struct rlimit64& newlim); -+long getrlimit(int res, struct rlimit64* curlim); - - } // namespace util - diff --git a/srcpkgs/nsjail/patches/log.patch b/srcpkgs/nsjail/patches/log.patch deleted file mode 100644 index 9e7f1236807677..00000000000000 --- a/srcpkgs/nsjail/patches/log.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/config.cc b/config.cc -index 5242ba4..bbb2b6d 100644 ---- a/config.cc -+++ b/config.cc -@@ -302,11 +302,6 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig& - return true; - } - --static void LogHandler( -- google::protobuf::LogLevel level, const char* filename, int line, const std::string& message) { -- LOG_W("config.cc: '%s'", message.c_str()); --} -- - bool parseFile(nsjconf_t* nsjconf, const char* file) { - LOG_D("Parsing configuration from '%s'", file); - -@@ -316,7 +311,6 @@ bool parseFile(nsjconf_t* nsjconf, const char* file) { - return false; - } - -- SetLogHandler(LogHandler); - google::protobuf::io::FileInputStream input(fd); - input.SetCloseOnDelete(true); - diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index ec25953dc32c62..efee5fb73964f8 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,8 +1,9 @@ # Template file for 'nsjail' pkgname=nsjail -version=3.3 -revision=4 -create_wrksrc=yes +version=3.6 +revision=1 +_kafel_rev=76d0f41bf3eb5c4008713d64b9767b461a9129a3 +archs="aarch64* armv5tel* armv6l* armv7l* i686* riscv64* x86_64*" build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf which" makedepends="libnl3-devel protobuf-devel" @@ -11,20 +12,18 @@ maintainer="Orphaned " license="Apache-2.0" homepage="http://nsjail.com" distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz - https://github.com/google/kafel/archive/1af0975af45ca4404f357b9a4e1636f53a01bfd3.tar.gz" -checksum="9c247d0cba565b4e3f91cc76e827ddf7f3ad499f54ba611edd25d4d7be4890c3 - e8c195a2a08daa70c7712adae3eaa01656b039dcc8cc1e5e8210006716761ad5" + https://github.com/google/kafel/archive/${_kafel_rev}.tar.gz>kafel-${_kafel_rev}.tar.gz" +checksum="9731a07dc9f019b01b67292a96a4dd879873f6456e0ef6d51b1cdb553aa7e1cd + b9a99b91af7abc84664803709072ee7f6a787dd3f39686484503154d93ef8f33" -archs="aarch64* armv5tel* armv6l* armv7l* x86_64*" +skip_extraction="kafel-${_kafel_rev}.tar.gz" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" fi post_extract() { - mv nsjail-$version/* . - rmdir kafel - mv kafel-* kafel + vsrcextract -C kafel "kafel-${_kafel_rev}.tar.gz" } post_patch() { @@ -33,6 +32,6 @@ post_patch() { } do_install() { - vbin ${pkgname} + vbin nsjail vman nsjail.1 } From 9f658567bdf13f546b4f0a3ecb84745da105d2d3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Aug 2026 23:55:32 +0200 Subject: [PATCH 08/11] numactl: update to 2.0.19. --- srcpkgs/numactl/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template index 629145b6bee816..5124aa409eb726 100644 --- a/srcpkgs/numactl/template +++ b/srcpkgs/numactl/template @@ -1,30 +1,29 @@ # Template file for 'numactl' pkgname=numactl -version=2.0.18 +version=2.0.19 revision=1 build_style=gnu-configure +make_check_args="VERBOSE=1" hostmakedepends="automake libtool" short_desc="Simple NUMA policy support" maintainer="Orphaned " -license="LGPL-2.1-only" +license="GPL-2.0-only" homepage="https://github.com/numactl/numactl" +changelog="https://github.com/numactl/numactl/releases" distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz" -checksum=8cd6c13f3096e9c2293c1d732f56e2aa37a7ada1a98deed3fac7bd6da1aaaaf6 - -if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - # XXX - nopie=yes -fi +checksum=8b84ffdebfa0d730fb2fc71bb7ec96bb2d38bf76fb67246fde416a68e04125e4 pre_configure() { autoreconf -fi } + post_install() { - rm -r ${DESTDIR}/usr/share/man/man2 + rm -rv "${DESTDIR}/usr/share/man/man2" } libnuma_package() { short_desc+=" - runtime library" + license="LGPL-2.1-only" pkg_install() { vmove "usr/lib/*.so.*" } @@ -33,6 +32,7 @@ libnuma_package() { libnuma-devel_package() { depends="libnuma>=${version}_${revision}" short_desc+=" - development files" + license="LGPL-2.1-only" pkg_install() { vmove usr/include vmove "usr/lib/*.a" From 8fd21cc3e31aa1f52bae6e3fc7ffb82f864aba72 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Aug 2026 23:58:42 +0200 Subject: [PATCH 09/11] p11-kit: update to 0.26.4. --- srcpkgs/p11-kit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index 0366d02fba5342..b5193ada1311c5 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -1,6 +1,6 @@ # Template file for 'p11-kit' pkgname=p11-kit -version=0.26.2 +version=0.26.4 revision=1 build_style=meson build_helper="qemu" @@ -16,7 +16,7 @@ license="BSD-3-Clause" homepage="https://github.com/p11-glue/p11-kit" changelog="https://raw.githubusercontent.com/p11-glue/p11-kit/master/NEWS" distfiles="https://github.com/p11-glue/p11-kit/releases/download/${version}/p11-kit-${version}.tar.xz" -checksum=09fd9f44da4813a3141e73d5e7cf7008e5660d0405f13d56c15e1da9dcecf828 +checksum=89c3ffb10e076ee036e14732bf6547a1e1c4fb48699a5dee7ceb5ce4f7c0c462 conf_files="/etc/pkcs11/pkcs11.conf" if [ "$XBPS_CHECK_PKGS" ]; then From e19c9b2f609515563199ed500736ab7e0d09fe69 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 4 Aug 2026 00:20:38 +0200 Subject: [PATCH 10/11] ouch: update to 0.8.1. --- srcpkgs/ouch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template index 5c25dca2ffce47..d8f2ca76841e5a 100644 --- a/srcpkgs/ouch/template +++ b/srcpkgs/ouch/template @@ -1,6 +1,6 @@ # Template file for 'ouch' pkgname=ouch -version=0.8.0 +version=0.8.1 revision=1 build_style=cargo configure_args="--no-default-features --features=use_zlib,use_zstd_thin" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/ouch-org/ouch" changelog="https://raw.githubusercontent.com/ouch-org/ouch/main/CHANGELOG.md" distfiles="https://github.com/ouch-org/ouch/archive/refs/tags/${version}.tar.gz" -checksum=72ed23c0b2aa51b1b33d3251ddae14cf2bb07a24035d1593c06fc97070e4edf0 +checksum=920f73d4b162bd1814b67c57906b7322345f198d763f28d04722a406f8352246 pre_build() { export OUCH_ARTIFACTS_FOLDER=artifacts From e1399fff39bd82a0afa017ddcba240253f40a60d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 4 Aug 2026 00:23:45 +0200 Subject: [PATCH 11/11] MangoHud: update to 0.8.4. --- srcpkgs/MangoHud/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template index 7d5cabdb2ae2b0..bb6efbe099f37d 100644 --- a/srcpkgs/MangoHud/template +++ b/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 " 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