aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/libcap/Makefile4
-rw-r--r--libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch8
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/libcap/Makefile b/libs/libcap/Makefile
index f3af9d856..646db5b28 100644
--- a/libs/libcap/Makefile
+++ b/libs/libcap/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libcap
-PKG_VERSION:=2.31
+PKG_VERSION:=2.32
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
-PKG_HASH:=c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46
+PKG_HASH:=1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be
PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
PKG_LICENSE:=GPL-2.0-only
diff --git a/libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch b/libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch
index 59b766f60..c389d8a43 100644
--- a/libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch
+++ b/libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch
@@ -10,7 +10,7 @@
#define MAX_GROUPS 100 /* max number of supplementary groups for user */
static char *binary(unsigned long value)
-@@ -756,10 +759,10 @@ int main(int argc, char *argv[], char *envp[])
+@@ -768,10 +771,10 @@ int main(int argc, char *argv[], char *envp[])
} else if (!strcmp("--print", argv[i])) {
arg_print();
} else if ((!strcmp("--", argv[i])) || (!strcmp("==", argv[i]))) {
@@ -21,9 +21,9 @@
- fprintf(stderr, "execve /bin/bash failed!\n");
+ fprintf(stderr, "execve " SHELL " failed!\n");
exit(1);
- } else {
- usage:
-@@ -789,7 +792,7 @@ int main(int argc, char *argv[], char *envp[])
+ } else if (!strncmp("--has-p=", argv[i], 8)) {
+ cap_value_t cap;
+@@ -869,7 +872,7 @@ int main(int argc, char *argv[], char *envp[])
" --killit=<n> send signal(n) to child\n"
" --forkfor=<n> fork and make child sleep for <n> sec\n"
" == re-exec(capsh) with args as for --\n"