mirror of
https://github.com/flatcar/scripts.git
synced 2026-02-06 16:22:33 +01:00
sys-libs/libseccomp: Sync with Gentoo
It's from Gentoo commit 9fa75a87383e8ccc19bd7649cc512c33d865eb4c. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
29f6773ea8
commit
276c3cd076
@ -1,3 +1,2 @@
|
||||
DIST libseccomp-2.5.5-loongarch-r1.patch 119822 BLAKE2B 4aa75c1ac87b2ca25cf6be38dfd760879c7255ca8e6cf86be3ac6e354f76cdaf3c8e2f59b646254414ffb0f1ffe6b7c50478f4db895a6ce632db8782c9807e91 SHA512 f7cd768d672a25448b2a3ceda27db52e0d62b5d9ab3eeb906226b6ebc19332c89332e0b870aaf82d4ffcfd642c2deb6029a30ae9a6bd702ebad9fdd40622b582
|
||||
DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998 SHA512 f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da
|
||||
DIST libseccomp-2.6.0.tar.gz 685655 BLAKE2B 45c4f4dd67db5848bb536613e8929633f95cfbeb8738525381a76631187e7b0fc2c02f1a103579cd0f4135e9c175250fe2d784b85cc85424ec3125b4dafcf11c SHA512 9039478656d9b670af2ff4cb67b6b1fa315821e59d2f82ba6247e988859ddc7e3d15fea159eccca161bf2890828bb62aa6ab4d6b7ff55f27a9d6bd9532eeee1b
|
||||
DIST libseccomp-2.6.0.tar.gz.asc 833 BLAKE2B 3bec3fc850bcd631018f152ee8a81d89ad3e7b15d91a559048400a07efe1b1787d1cdc1b056dca62bbf8134ad81ad1b4bf53f3230e24bf94a39296b2b1562e64 SHA512 973b69c58085a1567f860e621e3a197be02c0ca71dad664234418cf5c00c39767efd37a7c4016f1be5bd588262617b6603855262db2ee6f31bc16061bc130e0f
|
||||
|
||||
@ -1,127 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_OPTIONAL=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
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"
|
||||
AUTOTOOLS_AUTO_DEPEND=yes
|
||||
inherit autotools git-r3
|
||||
else
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
inherit autotools libtool
|
||||
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"
|
||||
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
|
||||
experimental-loong? ( ${AUTOTOOLS_DEPEND} )
|
||||
python? (
|
||||
${DISTUTILS_DEPS}
|
||||
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
|
||||
"${FILESDIR}"/libseccomp-2.5.5-arch-syscall-check.patch
|
||||
"${FILESDIR}"/libseccomp-2.5.5-aliasing.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if use experimental-loong; then
|
||||
PATCHES+=( "${DISTDIR}/${P}-loongarch-r1.patch" )
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
|
||||
fi
|
||||
|
||||
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 ]] || use experimental-loong; then
|
||||
rm -f "include/seccomp.h" || die
|
||||
eautoreconf
|
||||
else
|
||||
elibtoolize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable static-libs static)
|
||||
--disable-python
|
||||
)
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
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}"
|
||||
|
||||
# setup.py reads VERSION_RELEASE from the environment
|
||||
local -x VERSION_RELEASE=${PRERELEASE-${PV}}
|
||||
|
||||
pushd "${BUILD_DIR}/src/python" >/dev/null || die
|
||||
distutils-r1_src_compile
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
distutils-r1_src_install
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${ED}" -type f -name "${PN}.la" -delete || die
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -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"
|
||||
@ -18,8 +18,16 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
PRERELEASE="2.6.0"
|
||||
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"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libseccomp.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="
|
||||
https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
|
||||
verify-sig? ( https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz.asc )
|
||||
"
|
||||
KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libseccomp )"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
@ -28,14 +36,16 @@ IUSE="python static-libs test"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
# 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
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
BDEPEND+="
|
||||
${DEPEND}
|
||||
dev-util/gperf
|
||||
python? (
|
||||
@ -52,6 +62,19 @@ PATCHES=(
|
||||
"${FILESDIR}"/${P}-bounds.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
return
|
||||
fi
|
||||
|
||||
if use verify-sig; then
|
||||
verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
@ -60,6 +83,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 +117,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
|
||||
}
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_OPTIONAL=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
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"
|
||||
KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
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
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
${DEPEND}
|
||||
dev-util/gperf
|
||||
python? (
|
||||
${DISTUTILS_DEPS}
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/libseccomp-2.6.0-python-shared.patch
|
||||
"${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch
|
||||
"${FILESDIR}"/${P}-drop-bogus-test.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
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[@]}"
|
||||
}
|
||||
|
||||
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}"
|
||||
|
||||
# setup.py reads VERSION_RELEASE from the environment
|
||||
local -x VERSION_RELEASE=${PRERELEASE-${PV}}
|
||||
|
||||
pushd "${BUILD_DIR}/src/python" >/dev/null || die
|
||||
distutils-r1_src_compile
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake -Onone check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use python ; then
|
||||
distutils-r1_src_install
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${ED}" -type f -name "${PN}.la" -delete || die
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -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"
|
||||
@ -18,8 +18,16 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
PRERELEASE="2.6.0"
|
||||
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"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libseccomp.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="
|
||||
https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
|
||||
verify-sig? ( https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz.asc )
|
||||
"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libseccomp )"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
@ -28,14 +36,16 @@ IUSE="python static-libs test"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
# 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
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
BDEPEND+="
|
||||
${DEPEND}
|
||||
dev-util/gperf
|
||||
python? (
|
||||
@ -49,6 +59,19 @@ PATCHES=(
|
||||
"${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
return
|
||||
fi
|
||||
|
||||
if use verify-sig; then
|
||||
verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
@ -57,6 +80,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 +114,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
|
||||
}
|
||||
|
||||
|
||||
@ -5,9 +5,6 @@
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="experimental-loong">Add experimental LoongArch patchset</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">seccomp/libseccomp</remote-id>
|
||||
<remote-id type="cpe">cpe:/a:libseccomp_project:libseccomp</remote-id>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user