| 1 |
commit: 17f3370ebf047a59d0e0e47ecf92d6bfd4331dab |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 3 13:55:45 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 3 16:10:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f3370e |
| 7 |
|
| 8 |
sys-libs/libcap: Removed old. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/libcap/Manifest | 1 - |
| 14 |
sys-libs/libcap/files/libcap-2.22-no-perl.patch | 54 ----------------- |
| 15 |
sys-libs/libcap/files/libcap-2.25-gperf.patch | 20 ------- |
| 16 |
sys-libs/libcap/libcap-2.25.ebuild | 78 ------------------------- |
| 17 |
4 files changed, 153 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest |
| 20 |
index 51cf86f2078..0c08e136c4b 100644 |
| 21 |
--- a/sys-libs/libcap/Manifest |
| 22 |
+++ b/sys-libs/libcap/Manifest |
| 23 |
@@ -1,3 +1,2 @@ |
| 24 |
-DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9 |
| 25 |
DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0 |
| 26 |
DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6 |
| 27 |
|
| 28 |
diff --git a/sys-libs/libcap/files/libcap-2.22-no-perl.patch b/sys-libs/libcap/files/libcap-2.22-no-perl.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 9c29e7efbf3..00000000000 |
| 31 |
--- a/sys-libs/libcap/files/libcap-2.22-no-perl.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,54 +0,0 @@ |
| 34 |
-From fdd0f3b207785711663f48e0dd3414d90d1f2e86 Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Mike Frysinger <vapier@g.o> |
| 36 |
-Date: Sat, 12 Nov 2011 14:24:08 -0500 |
| 37 |
-Subject: [PATCH] use awk/sed instead of perl for creating header files |
| 38 |
- |
| 39 |
-More systems should have awk/sed than perl. |
| 40 |
- |
| 41 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
| 42 |
---- |
| 43 |
- libcap/Makefile | 20 ++++++++++++++++---- |
| 44 |
- 1 files changed, 16 insertions(+), 4 deletions(-) |
| 45 |
- |
| 46 |
-diff --git a/libcap/Makefile b/libcap/Makefile |
| 47 |
-index 4762c60..68845e0 100644 |
| 48 |
---- a/libcap/Makefile |
| 49 |
-+++ b/libcap/Makefile |
| 50 |
-@@ -24,6 +24,8 @@ OBJS=$(addsuffix .o, $(FILES)) |
| 51 |
- MINLIBNAME=$(MAJLIBNAME).$(MINOR) |
| 52 |
- GPERF_OUTPUT = _caps_output.gperf |
| 53 |
- CFLAGS += -fPIC |
| 54 |
-+AWK = awk |
| 55 |
-+SED = sed |
| 56 |
- |
| 57 |
- all: $(MINLIBNAME) $(STALIBNAME) |
| 58 |
- |
| 59 |
-@@ -39,11 +41,21 @@ cap_names.h: _makenames |
| 60 |
- ./_makenames > cap_names.h |
| 61 |
- |
| 62 |
- $(GPERF_OUTPUT): cap_names.list.h |
| 63 |
-- 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) > $@ |
| 64 |
-+ (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"; \ |
| 65 |
-+ $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ |
| 66 |
-+ gperf \ |
| 67 |
-+ --ignore-case \ |
| 68 |
-+ --language=ANSI-C \ |
| 69 |
-+ --readonly \ |
| 70 |
-+ --null-strings \ |
| 71 |
-+ --global-table \ |
| 72 |
-+ --hash-function-name=__cap_hash_name \ |
| 73 |
-+ --lookup-function-name="__cap_lookup_name" \ |
| 74 |
-+ -c -t -m20 $(INDENT) > $@ |
| 75 |
- |
| 76 |
--cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h |
| 77 |
-- @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h" |
| 78 |
-- 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 > $@ |
| 79 |
-+cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile |
| 80 |
-+ @echo "=> making $@ from $<" |
| 81 |
-+ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@ |
| 82 |
- |
| 83 |
- $(STALIBNAME): $(OBJS) |
| 84 |
- $(AR) rcs $@ $^ |
| 85 |
--- |
| 86 |
-1.7.6.1 |
| 87 |
- |
| 88 |
|
| 89 |
diff --git a/sys-libs/libcap/files/libcap-2.25-gperf.patch b/sys-libs/libcap/files/libcap-2.25-gperf.patch |
| 90 |
deleted file mode 100644 |
| 91 |
index 86e930f6a44..00000000000 |
| 92 |
--- a/sys-libs/libcap/files/libcap-2.25-gperf.patch |
| 93 |
+++ /dev/null |
| 94 |
@@ -1,20 +0,0 @@ |
| 95 |
-update gperf call to work with gperf-3.1 |
| 96 |
- |
| 97 |
-https://bugs.gentoo.org/604802 |
| 98 |
- |
| 99 |
---- a/libcap/Makefile |
| 100 |
-+++ b/libcap/Makefile |
| 101 |
-@@ -44,11 +44,12 @@ |
| 102 |
- ./_makenames > cap_names.h |
| 103 |
- |
| 104 |
- $(GPERF_OUTPUT): cap_names.list.h |
| 105 |
-- (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"; \ |
| 106 |
-+ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \ |
| 107 |
- $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ |
| 108 |
- gperf \ |
| 109 |
- --ignore-case \ |
| 110 |
- --language=ANSI-C \ |
| 111 |
-+ --includes \ |
| 112 |
- --readonly \ |
| 113 |
- --null-strings \ |
| 114 |
- --global-table \ |
| 115 |
|
| 116 |
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild |
| 117 |
deleted file mode 100644 |
| 118 |
index c8bff991d30..00000000000 |
| 119 |
--- a/sys-libs/libcap/libcap-2.25.ebuild |
| 120 |
+++ /dev/null |
| 121 |
@@ -1,78 +0,0 @@ |
| 122 |
-# Copyright 1999-2018 Gentoo Foundation |
| 123 |
-# Distributed under the terms of the GNU General Public License v2 |
| 124 |
- |
| 125 |
-EAPI=5 |
| 126 |
- |
| 127 |
-inherit eutils multilib multilib-minimal toolchain-funcs pam |
| 128 |
- |
| 129 |
-DESCRIPTION="POSIX 1003.1e capabilities" |
| 130 |
-HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" |
| 131 |
-SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" |
| 132 |
- |
| 133 |
-# it's available under either of the licenses |
| 134 |
-LICENSE="|| ( GPL-2 BSD )" |
| 135 |
-SLOT="0" |
| 136 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" |
| 137 |
-IUSE="pam static-libs" |
| 138 |
- |
| 139 |
-# While the build system optionally uses gperf, we don't DEPEND on it because |
| 140 |
-# the build automatically falls back when it's unavailable. #604802 |
| 141 |
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] |
| 142 |
- pam? ( virtual/pam )" |
| 143 |
-DEPEND="${RDEPEND} |
| 144 |
- sys-kernel/linux-headers" |
| 145 |
- |
| 146 |
-PATCHES=( |
| 147 |
- "${FILESDIR}"/${PN}-2.25-build-system-fixes.patch |
| 148 |
- "${FILESDIR}"/${PN}-2.22-no-perl.patch |
| 149 |
- "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch |
| 150 |
- "${FILESDIR}"/${PN}-2.21-include.patch |
| 151 |
- "${FILESDIR}"/${PN}-2.25-gperf.patch |
| 152 |
-) |
| 153 |
- |
| 154 |
-src_prepare() { |
| 155 |
- epatch "${PATCHES[@]}" |
| 156 |
- multilib_copy_sources |
| 157 |
-} |
| 158 |
- |
| 159 |
-multilib_src_configure() { |
| 160 |
- local pam |
| 161 |
- if multilib_is_native_abi && use pam; then |
| 162 |
- pam=yes |
| 163 |
- else |
| 164 |
- pam=no |
| 165 |
- fi |
| 166 |
- |
| 167 |
- sed -i \ |
| 168 |
- -e "/^PAM_CAP/s:=.*:=${pam}:" \ |
| 169 |
- -e '/^DYNAMIC/s:=.*:=yes:' \ |
| 170 |
- -e '/^lib_prefix=/s:=.*:=$(prefix):' \ |
| 171 |
- -e "/^lib=/s:=.*:=$(get_libdir):" \ |
| 172 |
- Make.Rules |
| 173 |
-} |
| 174 |
- |
| 175 |
-multilib_src_compile() { |
| 176 |
- tc-export AR CC RANLIB |
| 177 |
- local BUILD_CC |
| 178 |
- tc-export_build_env BUILD_CC |
| 179 |
- |
| 180 |
- default |
| 181 |
-} |
| 182 |
- |
| 183 |
-multilib_src_install() { |
| 184 |
- # no configure, needs explicit install line #444724#c3 |
| 185 |
- emake install DESTDIR="${ED}" |
| 186 |
- |
| 187 |
- gen_usr_ldscript -a cap |
| 188 |
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a |
| 189 |
- |
| 190 |
- rm -rf "${ED}"/usr/$(get_libdir)/security |
| 191 |
- if multilib_is_native_abi && use pam; then |
| 192 |
- dopammod pam_cap/pam_cap.so |
| 193 |
- dopamsecurity '' pam_cap/capability.conf |
| 194 |
- fi |
| 195 |
-} |
| 196 |
- |
| 197 |
-multilib_src_install_all() { |
| 198 |
- dodoc CHANGELOG README doc/capability.notes |
| 199 |
-} |
Archives