commit: 704d0fb0689c1dc690931187a0a66fdc540edbe1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 16 15:19:39 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 16 15:20:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704d0fb0
sys-apps/file: fix glibc-2.42 patch for <C23 Closes: https://bugs.gentoo.org/961520 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/file/file-5.46-r3.ebuild | 1 + .../file-5.46-seccomp-glibc-2.42-followup.patch | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/sys-apps/file/file-5.46-r3.ebuild b/sys-apps/file/file-5.46-r3.ebuild index 6fbf7cef0302..4b9f8508c10b 100644 --- a/sys-apps/file/file-5.46-r3.ebuild +++ b/sys-apps/file/file-5.46-r3.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/file-5.46-buffer-overflow.patch" "${FILESDIR}/file-5.46-seccomp-rseq.patch" "${FILESDIR}/file-5.46-seccomp-glibc-2.42.patch" + "${FILESDIR}/file-5.46-seccomp-glibc-2.42-followup.patch" ) src_prepare() { diff --git a/sys-apps/file/files/file-5.46-seccomp-glibc-2.42-followup.patch b/sys-apps/file/files/file-5.46-seccomp-glibc-2.42-followup.patch new file mode 100644 index 000000000000..0be2effabe3f --- /dev/null +++ b/sys-apps/file/files/file-5.46-seccomp-glibc-2.42-followup.patch @@ -0,0 +1,20 @@ +There's no need for the __linux__ check, as seccomp is Linux-only. Avoid +including <termios.h> which will clash with <sys/ioctl.h>. +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -34,14 +34,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.31 2025/03/20 14:57:41 christos Exp $") + #include <seccomp.h> /* libseccomp */ + #include <sys/prctl.h> /* prctl */ + #include <sys/socket.h> +-#ifdef __powerpc64__ +-// See: https://sourceware.org/bugzilla/show_bug.cgi?id=32806 +-# include <asm/termbits.h> +-#elif defined __linux__ +-# include <linux/termios.h> +-#else +-# include <termios.h> +-#endif ++#include <asm/termbits.h> + #include <sys/ioctl.h> + #include <fcntl.h> + #include <stdlib.h>
