| 1 |
commit: e4d012e535d80dcfd8c0135ff538764586fe8af8 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 30 10:54:09 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 30 10:54:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d012e5 |
| 7 |
|
| 8 |
sys-libs/libcap: Revbump to install capsh binary again |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/793026 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/libcap-2.50-install_capsh_again.patch | 38 ++++++++++++++++++++++ |
| 14 |
.../{libcap-2.50.ebuild => libcap-2.50-r1.ebuild} | 1 + |
| 15 |
2 files changed, 39 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..0ae7520dc7b |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch |
| 22 |
@@ -0,0 +1,38 @@ |
| 23 |
+From 1f8d32942be54850a3a89c7b58ba5613b5525c58 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: "Andrew G. Morgan" <morgan@××××××.org> |
| 25 |
+Date: Fri, 28 May 2021 13:41:17 -0700 |
| 26 |
+Subject: [PATCH] Make capsh an installed binary again |
| 27 |
+ |
| 28 |
+Bug report from Jan Palus: |
| 29 |
+ |
| 30 |
+ https://bugzilla.kernel.org/show_bug.cgi?id=213261 |
| 31 |
+ |
| 32 |
+Signed-off-by: Andrew G. Morgan <morgan@××××××.org> |
| 33 |
+--- |
| 34 |
+ progs/Makefile | 4 ++-- |
| 35 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/progs/Makefile b/progs/Makefile |
| 38 |
+index 313dc4d..3c3dc97 100644 |
| 39 |
+--- a/progs/Makefile |
| 40 |
++++ b/progs/Makefile |
| 41 |
+@@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS) |
| 42 |
+ |
| 43 |
+ install: all |
| 44 |
+ mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) |
| 45 |
+- for p in $(PROGS) ; do \ |
| 46 |
++ for p in $(PROGS) capsh ; do \ |
| 47 |
+ install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ |
| 48 |
+ done |
| 49 |
+ ifeq ($(RAISE_SETFCAP),yes) |
| 50 |
+ $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap |
| 51 |
+ endif |
| 52 |
+ |
| 53 |
+-test: $(PROGS) |
| 54 |
++test: $(PROGS) capsh |
| 55 |
+ |
| 56 |
+ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh |
| 57 |
+ ./mkcapshdoc.sh > $@ |
| 58 |
+-- |
| 59 |
+2.32.0.rc2 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/sys-libs/libcap/libcap-2.50.ebuild b/sys-libs/libcap/libcap-2.50-r1.ebuild |
| 63 |
similarity index 97% |
| 64 |
rename from sys-libs/libcap/libcap-2.50.ebuild |
| 65 |
rename to sys-libs/libcap/libcap-2.50-r1.ebuild |
| 66 |
index 20f0382faa4..2745eb56bf9 100644 |
| 67 |
--- a/sys-libs/libcap/libcap-2.50.ebuild |
| 68 |
+++ b/sys-libs/libcap/libcap-2.50-r1.ebuild |
| 69 |
@@ -28,6 +28,7 @@ RESTRICT="test" |
| 70 |
|
| 71 |
PATCHES=( |
| 72 |
"${FILESDIR}"/${PN}-2.50-build-system-fixes.patch |
| 73 |
+ "${FILESDIR}"/${PN}-2.50-install_capsh_again.patch #793026 |
| 74 |
"${FILESDIR}"/${PN}-2.38-no_perl.patch |
| 75 |
"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch |
| 76 |
"${FILESDIR}"/${PN}-2.21-include.patch |
Archives