commit: e4d012e535d80dcfd8c0135ff538764586fe8af8 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun May 30 10:54:09 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun May 30 10:54:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d012e5
sys-libs/libcap: Revbump to install capsh binary again Closes: https://bugs.gentoo.org/793026 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../files/libcap-2.50-install_capsh_again.patch | 38 ++++++++++++++++++++++ .../{libcap-2.50.ebuild => libcap-2.50-r1.ebuild} | 1 + 2 files changed, 39 insertions(+) diff --git a/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch b/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch new file mode 100644 index 00000000000..0ae7520dc7b --- /dev/null +++ b/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch @@ -0,0 +1,38 @@ +From 1f8d32942be54850a3a89c7b58ba5613b5525c58 Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" <mor...@kernel.org> +Date: Fri, 28 May 2021 13:41:17 -0700 +Subject: [PATCH] Make capsh an installed binary again + +Bug report from Jan Palus: + + https://bugzilla.kernel.org/show_bug.cgi?id=213261 + +Signed-off-by: Andrew G. Morgan <mor...@kernel.org> +--- + progs/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/progs/Makefile b/progs/Makefile +index 313dc4d..3c3dc97 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS) + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) +- for p in $(PROGS) ; do \ ++ for p in $(PROGS) capsh ; do \ + install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ + done + ifeq ($(RAISE_SETFCAP),yes) + $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap + endif + +-test: $(PROGS) ++test: $(PROGS) capsh + + capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh + ./mkcapshdoc.sh > $@ +-- +2.32.0.rc2 + diff --git a/sys-libs/libcap/libcap-2.50.ebuild b/sys-libs/libcap/libcap-2.50-r1.ebuild similarity index 97% rename from sys-libs/libcap/libcap-2.50.ebuild rename to sys-libs/libcap/libcap-2.50-r1.ebuild index 20f0382faa4..2745eb56bf9 100644 --- a/sys-libs/libcap/libcap-2.50.ebuild +++ b/sys-libs/libcap/libcap-2.50-r1.ebuild @@ -28,6 +28,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-2.50-build-system-fixes.patch + "${FILESDIR}"/${PN}-2.50-install_capsh_again.patch #793026 "${FILESDIR}"/${PN}-2.38-no_perl.patch "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch "${FILESDIR}"/${PN}-2.21-include.patch
