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 4C052138335 for ; Fri, 3 May 2019 16:10:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F080E0984; Fri, 3 May 2019 16:10:53 +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 023E1E0984 for ; Fri, 3 May 2019 16:10:52 +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 4944D343487 for ; Fri, 3 May 2019 16:10:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42767567 for ; Fri, 3 May 2019 16:10:49 +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: <1556899843.17f3370ebf047a59d0e0e47ecf92d6bfd4331dab.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/, sys-libs/libcap/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/Manifest sys-libs/libcap/files/libcap-2.22-no-perl.patch sys-libs/libcap/files/libcap-2.25-gperf.patch sys-libs/libcap/libcap-2.25.ebuild X-VCS-Directories: sys-libs/libcap/ sys-libs/libcap/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 17f3370ebf047a59d0e0e47ecf92d6bfd4331dab X-VCS-Branch: master Date: Fri, 3 May 2019 16:10:49 +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: 794c608e-d362-4733-b06b-0dafeb3d9a15 X-Archives-Hash: d1daf72fcd2ac6e3fa0e43d9f7b392c6 commit: 17f3370ebf047a59d0e0e47ecf92d6bfd4331dab Author: Lars Wendler gentoo org> AuthorDate: Fri May 3 13:55:45 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri May 3 16:10:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f3370e sys-libs/libcap: Removed old. Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-libs/libcap/Manifest | 1 - sys-libs/libcap/files/libcap-2.22-no-perl.patch | 54 ----------------- sys-libs/libcap/files/libcap-2.25-gperf.patch | 20 ------- sys-libs/libcap/libcap-2.25.ebuild | 78 ------------------------- 4 files changed, 153 deletions(-) diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 51cf86f2078..0c08e136c4b 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -1,3 +1,2 @@ -DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6 diff --git a/sys-libs/libcap/files/libcap-2.22-no-perl.patch b/sys-libs/libcap/files/libcap-2.22-no-perl.patch deleted file mode 100644 index 9c29e7efbf3..00000000000 --- a/sys-libs/libcap/files/libcap-2.22-no-perl.patch +++ /dev/null @@ -1,54 +0,0 @@ -From fdd0f3b207785711663f48e0dd3414d90d1f2e86 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 12 Nov 2011 14:24:08 -0500 -Subject: [PATCH] use awk/sed instead of perl for creating header files - -More systems should have awk/sed than perl. - -Signed-off-by: Mike Frysinger ---- - libcap/Makefile | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index 4762c60..68845e0 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -24,6 +24,8 @@ OBJS=$(addsuffix .o, $(FILES)) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf - CFLAGS += -fPIC -+AWK = awk -+SED = sed - - all: $(MINLIBNAME) $(STALIBNAME) - -@@ -39,11 +41,21 @@ cap_names.h: _makenames - ./_makenames > cap_names.h - - $(GPERF_OUTPUT): cap_names.list.h -- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ -+ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; \ -+ $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ -+ gperf \ -+ --ignore-case \ -+ --language=ANSI-C \ -+ --readonly \ -+ --null-strings \ -+ --global-table \ -+ --hash-function-name=__cap_hash_name \ -+ --lookup-function-name="__cap_lookup_name" \ -+ -c -t -m20 $(INDENT) > $@ - --cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h -- @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h" -- perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@ -+cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile -+ @echo "=> making $@ from $<" -+ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@ - - $(STALIBNAME): $(OBJS) - $(AR) rcs $@ $^ --- -1.7.6.1 - diff --git a/sys-libs/libcap/files/libcap-2.25-gperf.patch b/sys-libs/libcap/files/libcap-2.25-gperf.patch deleted file mode 100644 index 86e930f6a44..00000000000 --- a/sys-libs/libcap/files/libcap-2.25-gperf.patch +++ /dev/null @@ -1,20 +0,0 @@ -update gperf call to work with gperf-3.1 - -https://bugs.gentoo.org/604802 - ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -44,11 +44,12 @@ - ./_makenames > cap_names.h - - $(GPERF_OUTPUT): cap_names.list.h -- (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; \ -+ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \ - $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ - gperf \ - --ignore-case \ - --language=ANSI-C \ -+ --includes \ - --readonly \ - --null-strings \ - --global-table \ diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild deleted file mode 100644 index c8bff991d30..00000000000 --- a/sys-libs/libcap/libcap-2.25.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils 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 ~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() { - epatch "${PATCHES[@]}" - multilib_copy_sources -} - -multilib_src_configure() { - local pam - if multilib_is_native_abi && use pam; then - pam=yes - else - pam=no - fi - - sed -i \ - -e "/^PAM_CAP/s:=.*:=${pam}:" \ - -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 - use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a - - rm -rf "${ED}"/usr/$(get_libdir)/security - if multilib_is_native_abi && use pam; then - dopammod pam_cap/pam_cap.so - dopamsecurity '' pam_cap/capability.conf - fi -} - -multilib_src_install_all() { - dodoc CHANGELOG README doc/capability.notes -}