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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFCD4138359 for ; Tue, 21 Jul 2020 08:32:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F216EE08FB; Tue, 21 Jul 2020 08:32:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3701E08F6 for ; Tue, 21 Jul 2020 08:32:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EB4434F337 for ; Tue, 21 Jul 2020 08:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A63002EA for ; Tue, 21 Jul 2020 08:32:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1595320343.e2e6d6b3716f84594d7a2dd91893cc4fe5fee04e.polynomial-c@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.4.2-missing_SNR_ppoll_defs.patch sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild X-VCS-Directories: sys-libs/libseccomp/ sys-libs/libseccomp/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e2e6d6b3716f84594d7a2dd91893cc4fe5fee04e X-VCS-Branch: master Date: Tue, 21 Jul 2020 08:32:29 +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: 6f0ff567-6fe6-4cde-a531-71f63f365b5f X-Archives-Hash: 322eb177f9550b54512bfcff82ce83b0 commit: e2e6d6b3716f84594d7a2dd91893cc4fe5fee04e Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 21 08:32:15 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jul 21 08:32:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e6d6b3 sys-libs/libseccomp: Removed old Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> sys-libs/libseccomp/Manifest | 1 - .../libseccomp-2.4.2-missing_SNR_ppoll_defs.patch | 41 -------------------- sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild | 45 ---------------------- 3 files changed, 87 deletions(-) diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index 59fe8310381..3daeec58da1 100644 --- a/sys-libs/libseccomp/Manifest +++ b/sys-libs/libseccomp/Manifest @@ -1,3 +1,2 @@ -DIST libseccomp-2.4.2.tar.gz 601014 BLAKE2B cff2612498a6ff3097809e9e04542e0be12c2c5d80fd51c2abd35fb6ac59f3ef7fce1c5205216876c1f67eb762d31c7df8e0f237f3957b7710148a1298502ae5 SHA512 375a3c7c658be6a08b9bb30963e10bb49e8e066119e0be6d3d97faac3db18b8e2c6938d8b5d3874b2f5331ec8295170112fbae83b5a3b5a5bebc0d6705bdfdbb DIST libseccomp-2.4.3.tar.gz 598147 BLAKE2B 272c9f1ca7e4059790f633a79cae8612831aa483d28630fb85b31dc2be0192907a8897819d835b61324e0b3fb0d77b8781e2a85e9750ef8d7974d8680b8cdea3 SHA512 7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef DIST libseccomp-2.5.0.tar.gz 638793 BLAKE2B c1f30624e210d632175b734c49411ee3f95e8f0ee68819ad83a342434231baef10c292f23fca0127394365a37efb043f9f24ade9534deecd61f50e7111a6fbc8 SHA512 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae diff --git a/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch deleted file mode 100644 index 9194706efa0..00000000000 --- a/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e3647f5b6b52996bf30d0c2c1d1248e4182e1c1c Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar -Date: Wed, 13 Nov 2019 13:36:10 +0100 -Subject: [PATCH] api: define __SNR_ppoll again - -Commit bf747eb21e428c2b3ead6ebcca27951b681963a0 accidentally removed the -__SNR_ppoll definition. Add it back, using a PNR value if disabled in -the kernel headers. - -Signed-off-by: Miroslav Lichvar -Acked-by: Tom Hromatka -Signed-off-by: Paul Moore ---- - include/seccomp-syscalls.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h -index 6457592..3c958df 100644 ---- a/include/seccomp-syscalls.h -+++ b/include/seccomp-syscalls.h -@@ -272,6 +272,7 @@ - #define __PNR_timerfd_gettime64 -10238 - #define __PNR_timerfd_settime64 -10239 - #define __PNR_utimensat_time64 -10240 -+#define __PNR_ppoll -10241 - - /* - * libseccomp syscall definitions -@@ -1359,6 +1360,12 @@ - #define __SNR_poll __PNR_poll - #endif - -+#ifdef __NR_ppoll -+#define __SNR_ppoll __NR_ppoll -+#else -+#define __SNR_ppoll __PNR_ppoll -+#endif -+ - #ifdef __NR_ppoll_time64 - #define __SNR_ppoll_time64 __NR_ppoll_time64 - #else diff --git a/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild deleted file mode 100644 index fc6b6775435..00000000000 --- a/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: Add python support. - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="high level interface to Linux seccomp filter" -HOMEPAGE="https://github.com/seccomp/libseccomp" -SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -# 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=">=sys-kernel/linux-headers-4.3" - -PATCHES=( - "${FILESDIR}/${P}-missing_SNR_ppoll_defs.patch" -) - -src_prepare() { - default - sed -i \ - -e '/_LDFLAGS/s:-static::' \ - tools/Makefile.in || die -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - --disable-python - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name libseccomp.la -delete || die - einstalldocs -}