projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 179f3ec0 AB |
1 | From 1f8d32942be54850a3a89c7b58ba5613b5525c58 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Andrew G. Morgan" <morgan@kernel.org> | |
| 3 | Date: Fri, 28 May 2021 13:41:17 -0700 | |
| 4 | Subject: [PATCH] Make capsh an installed binary again | |
| 5 | ||
| 6 | Bug report from Jan Palus: | |
| 7 | ||
| 8 | https://bugzilla.kernel.org/show_bug.cgi?id=213261 | |
| 9 | ||
| 10 | Signed-off-by: Andrew G. Morgan <morgan@kernel.org> | |
| 11 | --- | |
| 12 | progs/Makefile | 4 ++-- | |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 14 | ||
| 15 | diff --git a/progs/Makefile b/progs/Makefile | |
| 16 | index 313dc4d..3c3dc97 100644 | |
| 17 | --- a/progs/Makefile | |
| 18 | +++ b/progs/Makefile | |
| 19 | @@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS) | |
| 20 | ||
| 21 | install: all | |
| 22 | mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) | |
| 23 | - for p in $(PROGS) ; do \ | |
| 24 | + for p in $(PROGS) capsh ; do \ | |
| 25 | install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ | |
| 26 | done | |
| 27 | ifeq ($(RAISE_SETFCAP),yes) | |
| 28 | $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap | |
| 29 | endif | |
| 30 | ||
| 31 | -test: $(PROGS) | |
| 32 | +test: $(PROGS) capsh | |
| 33 | ||
| 34 | capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh | |
| 35 | ./mkcapshdoc.sh > $@ | |
| 36 | -- | |
| 37 | 2.32.0.rc2 | |
| 38 |