summaryrefslogtreecommitdiff
blob: 0ae7520dc7b972dc82c43712b30c2effb39e5d35 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 1f8d32942be54850a3a89c7b58ba5613b5525c58 Mon Sep 17 00:00:00 2001
From: "Andrew G. Morgan" <morgan@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 <morgan@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