From 523e9e5df8dc141cb92ff254e63b844ace8e7486 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 8 May 2026 18:24:59 +0100
Subject: [PATCH] libp11: update to 0.4.18

Changes since 0.4.16:

0.4.18 (2026-02-16):
 * Support for RSA-PSS and RSA-OAEP using keys retrieved using the
   PKCS11_get_private_key() libp11 API and the PKCS#11 provider.
 * Improved test coverage.

0.4.17 (2026-02-01):
 * Ed25519 and Ed448 support (PKCS#11 v3.2).
 * Fixed OPENSSL_NO_EC builds.
 * Reverted RSA public exponent change from PR #474.
 * Fixed crash on module initialization failures.
 * Ignoring trailing newlines in pin-source files.
 * Initial build fixes for the upcoming OpenSSL 4.x.

Drop the now obsolete 001-fix-install.patch which has been merged
upstream.

Link: https://github.com/OpenSC/libp11/blob/libp11-0.4.18/NEWS
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 libs/libp11/Makefile                      |  4 +-
 libs/libp11/patches/001-fix-install.patch | 62 -----------------------
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 libs/libp11/patches/001-fix-install.patch

diff --git a/libs/libp11/Makefile b/libs/libp11/Makefile
index 5aa0952258..a9db65a73e 100644
--- a/libs/libp11/Makefile
+++ b/libs/libp11/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libp11
-PKG_VERSION:=0.4.16
+PKG_VERSION:=0.4.18
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=97777640492fa9e5831497e5892e291dfbf39a7b119d9cb6abb3ec8c56d17553
+PKG_HASH:=9292de67ca73aba1deacf577c9086b595765f36ef47712cfeb49fa31f6e772fb
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=LGPL-2.1-or-later
diff --git a/libs/libp11/patches/001-fix-install.patch b/libs/libp11/patches/001-fix-install.patch
deleted file mode 100644
index 315f589966..0000000000
--- a/libs/libp11/patches/001-fix-install.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -66,16 +66,6 @@ libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS
- libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD)
- endif
- 
--# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
--check-local: $(LTLIBRARIES)
--	cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
--
--install-exec-hook:
--	cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
--if LIBP11_OSSL_PROVIDER
--	cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
--endif
--
- if WIN32
- # def file required for MS users to build library
- mylibdir=$(libdir)
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1057,7 +1057,7 @@ distdir-am: $(DISTFILES)
- 	  fi; \
- 	done
- check-am: all-am
--	$(MAKE) $(AM_MAKEFLAGS) check-local
-+	$(MAKE) $(AM_MAKEFLAGS)
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
- install-enginesexecLTLIBRARIES: install-libLTLIBRARIES
-@@ -1158,7 +1158,7 @@ install-dvi-am:
- install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES \
- 	install-providersexecLTLIBRARIES
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-+	$(MAKE) $(AM_MAKEFLAGS)
- install-html: install-html-am
- 
- install-html-am:
-@@ -1228,7 +1228,7 @@ uninstall-am: uninstall-enginesexecLTLIB
- .MAKE: all check-am install-am install-exec-am install-strip
- 
- .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
--	check-local clean clean-enginesexecLTLIBRARIES clean-generic \
-+	clean clean-enginesexecLTLIBRARIES clean-generic \
- 	clean-libLTLIBRARIES clean-libtool \
- 	clean-providersexecLTLIBRARIES cscopelist-am ctags ctags-am \
- 	distclean distclean-compile distclean-generic distclean-hdr \
-@@ -1253,13 +1253,6 @@ uninstall-am: uninstall-enginesexecLTLIB
- 
- 	$(srcdir)/config.h.in $(srcdir)/config.h.in~
- 
--# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
--check-local: $(LTLIBRARIES)
--	cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
--
--install-exec-hook:
--	cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
--@LIBP11_OSSL_PROVIDER_TRUE@	cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
- @WIN32_TRUE@.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def:	libp11.la
- .rc.lo:
- 	$(LTRCCOMPILE) -i "$<" -o "$@"