From 5e8d38a15dcd57672d0953a462cc78ff86ed3fac Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:17:37 +0000 Subject: [PATCH] sys-libs/libseccomp: Sync with Gentoo It's from Gentoo commit 2d25fad95cbaa525c8945d8e582c749d49524f49. Signed-off-by: Flatcar Buildbot --- .../libseccomp/libseccomp-2.5.5-r2.ebuild | 2 +- ...0-r2.ebuild => libseccomp-2.6.0-r3.ebuild} | 29 ++++++++++++++----- .../libseccomp/libseccomp-2.6.0.ebuild | 2 +- .../libseccomp/libseccomp-9999.ebuild | 29 ++++++++++++++----- 4 files changed, 46 insertions(+), 16 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/{libseccomp-2.6.0-r2.ebuild => libseccomp-2.6.0-r3.ebuild} (84%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild index 0655f56bed..4eb2728435 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild @@ -24,7 +24,7 @@ else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz experimental-loong? ( https://github.com/matoro/libseccomp/compare/v${PV}..loongarch-r1.patch -> ${P}-loongarch-r1.patch )" - KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86" fi LICENSE="LGPL-2.1" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild index 3a9a369c8a..4f22c8f8ac 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild @@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 multilib-minimal +inherit distutils-r1 multilib-minimal multiprocessing DESCRIPTION="High level interface to Linux seccomp filter" HOMEPAGE="https://github.com/seccomp/libseccomp" @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86" fi LICENSE="LGPL-2.1" @@ -28,13 +28,14 @@ IUSE="python static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# We need newer kernel headers; we don't keep strict control of the exact -# version here, just be safe and pull in the latest stable ones. bug #551248 -DEPEND=" - >=sys-kernel/linux-headers-5.15 +RDEPEND=" python? ( ${PYTHON_DEPS} ) " -RDEPEND="${DEPEND}" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. bug #551248 +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.15 +" BDEPEND=" ${DEPEND} dev-util/gperf @@ -60,6 +61,9 @@ src_prepare() { eautoreconf fi + + # Silence noise when running Python tests + sed -i -e 's:$(pwd)/../src/python/build/lib\.\*:$(pwd):' tests/regression || die } multilib_src_configure() { @@ -91,6 +95,17 @@ multilib_src_compile() { } multilib_src_test() { + local -x LIBSECCOMP_TSTCFG_JOBS="$(makeopts_jobs)" + emake -Onone check + + if multilib_is_native_abi && use python ; then + distutils-r1_src_test + fi +} + +python_test() { + local -x LIBSECCOMP_TSTCFG_MODE_LIST="python" + emake -Onone check } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild index 50009f99b2..f28f3459eb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86" fi LICENSE="LGPL-2.1" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild index cc42ab905d..b3a5119c28 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 multilib-minimal +inherit distutils-r1 multilib-minimal multiprocessing DESCRIPTION="High level interface to Linux seccomp filter" HOMEPAGE="https://github.com/seccomp/libseccomp" @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86" fi LICENSE="LGPL-2.1" @@ -28,13 +28,14 @@ IUSE="python static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# We need newer kernel headers; we don't keep strict control of the exact -# version here, just be safe and pull in the latest stable ones. bug #551248 -DEPEND=" - >=sys-kernel/linux-headers-5.15 +RDEPEND=" python? ( ${PYTHON_DEPS} ) " -RDEPEND="${DEPEND}" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. bug #551248 +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.15 +" BDEPEND=" ${DEPEND} dev-util/gperf @@ -57,6 +58,9 @@ src_prepare() { eautoreconf fi + + # Silence noise when running Python tests + sed -i -e 's:$(pwd)/../src/python/build/lib\.\*:$(pwd):' tests/regression || die } multilib_src_configure() { @@ -88,6 +92,17 @@ multilib_src_compile() { } multilib_src_test() { + local -x LIBSECCOMP_TSTCFG_JOBS="$(makeopts_jobs)" + emake -Onone check + + if multilib_is_native_abi && use python ; then + distutils-r1_src_test + fi +} + +python_test() { + local -x LIBSECCOMP_TSTCFG_MODE_LIST="python" + emake -Onone check }