From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1388288-garchives=archives.gentoo.org@lists.gentoo.org> 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 10C5215808D for <garchives@archives.gentoo.org>; Thu, 21 Apr 2022 20:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DE10E08FE; Thu, 21 Apr 2022 20:25:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 BC2C3E08FE for <gentoo-commits@lists.gentoo.org>; Thu, 21 Apr 2022 20:25:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 F2B703414D0 for <gentoo-commits@lists.gentoo.org>; Thu, 21 Apr 2022 20:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B3922E0 for <gentoo-commits@lists.gentoo.org>; Thu, 21 Apr 2022 20:25:44 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1650572735.9bcec639639f15a3f4bd8f4475284df62ebcc605.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libseccomp/Manifest sys-libs/libseccomp/libseccomp-2.5.4.ebuild sys-libs/libseccomp/libseccomp-9999.ebuild X-VCS-Directories: sys-libs/libseccomp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9bcec639639f15a3f4bd8f4475284df62ebcc605 X-VCS-Branch: master Date: Thu, 21 Apr 2022 20:25:44 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd113d3d-ec88-4462-9f8d-de8f0367d539 X-Archives-Hash: 560967ea15db815ce89c6d5f74071ea4 commit: 9bcec639639f15a3f4bd8f4475284df62ebcc605 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Apr 21 20:22:24 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 21 20:25:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcec639 sys-libs/libseccomp: add 2.5.4 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/libseccomp/Manifest | 1 + ...seccomp-9999.ebuild => libseccomp-2.5.4.ebuild} | 29 +++++++++++----------- sys-libs/libseccomp/libseccomp-9999.ebuild | 29 +++++++++++----------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index 287959e7d52c..1199558b0162 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.3.tar.gz 637572 BLAKE2B cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7 SHA512 00170fe2360f0c0b33293dccfcc33e98fabb99619f34ecefbcc92bfdaa249ba91e7433226545b842b71542a3b224b6e980ea2ae656c4addf07e84a0def1870a0 +DIST libseccomp-2.5.4.tar.gz 637228 BLAKE2B 38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229 SHA512 92650bd7d1d48b383f402a536b97a017fd0f6ad1234daf4b938d01c92e8d134a01d2f2dd45fd9e2d025d7556bd1386ec360402145a87f20580c85949d62cea0e diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-2.5.4.ebuild similarity index 81% copy from sys-libs/libseccomp/libseccomp-9999.ebuild copy to sys-libs/libseccomp/libseccomp-2.5.4.ebuild index 847d2ce335b0..fed0b3c8f425 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-2.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,25 +27,24 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="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=">=sys-kernel/linux-headers-5.15 + 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" + python? ( dev-python/cython[${PYTHON_USEDEP}] )" -src_prepare() { - local PATCHES=( - "${FILESDIR}/libseccomp-python-shared.patch" - "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" - ) +PATCHES=( + "${FILESDIR}"/libseccomp-python-shared.patch + "${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch +) +src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then + if [[ ${PV} == *9999 ]] ; then sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die eautoreconf @@ -76,8 +75,8 @@ multilib_src_compile() { 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 + 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 diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild index 847d2ce335b0..fed0b3c8f425 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,25 +27,24 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="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=">=sys-kernel/linux-headers-5.15 + 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" + python? ( dev-python/cython[${PYTHON_USEDEP}] )" -src_prepare() { - local PATCHES=( - "${FILESDIR}/libseccomp-python-shared.patch" - "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" - ) +PATCHES=( + "${FILESDIR}"/libseccomp-python-shared.patch + "${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch +) +src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then + if [[ ${PV} == *9999 ]] ; then sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die eautoreconf @@ -76,8 +75,8 @@ multilib_src_compile() { 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 + 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