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 57CE6138334 for ; Wed, 4 Jul 2018 08:43:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DEA6E0993; Wed, 4 Jul 2018 08:43:47 +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 09483E0993 for ; Wed, 4 Jul 2018 08:43:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0082A335CA5 for ; Wed, 4 Jul 2018 08:43:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9AA335D for ; Wed, 4 Jul 2018 08:43:42 +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: <1530693816.43afb45707470ff350717d6854fa5fe709293cc0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/, sys-libs/libcap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/files/libcap-2.21-include.patch sys-libs/libcap/libcap-2.25-r1.ebuild X-VCS-Directories: sys-libs/libcap/files/ sys-libs/libcap/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 43afb45707470ff350717d6854fa5fe709293cc0 X-VCS-Branch: master Date: Wed, 4 Jul 2018 08:43:42 +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-Archives-Salt: e7b4aadf-f917-4137-9ecd-8ba2c3b0eb97 X-Archives-Hash: c0ba27142309312c49e9f035cd66e9e4 commit: 43afb45707470ff350717d6854fa5fe709293cc0 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 4 08:41:21 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 4 08:43:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43afb457 sys-libs/libcap: EAPI-6 revbump. Package-Manager: Portage-2.3.41, Repoman-2.3.9 sys-libs/libcap/files/libcap-2.21-include.patch | 4 +- sys-libs/libcap/libcap-2.25-r1.ebuild | 73 +++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/sys-libs/libcap/files/libcap-2.21-include.patch b/sys-libs/libcap/files/libcap-2.21-include.patch index 2a534246ee0..8ea6545659e 100644 --- a/sys-libs/libcap/files/libcap-2.21-include.patch +++ b/sys-libs/libcap/files/libcap-2.21-include.patch @@ -1,5 +1,5 @@ ---- libcap/libcap.h.org 2011-06-15 07:25:58.912480899 +0200 -+++ libcap/libcap.h 2011-06-15 07:26:16.421329661 +0200 +--- a/libcap/libcap.h ++++ b/libcap/libcap.h @@ -13,6 +13,7 @@ #include #include diff --git a/sys-libs/libcap/libcap-2.25-r1.ebuild b/sys-libs/libcap/libcap-2.25-r1.ebuild new file mode 100644 index 00000000000..8fd1ee61e27 --- /dev/null +++ b/sys-libs/libcap/libcap-2.25-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib multilib-minimal toolchain-funcs pam + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" +SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" + +# it's available under either of the licenses +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="pam static-libs" + +# While the build system optionally uses gperf, we don't DEPEND on it because +# the build automatically falls back when it's unavailable. #604802 +RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" + +PATCHES=( + "${FILESDIR}"/${PN}-2.25-build-system-fixes.patch + "${FILESDIR}"/${PN}-2.22-no-perl.patch + "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch + "${FILESDIR}"/${PN}-2.21-include.patch + "${FILESDIR}"/${PN}-2.25-gperf.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + sed -i \ + -e "/^PAM_CAP/s:=.*:=$(multilib_native_usex pam yes no):" \ + -e '/^DYNAMIC/s:=.*:=yes:' \ + -e '/^lib_prefix=/s:=.*:=$(prefix):' \ + -e "/^lib=/s:=.*:=$(get_libdir):" \ + Make.Rules +} + +multilib_src_compile() { + tc-export AR CC RANLIB + local BUILD_CC + tc-export_build_env BUILD_CC + + default +} + +multilib_src_install() { + # no configure, needs explicit install line #444724#c3 + emake install DESTDIR="${ED}" + + gen_usr_ldscript -a cap + if ! use static-libs ; then + rm "${ED%/}"/usr/$(get_libdir)/libcap.a || die + fi + + if multilib_is_native_abi && use pam; then + dopammod pam_cap/pam_cap.so + dopamsecurity '' pam_cap/capability.conf + fi +} + +multilib_src_install_all() { + rm -r "${ED%/}"/usr/$(get_libdir)/security || die + dodoc CHANGELOG README doc/capability.notes +}