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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 995DA158086 for ; Tue, 4 Jan 2022 11:21:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62B622BC01A; Tue, 4 Jan 2022 11:21:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 759E32BC01A for ; Tue, 4 Jan 2022 11:21:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42BC1342D7A for ; Tue, 4 Jan 2022 11:21:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C388239 for ; Tue, 4 Jan 2022 11:21:16 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1641295248.b7df2466d0b3dcdfc95886cc9a3005954c3f2c2e.soap@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/Manifest sys-libs/libcap/files/libcap-2.21-include.patch sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch sys-libs/libcap/files/libcap-2.38-no_perl.patch sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch sys-libs/libcap/libcap-2.49-r1.ebuild X-VCS-Directories: sys-libs/libcap/ sys-libs/libcap/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b7df2466d0b3dcdfc95886cc9a3005954c3f2c2e X-VCS-Branch: master Date: Tue, 4 Jan 2022 11:21:16 +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: 913f5b5f-7cdb-480e-9c4b-dca631e92f35 X-Archives-Hash: a91976b9136cda395dcb2d534b1b4428 commit: b7df2466d0b3dcdfc95886cc9a3005954c3f2c2e Author: David Seifert gentoo org> AuthorDate: Tue Jan 4 11:20:48 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Jan 4 11:20:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7df2466 sys-libs/libcap: drop 2.49-r1 Signed-off-by: David Seifert gentoo.org> sys-libs/libcap/Manifest | 1 - sys-libs/libcap/files/libcap-2.21-include.patch | 10 -- ....25-ignore-RAISE_SETFCAP-install-failures.patch | 24 --- sys-libs/libcap/files/libcap-2.38-no_perl.patch | 62 -------- .../files/libcap-2.48-build-system-fixes.patch | 175 --------------------- sys-libs/libcap/libcap-2.49-r1.ebuild | 87 ---------- 6 files changed, 359 deletions(-) diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 17b8bc94ee64..2f5d81e1e4b5 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -1,2 +1 @@ -DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 DIST libcap-2.62.tar.xz 174772 BLAKE2B e3c86a5b88b9be932802ec8612f79e5f04912bf3e66f673eae2add85362292f4737c544d21b9e5adfd1a7a33c073568301b6532cdf0ea6c8b834d895b84323f1 SHA512 61ac004920c5cd3382a5443db2eacfc2041b7a8c0814b27084c1d111125639fe3950dea4325d0f7fb6bfb0d5de114452c3a62230cc958edb05ffdb83b213f9b3 diff --git a/sys-libs/libcap/files/libcap-2.21-include.patch b/sys-libs/libcap/files/libcap-2.21-include.patch deleted file mode 100644 index 8ea6545659e3..000000000000 --- a/sys-libs/libcap/files/libcap-2.21-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libcap/libcap.h -+++ b/libcap/libcap.h -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include /* prctl() */ - - #ifndef __u8 - #define __u8 unsigned char diff --git a/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch deleted file mode 100644 index e5455cd1ebb6..000000000000 --- a/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8dfcdcfdcb9c462a05566aa8d3c6eca871f0ddbf Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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 - -Forward ported from libcap-2.20 to libcap-2.25 - -Signed-off-by: Lars Wendler ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -27,7 +27,7 @@ install: all - 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 - - clean: diff --git a/sys-libs/libcap/files/libcap-2.38-no_perl.patch b/sys-libs/libcap/files/libcap-2.38-no_perl.patch deleted file mode 100644 index 9104484d5770..000000000000 --- a/sys-libs/libcap/files/libcap-2.38-no_perl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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 - -Forward ported from libcap-2.22 to libcap-2.26 -and incorporated the gperf-3.1 fix provided by Mike Gilbert - -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 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -22,6 +22,8 @@ MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf - CFLAGS += -fPIC -+AWK = awk -+SED = sed - - all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME) - -@@ -55,17 +57,27 @@ 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 *, 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 --# trims the meaning of "all" capabilities down to that of the running --# kernel as of 2.30. - 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) > $@ -+ -+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 }' $< > $@ - - $(STACAPLIBNAME): $(CAPOBJS) - $(AR) rcs $@ $^ diff --git a/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch deleted file mode 100644 index b3986e19546c..000000000000 --- a/sys-libs/libcap/files/libcap-2.48-build-system-fixes.patch +++ /dev/null @@ -1,175 +0,0 @@ -From d0e5c20fda92fcc48109bce7055d5fad458579ca Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 4 Nov 2020 22:46:20 +0100 -Subject: [PATCH] build system fixes - -This touches up the homebrewed build system to work much better "out of the -box" for people. Specifically: - - allow toolchain vars to be set via environment - - CC / BUILD_CC / AR / RANLIB - - CFLAGS / CPPFLAGS / LDFLAGS - - split CPPFLAGS out of CFLAGS - - break -fPIC out of global CFLAGS and only use where needed - - use LDLIBS for libraries, not LDFLAGS - -Signed-off-by: Mike Frysinger - -Forward ported from libcap-2.24 to libcap-2.25 -Forward ported from libcap-2.25 to libcap-2.28 -Forward ported from libcap-2.28 to libcap-2.29 -Forward ported from libcap-2.29 to libcap-2.33 -Forward ported from libcap-2.33 to libcap-2.34 -Forward ported from libcap-2.34 to libcap-2.37 -Forward ported from libcap-2.37 to libcap-2.39 -Forward ported from libcap-2.39 to libcap-2.42 -Forward ported from libcap-2.42 to libcap-2.44 -Forward ported from libcap-2.44 to libcap-2.45 -Forward ported from libcap-2.45 to libcap-2.48 - -Signed-off-by: Lars Wendler ---- a/Make.Rules -+++ b/Make.Rules -@@ -52,7 +52,6 @@ GOMAJOR=0 - # Compilation specifics - - KERNEL_HEADERS := $(topdir)/libcap/include/uapi --IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - - CC := $(CROSS_COMPILE)gcc - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -@@ -60,7 +59,7 @@ COPTS ?= -O2 - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) - BUILD_COPTS ?= -O2 --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) -+BUILD_CFLAGS ?= $(CFLAGS) - AR := $(CROSS_COMPILE)ar - RANLIB := $(CROSS_COMPILE)ranlib - DEBUG = -g #-DDEBUG -@@ -76,10 +75,13 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS) - - BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - --SYSTEM_HEADERS = /usr/include -+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) $(DEBUG) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) - $(MAKE) -C go $@ - rm -f cap/go.sum - endif -- $(MAKE) -C tests $@ - $(MAKE) -C progs $@ - $(MAKE) -C doc $@ - $(MAKE) -C kdebug $@ ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -25,6 +25,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) - PSXOBJS=$(addsuffix .o, $(PSXFILES)) - MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) - MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) -+CFLAGS += -fPIC - - all: pcs $(STACAPLIBNAME) - ifeq ($(SHARED),yes) -@@ -66,7 +67,7 @@ libpsx.pc: libpsx.pc.in - $< >$@ - - _makenames: _makenames.c cap_names.list.h -- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -105,10 +106,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc - endif - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - cap_test: cap_test.c libcap.h - $(CC) $(CFLAGS) $(IPATH) $< -o $@ ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -3,6 +3,8 @@ - topdir=$(shell pwd)/.. - include ../Make.Rules - -+CFLAGS += -fPIC -+ - all: pam_cap.so - $(MAKE) testlink - -@@ -16,16 +18,16 @@ install: all - # written (and you know why it fails), email me and explain why. Thanks! - - pam_cap.so: pam_cap.o -- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) -+ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - test_pam_cap: test_pam_cap.c pam_cap.c - $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static - - testlink: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) - - test: pam_cap.so - make testlink ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) - $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) - make psx_test libcap_psx_test libcap_psx_launch_test - endif - -+CFLAGS += -fPIC -+ - install: all - - ifeq ($(DYNAMIC),yes) -@@ -62,13 +64,13 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged - run_libcap_launch_test: libcap_launch_test noop ../progs/tcapsh-static diff --git a/sys-libs/libcap/libcap-2.49-r1.ebuild b/sys-libs/libcap/libcap-2.49-r1.ebuild deleted file mode 100644 index 993d6f47b1c0..000000000000 --- a/sys-libs/libcap/libcap-2.49-r1.ebuild +++ /dev/null @@ -1,87 +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 - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://sites.google.com/site/fullycapable/" -SRC_URI="https://www.kernel.org/pub/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 ~riscv ~s390 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 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" -DEPEND="${PDEPEND} - sys-kernel/linux-headers" - -# Requires test suite being run as root (via sudo) -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.48-build-system-fixes.patch - "${FILESDIR}"/${PN}-2.38-no_perl.patch - "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch - "${FILESDIR}"/${PN}-2.21-include.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -run_emake() { - local args=( - exec_prefix="${EPREFIX}" - lib_prefix="${EPREFIX}/usr" - lib="$(get_libdir)" - prefix="${EPREFIX}/usr" - PAM_CAP="$(usex pam yes no)" - DYNAMIC=yes - GOLANG=no - CC="$(tc-getCC)" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - ) - emake "${args[@]}" "$@" -} - -src_configure() { - tc-export AR CC RANLIB - tc-export_build_env BUILD_CC - multilib-minimal_src_configure -} - -multilib_src_compile() { - run_emake -} - -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 - - if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then - rm -r "${ED}"/usr/$(get_libdir)/security || die - fi - - 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 -}