From a3cd07faa5647634fc5655e60ee19c5094b7fe63 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jul 2022 10:43:32 +0100 Subject: sys-libs/libseccomp : import from gentoo temporarily, till we update our toolchain --- metadata/md5-cache/sys-libs/libseccomp-2.5.3-r10 | 17 ++++ metadata/pkg_desc_index | 1 + sys-libs/libseccomp/Manifest | 1 + .../files/libseccomp-2.5.3-skip-valgrind.patch | 13 +++ .../files/libseccomp-python-shared.patch | 25 ++++++ sys-libs/libseccomp/libseccomp-2.5.3-r10.ebuild | 99 ++++++++++++++++++++++ 6 files changed, 156 insertions(+) create mode 100644 metadata/md5-cache/sys-libs/libseccomp-2.5.3-r10 create mode 100644 sys-libs/libseccomp/Manifest create mode 100644 sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch create mode 100644 sys-libs/libseccomp/files/libseccomp-python-shared.patch create mode 100644 sys-libs/libseccomp/libseccomp-2.5.3-r10.ebuild diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.3-r10 b/metadata/md5-cache/sys-libs/libseccomp-2.5.3-r10 new file mode 100644 index 00000000..70b1dc13 --- /dev/null +++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.3-r10 @@ -0,0 +1,17 @@ +BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) dev-util/gperf python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) +DEFINED_PHASES=compile configure install prepare test +DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) >=sys-kernel/linux-headers-4.3 +DESCRIPTION=high level interface to Linux seccomp filter +EAPI=7 +HOMEPAGE=https://github.com/seccomp/libseccomp +INHERIT=distutils-r1 multilib-minimal +IUSE=python static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 +KEYWORDS=-* amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux +LICENSE=LGPL-2.1 +RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) +REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.3/libseccomp-2.5.3.tar.gz +_eclasses_=distutils-r1 3b871cf4724e3abc9b4ff059289f0d45 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 5dc84801daa87406aafaf535cb947a64 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 +_md5_=c983cbdfb3b227e7da1cd5455520e353 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 8ce06a35..6ac83b64 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -77,6 +77,7 @@ sys-kernel/virtualbox-modules-dkms 6.1.18-r1: Kernel Modules source for Virtualb sys-kernel/zfs-dkms 2.1.4: ZFS sources for linux sys-libs/binutils-libs 2.37_p1-r10: Core binutils libraries (libbfd, libopcodes, libiberty) for external packages sys-libs/glibc 2.33-r10: GNU libc C library +sys-libs/libseccomp 2.5.3-r10: high level interface to Linux seccomp filter sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards virtual/libudev 1000: Virtual for libudev providers virtual/notification-daemon 0-r100: Virtual (dummy package) for notification daemon dbus service diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest new file mode 100644 index 00000000..fb3a409a --- /dev/null +++ b/sys-libs/libseccomp/Manifest @@ -0,0 +1 @@ +DIST libseccomp-2.5.3.tar.gz 637572 BLAKE2B cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7 SHA512 00170fe2360f0c0b33293dccfcc33e98fabb99619f34ecefbcc92bfdaa249ba91e7433226545b842b71542a3b224b6e980ea2ae656c4addf07e84a0def1870a0 diff --git a/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch b/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch new file mode 100644 index 00000000..baf3ed97 --- /dev/null +++ b/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch @@ -0,0 +1,13 @@ +Valgrind isn't supported on all arches (and indeed profiles for older types +of some arches) so let's just skip the automagic Valgrind dependency entirely. +--- a/tests/regression ++++ b/tests/regression +@@ -876,7 +876,7 @@ function run_test() { + run_test_bpf_sim_fuzz "$1" $2 "$3" + elif [[ "$4" == "bpf-valgrind" ]]; then + # only run this test if valgrind is installed +- if check_deps valgrind; then ++ if false; then + run_test_bpf_valgrind "$testnumstr" "$3" + else + print_result $testnumstr "SKIPPED" \ diff --git a/sys-libs/libseccomp/files/libseccomp-python-shared.patch b/sys-libs/libseccomp/files/libseccomp-python-shared.patch new file mode 100644 index 00000000..93e1ec8a --- /dev/null +++ b/sys-libs/libseccomp/files/libseccomp-python-shared.patch @@ -0,0 +1,25 @@ +From 763b863c3028f604f16cc6d2de7452dc16458596 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 23 May 2021 16:17:32 -0400 +Subject: [PATCH] Link python module against shared library + +--- + src/python/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/setup.py b/src/python/setup.py +index 0419111..fb650d0 100755 +--- a/src/python/setup.py ++++ b/src/python/setup.py +@@ -41,7 +41,7 @@ setup( + ext_modules = [ + Extension("seccomp", ["seccomp.pyx"], + # unable to handle libtool libraries directly +- extra_objects=["../.libs/libseccomp.a"], ++ extra_objects=["../.libs/libseccomp.so"], + # fix build warnings, see PEP 3123 + extra_compile_args=["-fno-strict-aliasing"]) + ] +-- +2.32.0.rc1 + diff --git a/sys-libs/libseccomp/libseccomp-2.5.3-r10.ebuild b/sys-libs/libseccomp/libseccomp-2.5.3-r10.ebuild new file mode 100644 index 00000000..1006b5a5 --- /dev/null +++ b/sys-libs/libseccomp/libseccomp-2.5.3-r10.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +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" + KEYWORDS="-* amd64 arm arm64 hppa ~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} )" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" +# 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. #551248 +DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" + ) + + 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[@]}" +} + +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 +} -- cgit v1.2.3