Browse Source

Merge pull request #11396 from neheb/cap2

libcap: update to 2.32
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
5ce1cd82d8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
  1. +2
    -2
      libs/libcap/Makefile
  2. +4
    -4
      libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch

+ 2
- 2
libs/libcap/Makefile View File

@ -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


+ 4
- 4
libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch View File

@ -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"


Loading…
Cancel
Save