From e06dfa1a2fc15f638756134f0bedd61a2e4d0836 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 18 Nov 2019 12:51:27 +0100 Subject: sys-libs/libseccomp: Revbump to add missing SNR ppoll definitions Bug: https://bugs.gentoo.org/700094 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler --- .../libseccomp-2.4.2-missing_SNR_ppoll_defs.patch | 41 ++++++++++++++++++++ sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild | 45 ++++++++++++++++++++++ sys-libs/libseccomp/libseccomp-2.4.2.ebuild | 41 -------------------- 3 files changed, 86 insertions(+), 41 deletions(-) create mode 100644 sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch create mode 100644 sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild delete mode 100644 sys-libs/libseccomp/libseccomp-2.4.2.ebuild 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 new file mode 100644 index 000000000000..9194706efa06 --- /dev/null +++ b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch @@ -0,0 +1,41 @@ +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 new file mode 100644 index 000000000000..8e528f0bf022 --- /dev/null +++ b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 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 +} diff --git a/sys-libs/libseccomp/libseccomp-2.4.2.ebuild b/sys-libs/libseccomp/libseccomp-2.4.2.ebuild deleted file mode 100644 index 6fc6a1ee79ec..000000000000 --- a/sys-libs/libseccomp/libseccomp-2.4.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 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" - -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 - einstalldocs -} -- cgit v1.2.3-65-gdbad