Merge pull request #12427 from neheb/libcc

libcap: update to 2.34

libs/libcap/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcap
-PKG_VERSION:=2.33
-PKG_RELEASE:=2
+PKG_VERSION:=2.34
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
-PKG_HASH:=08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6
+PKG_HASH:=aecdd42015955068d3d94b7caa9590fcb2de5df53ce53c61a21b912bfc0b1611
 
 PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
 PKG_LICENSE:=GPL-2.0-only
@@ -89,11 +89,11 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/lib/libcap.{so*,a} $(1)/usr/lib/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/libpsx.a $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libcap.pc $(1)/usr/lib/pkgconfig/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/pkgconfig/libcap.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,exec_prefix=,exec_prefix=/usr,g' $(1)/usr/lib/pkgconfig/libcap.pc
 	$(SED) 's,/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libcap.pc
 	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libcap.pc
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpsx.pc $(1)/usr/lib/pkgconfig/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/pkgconfig/libpsx.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,exec_prefix=,exec_prefix=/usr,g' $(1)/usr/lib/pkgconfig/libpsx.pc
 	$(SED) 's,/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libpsx.pc
 	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libpsx.pc

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

@@ -1,34 +0,0 @@
---- a/progs/capsh.c
-+++ b/progs/capsh.c
-@@ -25,6 +25,9 @@
- #include <sys/wait.h>
- #include <unistd.h>
- 
-+#ifndef SHELL
-+#define SHELL "/bin/sh"
-+#endif
- #define MAX_GROUPS       100   /* max number of supplementary groups for user */
- 
- static char *binary(unsigned long value)
-@@ -775,10 +778,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]))) {
--	    argv[i] = strdup(argv[i][0] == '-' ? "/bin/bash" : argv[0]);
-+	    argv[i] = strdup(argv[i][0] == '-' ? SHELL : argv[0]);
- 	    argv[argc] = NULL;
- 	    execve(argv[i], argv+i, envp);
--	    fprintf(stderr, "execve /bin/bash failed!\n");
-+	    fprintf(stderr, "execve " SHELL " failed!\n");
- 	    exit(1);
- 	} else if (!strncmp("--has-p=", argv[i], 8)) {
- 	    cap_value_t cap;
-@@ -888,7 +891,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"
--		   "  --             remaing arguments are for /bin/bash\n"
-+		   "  --             remaing arguments are for " SHELL "\n"
- 		   "                 (without -- [%s] will simply exit(0))\n",
- 		   argv[0], argv[0]);
-