From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 12 Jun 2020 03:37:54 +0000 (-0700)
Subject: libcap: update to 2.36
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F12511%2Fhead;p=feed%2Fpackages.git

libcap: update to 2.36

Remove outdated patches. A different solution was applied upstream.

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

diff --git a/libs/libcap/Makefile b/libs/libcap/Makefile
index 28afc25bcc..33483e9353 100644
--- a/libs/libcap/Makefile
+++ b/libs/libcap/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcap
-PKG_VERSION:=2.34
+PKG_VERSION:=2.36
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
-PKG_HASH:=aecdd42015955068d3d94b7caa9590fcb2de5df53ce53c61a21b912bfc0b1611
+PKG_HASH:=5048c849bdbbe24d2ca59463142cb279abec5edf3ab6731ab35a596bcf538a49
 
 PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
 PKG_LICENSE:=GPL-2.0-only
diff --git a/libs/libcap/patches/100-portability.patch b/libs/libcap/patches/100-portability.patch
deleted file mode 100644
index 19d28d1563..0000000000
--- a/libs/libcap/patches/100-portability.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libcap/_makenames.c
-+++ b/libcap/_makenames.c
-@@ -8,7 +8,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/capability.h>
- 
- /*
-  * #include 'sed' generated array
-@@ -23,7 +22,7 @@ struct {
- };
- 
- /* this should be more than big enough (factor of three at least) */
--const char *pointers[8*sizeof(struct __user_cap_data_struct)];
-+const char *pointers[8*12];
- 
- int main(void)
- {