sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libcap: Update from 2.33 to 2.34

Browse Source
This commit is contained in:
Fredrik Fornwall 2020-05-11 10:16:43 +02:00
parent 9115c8388f
commit 7084af1ce7
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/libcap/build.sh
View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://sites.google.com/site/fullycapable/
TERMUX_PKG_DESCRIPTION="POSIX 1003.1e capabilities"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=2.33
TERMUX_PKG_VERSION=2.34
TERMUX_PKG_SRCURL=https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6
TERMUX_PKG_SHA256=aecdd42015955068d3d94b7caa9590fcb2de5df53ce53c61a21b912bfc0b1611
TERMUX_PKG_DEPENDS="attr"
TERMUX_PKG_BREAKS="libcap-dev"
TERMUX_PKG_REPLACES="libcap-dev"

12
packages/libcap/progs-capsh.c.patch Normal file
View File

@ -0,0 +1,12 @@
diff -u -r ../libcap-2.34/progs/capsh.c ./progs/capsh.c
--- ../libcap-2.34/progs/capsh.c 2020-05-02 22:47:28.000000000 +0000
+++ ./progs/capsh.c 2020-05-11 08:14:15.943279000 +0000
@@ -26,7 +26,7 @@
#include <unistd.h>
#ifndef SHELL
-#define SHELL "/bin/bash"
+#define SHELL "@TERMUX_PREFIX@/bin/bash"
#endif /* ndef SHELL */
#define MAX_GROUPS 100 /* max number of supplementary groups for user */

25
packages/libcap/progs-capsh.patch
View File

@ -1,25 +0,0 @@
diff -uNr libcap-2.26/progs/capsh.c libcap-2.26.mod/progs/capsh.c
--- libcap-2.26/progs/capsh.c 2018-09-08 23:07:52.000000000 +0300
+++ libcap-2.26.mod/progs/capsh.c 2019-03-05 19:42:47.917246690 +0200
@@ -692,10 +692,10 @@
} else if (!strcmp("--print", argv[i])) {
arg_print();
} else if ((!strcmp("--", argv[i])) || (!strcmp("==", argv[i]))) {
- argv[i] = strdup(argv[i][0] == '-' ? "/bin/bash" : argv[0]);
+ argv[i] = strdup(argv[i][0] == '-' ? "@TERMUX_PREFIX@/bin/bash" : argv[0]);
argv[argc] = NULL;
execve(argv[i], argv+i, envp);
- fprintf(stderr, "execve /bin/bash failed!\n");
+ fprintf(stderr, "execve @TERMUX_PREFIX@/bin/bash failed!\n");
exit(1);
} else {
usage:
@@ -720,7 +720,7 @@
" --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"
- " -- remaing arguments are for /bin/bash\n"
+ " -- remaing arguments are for $PREFIX/bin/bash\n"
" (without -- [%s] will simply exit(0))\n",
argv[0], argv[0]);