Merge updates from master

dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild

@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/commons-io:1

eclass/kernel-2.eclass

@@ -304,7 +304,6 @@ RESTRICT="binchecks strip"
 # set LINUX_HOSTCFLAGS if not already set
 : "${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"}"
 
-
 # @FUNCTION: debug-print-kernel2-variables
 # @USAGE:
 # @DESCRIPTION:
@@ -665,7 +664,7 @@ if [[ ${ETYPE} == sources ]]; then
 		virtual/pkgconfig
 	)"
 
-	SLOT="${PVR}"
+	SLOT=${SLOT:=${PVR}}
 	DESCRIPTION="Sources based on the Linux Kernel"
 	IUSE="symlink build"
 

sys-apps/file/file-5.45-r2.ebuild

@@ -60,7 +60,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( makedev )
 
 PATCHES=(
 	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
+	"${FILESDIR}/file-5.45-seccomp-sandbox.patch"
 	"${FILESDIR}/${P}-32-bit-time_t.patch"
 	"${FILESDIR}/${P}-32-bit-time_t-deux.patch"
 	"${FILESDIR}/${P}-weak-magic-shell.patch" #908401

sys-apps/file/files/file-5.45-seccomp-sandbox.patch

@@ -0,0 +1,48 @@
+From 056d8aa6e0a743ff743c60a1fca67126f3dce0b6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 19 Oct 2023 13:58:20 -0400
+Subject: [PATCH] seccomp: allow syscalls used by Gentoo's LD_PRELOAD sandbox
+
+Bug: https://bugs.gentoo.org/728978
+Bug: https://bugs.gentoo.org/889046
+Bug: https://bugs.gentoo.org/915890
+---
+ src/seccomp.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 87d4c49e..31954ff4 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -174,6 +174,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(exit_group);
+ #ifdef __NR_faccessat
+ 	ALLOW_RULE(faccessat);
++#endif
++#ifdef __NR_faccessat2
++        ALLOW_RULE(faccessat2);
+ #endif
+ 	ALLOW_RULE(fcntl);
+  	ALLOW_RULE(fcntl64);
+@@ -185,9 +188,18 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(fstatat64);
+ #endif
+ 	ALLOW_RULE(futex);
++	ALLOW_RULE(getcwd);
+ 	ALLOW_RULE(getdents);
+ #ifdef __NR_getdents64
+ 	ALLOW_RULE(getdents64);
++#endif
++	ALLOW_RULE(getgid);
++#ifdef __NR_getgid32
++	ALLOW_RULE(getgid32);
++#endif
++	ALLOW_RULE(getuid);
++#ifdef __NR_getuid32
++	ALLOW_RULE(getuid32);
+ #endif
+ #ifdef FIONREAD
+ 	// called in src/compress.c under sread
+-- 
+2.42.0
+