mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-28 14:01:43 +01:00
sys-libs/libseccomp: Sync with Gentoo
It's from Gentoo commit 2b237c4b6a2bee9fd99ec7fe3362c6fc58a90445.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
713293845e
commit
468b2c4687
@ -1,3 +1,5 @@
|
||||
DIST libseccomp-2.5.4-loongarch64-20220425.patch.xz 132768 BLAKE2B f3ab165b028b5f8b4c16574936b915595807ebeb49ef7365d6051f3dfafa7da46ef2a9de458e0a268298cb340152abe1f3c0c293446462a06696bc9ce92d2f72 SHA512 94f23c7a2cc2ea8acb01fef00ef184295c276b14b2b3ba0c65687fd72081df8478f3f04c51b0b391ba44529c4f914e6edbb4132af935e3be55902f641d478780
|
||||
DIST libseccomp-2.5.4-loongarch64-20220622.patch.xz 67668 BLAKE2B faf1b5653a4d454626e310cdfd7def1fb8b768b88d3f792a28170d969a834be7ced8bb7b511a11e0e44691d626046e4c387c08f3fbacdedd6689813f65c129aa SHA512 9aba715c6f120f8df249158f73bc64097243f911d5864294048dc3976580e9ca96cc538c890918a375c3b35369fdbf2383424b6f3d41822c834228ff188680fa
|
||||
DIST libseccomp-2.5.4.tar.gz 637228 BLAKE2B 38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229 SHA512 92650bd7d1d48b383f402a536b97a017fd0f6ad1234daf4b938d01c92e8d134a01d2f2dd45fd9e2d025d7556bd1386ec360402145a87f20580c85949d62cea0e
|
||||
DIST libseccomp-2.5.5-loongarch64-20231204.patch.xz 41236 BLAKE2B 7831b28c275771bb675b4b5045e657d96c254e69cee7188a19f4812bc83343e0041772c20be1e7392ec88387726b49f34aa670a906b922dba531a0d35e548b1e SHA512 7870e536d834360dfec446493815b675a305f6bec1b79d0caae6fb546d2f694e77ce52e547bbcdb22cda272272bf3d5a427960b4aa76fb987d06ab035298007d
|
||||
DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998 SHA512 f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
https://github.com/seccomp/libseccomp/pull/424
|
||||
|
||||
From 865adeed17cac7063cbbce0c5df225aa35c83621 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 16 Dec 2023 02:17:36 +0000
|
||||
Subject: [PATCH] tests: avoid use of non-portable `which`
|
||||
|
||||
which is not a standard POSIX utility, and indeed, each of these test scripts
|
||||
uses #!/bin/bash as its shebang, so we can use `type -P` which has the same
|
||||
behaviour as `which` for free.
|
||||
|
||||
(If the tests used POSIX shell, we could do `command -v`, its only caveat is
|
||||
that it'll pick up functions in the user's shell, which doesn't matter 99% of
|
||||
the time anyway.)
|
||||
|
||||
Distributions like Debian [0] and Gentoo [1] are looking to remove `which`
|
||||
from their base set of packages.
|
||||
|
||||
[0] https://lwn.net/Articles/874049/
|
||||
[1] https://bugs.gentoo.org/646588
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/tests/38-basic-pfc_coverage.sh
|
||||
+++ b/tests/38-basic-pfc_coverage.sh
|
||||
@@ -18,7 +18,7 @@
|
||||
#
|
||||
function check_deps() {
|
||||
[[ -z "$1" ]] && return
|
||||
- which "$1" >& /dev/null
|
||||
+ type -P "$1" >& /dev/null
|
||||
return $?
|
||||
}
|
||||
|
||||
--- a/tests/55-basic-pfc_binary_tree.sh
|
||||
+++ b/tests/55-basic-pfc_binary_tree.sh
|
||||
@@ -18,7 +18,7 @@
|
||||
#
|
||||
function check_deps() {
|
||||
[[ -z "$1" ]] && return
|
||||
- which "$1" >& /dev/null
|
||||
+ type -P "$1" >& /dev/null
|
||||
return $?
|
||||
}
|
||||
|
||||
--- a/tests/regression
|
||||
+++ b/tests/regression
|
||||
@@ -73,7 +73,7 @@ GLBL_SYS_API="../tools/scmp_api_level"
|
||||
#
|
||||
function check_deps() {
|
||||
[[ -z "$1" ]] && return
|
||||
- which "$1" >& /dev/null
|
||||
+ type -P "$1" >& /dev/null
|
||||
return $?
|
||||
}
|
||||
|
||||
--- a/tests/testgen
|
||||
+++ b/tests/testgen
|
||||
@@ -32,7 +32,7 @@
|
||||
#
|
||||
function verify_deps() {
|
||||
[[ -z "$1" ]] && return
|
||||
- if ! which "$1" >& /dev/null; then
|
||||
+ if ! type -P "$1" >& /dev/null; then
|
||||
echo "error: install \"$1\" and include it in your \$PATH"
|
||||
exit 1
|
||||
fi
|
||||
--
|
||||
2.43.0
|
||||
|
||||
111
sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
vendored
Normal file
111
sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
vendored
Normal file
@ -0,0 +1,111 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
DISTUTILS_OPTIONAL=1
|
||||
|
||||
inherit distutils-r1 multilib-minimal
|
||||
|
||||
DESCRIPTION="high level interface to Linux seccomp filter"
|
||||
HOMEPAGE="https://github.com/seccomp/libseccomp"
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
|
||||
PRERELEASE="2.6.0"
|
||||
inherit autotools git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
|
||||
experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${PN}-2.5.5-loongarch64-20231204.patch.xz )"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="experimental-loong 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
|
||||
python? ( ${PYTHON_DEPS} )"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="${DEPEND}
|
||||
dev-util/gperf
|
||||
python? ( dev-python/cython[${PYTHON_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/libseccomp-python-shared.patch
|
||||
"${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch
|
||||
"${FILESDIR}"/libseccomp-2.5.5-which-hunt.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if use experimental-loong; then
|
||||
PATCHES+=( "${WORKDIR}/${PN}-2.5.5-loongarch64-20231204.patch" )
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
if use experimental-loong; then
|
||||
# touch generated files to avoid activating maintainer mode
|
||||
# remove when loong-fix-build.patch is no longer necessary
|
||||
touch ./aclocal.m4 ./configure ./configure.h.in || die
|
||||
find . -name Makefile.in -exec touch {} + || die
|
||||
fi
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable static-libs static)
|
||||
--disable-python
|
||||
)
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
do_python() {
|
||||
# setup.py reads VERSION_RELEASE from the environment
|
||||
local -x VERSION_RELEASE=${PRERELEASE-${PV}}
|
||||
|
||||
pushd "${BUILD_DIR}/src/python" >/dev/null || die
|
||||
"$@"
|
||||
popd >/dev/null || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
# setup.py expects libseccomp.so to live in "../.libs"
|
||||
# Copy the python files to the right place for this.
|
||||
rm -r "${BUILD_DIR}"/src/python || die
|
||||
cp -r "${S}"/src/python "${BUILD_DIR}"/src/python || die
|
||||
local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}"
|
||||
|
||||
do_python distutils-r1_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
do_python distutils-r1_src_install
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${ED}" -type f -name "${PN}.la" -delete || die
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
@ -17,7 +17,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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user