commit: a83ded83c6ef3e65901a7f41c726203b33aa7c2c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Dec 30 18:12:08 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 30 18:12:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83ded83
sys-libs/libcap: drop 2.61 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-libs/libcap/Manifest | 1 - sys-libs/libcap/files/libcap-2.61-Wformat.patch | 25 ------ ....61-ignore-RAISE_SETFCAP-install-failures.patch | 24 ------ sys-libs/libcap/files/libcap-2.61-no_perl.patch | 57 ------------- sys-libs/libcap/libcap-2.61.ebuild | 98 ---------------------- 5 files changed, 205 deletions(-) diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 4ec6770eefde..17b8bc94ee64 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -1,3 +1,2 @@ DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 -DIST libcap-2.61.tar.xz 173892 BLAKE2B 50874d3510ab2476aaceb775314d98744736aacd7364a23827756caa160c101e8bc890b7c33b5e19df8b30bb6b3b1c2be323e4b6a963f97e9ee557e86b4f13a0 SHA512 40096bf511d1c45e36f5d7f24e49c709528f3f01fcadd47b6ac40a7e8d5f1705b29b4cc56356b030639f67d0641b9f4e7c19449c3c7f4f77a4070c35745b465c DIST libcap-2.62.tar.xz 174772 BLAKE2B e3c86a5b88b9be932802ec8612f79e5f04912bf3e66f673eae2add85362292f4737c544d21b9e5adfd1a7a33c073568301b6532cdf0ea6c8b834d895b84323f1 SHA512 61ac004920c5cd3382a5443db2eacfc2041b7a8c0814b27084c1d111125639fe3950dea4325d0f7fb6bfb0d5de114452c3a62230cc958edb05ffdb83b213f9b3 diff --git a/sys-libs/libcap/files/libcap-2.61-Wformat.patch b/sys-libs/libcap/files/libcap-2.61-Wformat.patch deleted file mode 100644 index e0046de58770..000000000000 --- a/sys-libs/libcap/files/libcap-2.61-Wformat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9fd3e7ac5870f84c73ac777d9a14480227ad7f00 Mon Sep 17 00:00:00 2001 -From: David Seifert <[email protected]> -Date: Sun, 28 Nov 2021 14:14:42 +0100 -Subject: [PATCH] Fix `-Wformat` on 32-bit platforms - ---- - libcap/cap_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/cap_test.c b/libcap/cap_test.c -index b7fb2c5..39df261 100644 ---- a/libcap/cap_test.c -+++ b/libcap/cap_test.c -@@ -124,7 +124,7 @@ static int test_short_bits(void) - } - if (strlen(tmp) > __CAP_NAME_SIZE) { - printf("cap_to_text buffer size reservation needs fixing (%ld > %d)\n", -- strlen(tmp), __CAP_NAME_SIZE); -+ (long int)strlen(tmp), __CAP_NAME_SIZE); - result = -1; - } - free(tmp); --- -2.34.1 - diff --git a/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch deleted file mode 100644 index 25f853b2a982..000000000000 --- a/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8dfcdcfdcb9c462a05566aa8d3c6eca871f0ddbf Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Wed, 10 Feb 2016 09:52:45 +0100 -Subject: [PATCH] ignore RAISE_SETFCAP install failures - -While the new RAISE_SETFCAP feature is nifty, its failure to run (often -due to the fs not supporting it) shouldn't impair the default install. - -Signed-off-by: Mike Frysinger <[email protected]> - -Forward ported from libcap-2.20 to libcap-2.25 - -Signed-off-by: Lars Wendler <[email protected]> ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -39,7 +39,7 @@ - install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ - done - ifeq ($(RAISE_SETFCAP),yes) -- $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap -+ -$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap - endif - - test: diff --git a/sys-libs/libcap/files/libcap-2.61-no_perl.patch b/sys-libs/libcap/files/libcap-2.61-no_perl.patch deleted file mode 100644 index 3d42a4dc6135..000000000000 --- a/sys-libs/libcap/files/libcap-2.61-no_perl.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Wed, 21 Nov 2018 11:00:54 +0100 -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 <[email protected]> - -Forward ported from libcap-2.22 to libcap-2.26 -and incorporated the gperf-3.1 fix provided by Mike Gilbert -<[email protected]> -Forward ported from libcap-2.26 to libcap-2.28 -Forward ported from libcap-2.28 to libcap-2.38 - -Signed-off-by: Lars Wendler <[email protected]> ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -20,6 +20,8 @@ - - # Always build libcap sources this way: - CFLAGS += -fPIC -+AWK = awk -+SED = sed - - # The linker magic needed to build a dynamic library as independently - # executable -@@ -82,8 +84,18 @@ - ./_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 *, size_t);\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) > $@ -- sed -e 's/unsigned int len/size_t len/' -i $@ -+ (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 \ -+ --hash-function-name=__cap_hash_name \ -+ --lookup-function-name="__cap_lookup_name" \ -+ -c -t -m20 $(INDENT) > $@ - - # Intention is that libcap keeps up with torvalds' tree, as reflected - # by this maintained version of the kernel header. libcap dynamically -@@ -92,7 +104,7 @@ - UAPI_HEADER := $(topdir)/libcap/include/uapi/linux/capability.h - cap_names.list.h: Makefile $(UAPI_HEADER) - @echo "=> making $@ from $(UAPI_HEADER)" -- 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"; } }' $(UAPI_HEADER) | fgrep -v 0x > $@ -+ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $(UAPI_HEADER) > $@ - - $(STACAPLIBNAME): $(CAPOBJS) - $(AR) rcs $@ $^ diff --git a/sys-libs/libcap/libcap-2.61.ebuild b/sys-libs/libcap/libcap-2.61.ebuild deleted file mode 100644 index ad5ca82adcb8..000000000000 --- a/sys-libs/libcap/libcap-2.61.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs pam usr-ldscript - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"; -else - SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"; - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://sites.google.com/site/fullycapable/"; - -# it's available under either of the licenses -LICENSE="|| ( GPL-2 BSD )" -SLOT="0" -IUSE="pam static-libs tools" - -# While the build system optionally uses gperf, we don't DEPEND on it because -# the build automatically falls back when it's unavailable. #604802 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" -BDEPEND=" - sys-apps/diffutils - tools? ( dev-lang/go )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.61-no_perl.patch - "${FILESDIR}"/${PN}-2.61-ignore-RAISE_SETFCAP-install-failures.patch - "${FILESDIR}"/${PN}-2.61-Wformat.patch -) - -QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS - -src_prepare() { - default - multilib_copy_sources -} - -run_emake() { - local args=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - OBJCOPY="$(tc-getOBJCOPY)" - RANLIB="$(tc-getRANLIB)" - exec_prefix="${EPREFIX}" - lib_prefix="${EPREFIX}/usr" - lib="$(get_libdir)" - prefix="${EPREFIX}/usr" - PAM_CAP="$(usex pam yes no)" - DYNAMIC=yes - GOLANG="$(multilib_native_usex tools yes no)" - ) - emake "${args[@]}" "$@" -} - -src_configure() { - tc-export_build_env BUILD_CC - multilib-minimal_src_configure -} - -multilib_src_compile() { - run_emake -} - -multilib_src_test() { - run_emake test -} - -multilib_src_install() { - # no configure, needs explicit install line #444724#c3 - run_emake DESTDIR="${D}" install - - gen_usr_ldscript -a cap - gen_usr_ldscript -a psx - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die - fi - - # install pam plugins ourselves - rm -rf "${ED}"/usr/$(get_libdir)/security || die - - if 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 -}
