Merge pull request #10030 from neheb/p1123

p11-kit: Update to 0.23.17

diff --git a/libs/p11-kit/Makefile b/libs/p11-kit/Makefile
index ef48b76a9ef8be4df5a548e9047d3b332e886345..e829f0e6a93e17aa614e89ad6757c77fd43f2ec8 100644 (file)
--- a/libs/p11-kit/Makefile
+++ b/libs/p11-kit/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p11-kit
-PKG_VERSION:=0.23.16.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.23.17
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/p11-glue/p11-kit/releases/download/$(PKG_VERSION)
-PKG_HASH:=4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d
+PKG_HASH:=5447b25d66c05f86cce5bc8856f7a074be84c186730e32c74069ca03386d7c1e
 
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/libs/p11-kit/patches/010-uclibc.patch b/libs/p11-kit/patches/010-uclibc.patch
deleted file mode 100644 (file)
index 642fdb4..0000000
--- a/libs/p11-kit/patches/010-uclibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/common/compat.c
-+++ b/common/compat.c
-@@ -97,8 +97,12 @@
- #include <unistd.h>
- 
- #if defined (HAVE_PROGRAM_INVOCATION_SHORT_NAME) && !HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
-+#ifdef __UCLIBC__
-+extern const char *program_invocation_short_name;
-+#else
- extern char *program_invocation_short_name;
- #endif
-+#endif
- 
- #if defined (HAVE___PROGNAME) && !HAVE_DECL___PROGNAME
- extern char *__progname;