libcap: Update to 2.26

Minor adjustments to Makefile.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/libcap/Makefile b/libs/libcap/Makefile
index 444ba1d95db02b7c8936b674972429caefbdc1b3..3126f6cc61dee51c4cfa9ce265f2700828961132 100644 (file)
--- a/libs/libcap/Makefile
+++ b/libs/libcap/Makefile
@@ -8,15 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcap
-PKG_VERSION:=2.25
-PKG_RELEASE:=2
+PKG_VERSION:=2.26
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
-PKG_HASH:=693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162
+PKG_HASH:=b630b7c484271b3ba867680d6a14b10a86cfa67247a14631b14c06731d5a458b
+
+PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=License
-PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
 
 PKG_INSTALL:=1
 
@@ -27,7 +28,7 @@ define Package/libcap
   TITLE:=Linux capabilities library
   SECTION:=libs
   CATEGORY:=Libraries
-  URL:=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
+  URL:=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
 endef
 
 define Package/libcap/config

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 c2156ad811757e7693b6ef0a8da6585e86c41adc..27865ff617b58efd81cf06151711e86f81d868ed 100644 (file)
--- a/libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch
+++ b/libs/libcap/patches/200-change-hardcoded-shell-to-sh.patch
@@ -9,10 +9,10 @@
 +#endif
  #define MAX_GROUPS       100   /* max number of supplementary groups for user */
  
- static const cap_value_t raise_setpcap[1] = { CAP_SETPCAP };
-@@ -557,10 +560,10 @@ int main(int argc, char *argv[], char *envp[])
-           }
-           printf("\n");
+ static char *binary(unsigned long value)
+@@ -692,10 +695,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]);
@@ -23,7 +23,7 @@
            exit(1);
        } else {
        usage:
-@@ -582,7 +585,7 @@ int main(int argc, char *argv[], char *envp[])
+@@ -720,7 +723,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"