From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 046D8158086 for ; Fri, 5 Nov 2021 22:11:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B05D7E0858; Fri, 5 Nov 2021 22:11:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA089E0858 for ; Fri, 5 Nov 2021 22:10:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5388343158 for ; Fri, 5 Nov 2021 22:10:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17D0E10C for ; Fri, 5 Nov 2021 22:10:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636150248.d7b7d0c23c6ed894ed37937833dcc50981a514af.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/files/, sys-libs/libseccomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libseccomp/Manifest sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch sys-libs/libseccomp/libseccomp-2.5.3.ebuild sys-libs/libseccomp/libseccomp-9999.ebuild X-VCS-Directories: sys-libs/libseccomp/files/ sys-libs/libseccomp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d7b7d0c23c6ed894ed37937833dcc50981a514af X-VCS-Branch: master Date: Fri, 5 Nov 2021 22:10:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56b5e545-2515-437f-b945-0ec7ebb94b87 X-Archives-Hash: ccaf8793c5654fc92ff78d669a7c886b commit: d7b7d0c23c6ed894ed37937833dcc50981a514af Author: Sam James gentoo org> AuthorDate: Fri Nov 5 21:55:50 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 5 22:10:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b7d0c2 sys-libs/libseccomp: add 2.5.3 Signed-off-by: Sam James gentoo.org> sys-libs/libseccomp/Manifest | 1 + .../libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch | 13 +++++++++++++ .../{libseccomp-9999.ebuild => libseccomp-2.5.3.ebuild} | 13 +++++++++++-- sys-libs/libseccomp/libseccomp-9999.ebuild | 13 +++++++++++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index 55539be93ca..e405158403d 100644 --- a/sys-libs/libseccomp/Manifest +++ b/sys-libs/libseccomp/Manifest @@ -1,2 +1,3 @@ DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af DIST libseccomp-2.5.2.tar.gz 640305 BLAKE2B b61214cb9a9a793d1f04ae1de3f62c578cfaec54fcc355947b4c71efb75072bf60497db8c8a0fd34a46764952349027df3f025ddbd276d58be93209170950e89 SHA512 b2a95152cb274d6b35753596fd825406dae20c4a48b2f4076f835f977ecf324de38a3fe02e789dc20b49ecf6b4eb67f03e7733e92d40f5e20f25874307f1c2ac +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 00000000000..baf3ed971fc --- /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/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-2.5.3.ebuild similarity index 92% copy from sys-libs/libseccomp/libseccomp-9999.ebuild copy to sys-libs/libseccomp/libseccomp-2.5.3.ebuild index eea16fa2bbf..e0277c89c97 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-2.5.3.ebuild @@ -22,7 +22,8 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="python static-libs" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -39,10 +40,14 @@ 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 + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + eautoreconf fi } @@ -52,12 +57,14 @@ multilib_src_configure() { $(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 @@ -72,6 +79,7 @@ multilib_src_compile() { 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 } @@ -86,5 +94,6 @@ multilib_src_install() { multilib_src_install_all() { find "${ED}" -type f -name "${PN}.la" -delete || die + einstalldocs } diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild index eea16fa2bbf..e0277c89c97 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -22,7 +22,8 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="python static-libs" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -39,10 +40,14 @@ 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 + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + eautoreconf fi } @@ -52,12 +57,14 @@ multilib_src_configure() { $(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 @@ -72,6 +79,7 @@ multilib_src_compile() { 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 } @@ -86,5 +94,6 @@ multilib_src_install() { multilib_src_install_all() { find "${ED}" -type f -name "${PN}.la" -delete || die + einstalldocs }