From 0d88de194ab3376bec089b95a39e6aa5241877a7 Mon Sep 17 00:00:00 2001
From: Denis OSTERLAND-HEIM <denis.osterland@diehl.com>
Date: Thu, 10 Jul 2025 12:38:01 +0200
Subject: [PATCH] libp11: version bump 0.4.13 -> 0.4.16

This version comes with a pkcs11 provider called 'pkcs11prov'.
Configure modules directory for native build for the provider.
Install provider to target.

Signed-off-by: Denis OSTERLAND-HEIM <denis.osterland@diehl.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../{libp11_0.4.13.bb => libp11_0.4.16.bb}      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.4.13.bb => libp11_0.4.16.bb} (60%)

diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.13.bb b/meta-oe/recipes-support/libp11/libp11_0.4.16.bb
similarity index 60%
rename from meta-oe/recipes-support/libp11/libp11_0.4.13.bb
rename to meta-oe/recipes-support/libp11/libp11_0.4.16.bb
index 807d079a05..2bd589be8a 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.16.bb
@@ -11,7 +11,7 @@ DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https"
 
-SRCREV = "6d669183c7b241ce47ecce28744837ad92814f5c"
+SRCREV = "b9c2de288833e38a391ee3cb106f965a40153629"
 
 UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
 
@@ -19,13 +19,22 @@ UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-static"
-EXTRA_OECONF:append:class-native = " --with-enginesdir=${RECIPE_SYSROOT_NATIVE}/usr/lib/engines-3"
+EXTRA_OECONF:append:class-native = "\
+    --with-enginesdir=${RECIPE_SYSROOT_NATIVE}/usr/lib/engines-3 \
+    --with-modulesdir=${RECIPE_SYSROOT_NATIVE}/usr/lib/ossl-modules \
+"
 
 do_install:append () {
     rm -rf ${D}${docdir}/${BPN}
 }
 
-FILES:${PN} += "${libdir}/engines*/pkcs11.so"
-FILES:${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}"
+FILES:${PN} += "\
+    ${libdir}/engines*/pkcs11.so \
+    ${libdir}/ossl-modules/pkcs11prov.so \
+"
+FILES:${PN}-dev += "\
+    ${libdir}/engines*/libpkcs11${SOLIBSDEV} \
+    ${libdir}/ossl-modules/libpkcs11${SOLIBSDEV} \
+"
 
 BBCLASSEXTEND = "native"