Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10933 from neheb/cap

Browse source 
libcap: Update to 2.30
This commit is contained in:
Rosen Penev 2020-01-08 16:11:31 -08:00 committed by GitHub
commit 4cfd1edebe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/libcap/Makefile
View file

@ -8,18 +8,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libcap PKG_NAME:=libcap
PKG_VERSION:=2.27 PKG_VERSION:=2.30
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2 PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
PKG_HASH:=dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a PKG_HASH:=a287bae0b0d95e5230a1c4177b835c70774511b631f87c7bd29e91a03e027f11
PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at> PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=License PKG_LICENSE_FILES:=License
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
@ -69,6 +70,7 @@ MAKE_FLAGS += \
LD="$(TARGET_CC) -Wl,-x -shared" \ LD="$(TARGET_CC) -Wl,-x -shared" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
INDENT="| true" \ INDENT="| true" \
GOLANG="no" \
PAM_CAP="no" \ PAM_CAP="no" \
RAISE_SETFCAP="no" \ RAISE_SETFCAP="no" \
DYNAMIC="yes" \ DYNAMIC="yes" \

6
libs/libcap/patches/100-portability.patch
View file

@ -1,14 +1,14 @@
--- a/libcap/_makenames.c --- a/libcap/_makenames.c
+++ b/libcap/_makenames.c +++ b/libcap/_makenames.c
@@ -7,7 +7,6 @@ @@ -8,7 +8,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
-#include <sys/capability.h> -#include <sys/capability.h>
/* /*
* #include 'sed' generated array * #include 'sed' generated array
@@ -22,7 +21,7 @@ struct { @@ -23,7 +22,7 @@ struct {
}; };
/* this should be more than big enough (factor of three at least) */ /* this should be more than big enough (factor of three at least) */

8
libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch
View file

@ -1,8 +1,8 @@
--- a/progs/capsh.c --- a/progs/capsh.c
+++ b/progs/capsh.c +++ b/progs/capsh.c
@@ -24,6 +24,9 @@ @@ -25,6 +25,9 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/prctl.h> #include <unistd.h>
+#ifndef SHELL +#ifndef SHELL
+#define SHELL "/bin/sh" +#define SHELL "/bin/sh"
@ -10,7 +10,7 @@
#define MAX_GROUPS 100 /* max number of supplementary groups for user */ #define MAX_GROUPS 100 /* max number of supplementary groups for user */
static char *binary(unsigned long value) static char *binary(unsigned long value)
@@ -692,10 +695,10 @@ int main(int argc, char *argv[], char *envp[]) @@ -756,10 +759,10 @@ int main(int argc, char *argv[], char *envp[])
} else if (!strcmp("--print", argv[i])) { } else if (!strcmp("--print", argv[i])) {
arg_print(); arg_print();
} else if ((!strcmp("--", argv[i])) || (!strcmp("==", argv[i]))) { } else if ((!strcmp("--", argv[i])) || (!strcmp("==", argv[i]))) {
@ -23,7 +23,7 @@
exit(1); exit(1);
} else { } else {
usage: usage:
@@ -720,7 +723,7 @@ int main(int argc, char *argv[], char *envp[]) @@ -789,7 +792,7 @@ int main(int argc, char *argv[], char *envp[])
" --killit=<n> send signal(n) to child\n" " --killit=<n> send signal(n) to child\n"
" --forkfor=<n> fork and make child sleep for <n> sec\n" " --forkfor=<n> fork and make child sleep for <n> sec\n"
" == re-exec(capsh) with args as for --\n" " == re-exec(capsh) with args as for --\n"