From 6ef7d62a915981a40822f0c18b9c42be42950de0 Mon Sep 17 00:00:00 2001 From: Ayoub Zaki Date: Fri, 14 Feb 2025 12:05:43 +0100 Subject: pkcs11-provider: Upgrade 0.6 -> 1.0 https://github.com/latchset/pkcs11-provider/releases/tag/v1.0 https://github.com/latchset/pkcs11-provider/compare/v0.6...v1.0 Signed-off-by: Ayoub Zaki Signed-off-by: Khem Raj --- ...ption-to-allow-override-default-default_p.patch | 53 ---------------------- .../pkcs11-provider/pkcs11-provider_0.6.bb | 31 ------------- .../pkcs11-provider/pkcs11-provider_1.0.bb | 29 ++++++++++++ 3 files changed, 29 insertions(+), 84 deletions(-) delete mode 100644 meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-meson-add-option-to-allow-override-default-default_p.patch delete mode 100644 meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.6.bb create mode 100644 meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-meson-add-option-to-allow-override-default-default_p.patch b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-meson-add-option-to-allow-override-default-default_p.patch deleted file mode 100644 index 5181862f0c..0000000000 --- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-meson-add-option-to-allow-override-default-default_p.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5031b867f5406f14b23ed01f4d68bc9acb073491 Mon Sep 17 00:00:00 2001 -From: Ayoub Zaki -Date: Wed, 22 Jan 2025 13:36:36 +0100 -Subject: [PATCH] meson: add option to allow override default - default_pkcs11_module - -Upstream-Status: Submitted [https://github.com/latchset/pkcs11-provider/pull/511] -Signed-off-by: Ayoub Zaki ---- - meson.build | 11 ++++++++--- - meson_options.txt | 6 ++++++ - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index b3912cb..e7cf2d3 100644 ---- a/meson.build -+++ b/meson.build -@@ -67,10 +67,15 @@ if host_machine.endian() == 'big' - endif - - p11_kit = dependency('p11-kit-1', required: false) --if p11_kit.found() -- default_pkcs11_module = p11_kit.get_variable(pkgconfig: 'proxy_module') -- conf.set_quoted('DEFAULT_PKCS11_MODULE', default_pkcs11_module) -+default_pkcs11_module = get_option('default_pkcs11_module') -+if default_pkcs11_module == 'no' -+ if p11_kit.found() -+ default_pkcs11_module = p11_kit.get_variable(pkgconfig: 'proxy_module') -+ else -+ error('default_pkcs11_module is empty') -+ endif - endif -+conf.set_quoted('DEFAULT_PKCS11_MODULE', default_pkcs11_module) - - headers = [ - 'dlfcn.h', -diff --git a/meson_options.txt b/meson_options.txt -index 7e7b9be..1306639 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,9 @@ option('preload_libasan', - type: 'string', - value: 'no', - description: 'Path to libasan.so to preload') -+ -+ -+option('default_pkcs11_module', -+ type : 'string', -+ value : 'no', -+ description : 'Path to the default PKCS11 module') --- -2.43.0 - diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.6.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.6.bb deleted file mode 100644 index 1644335415..0000000000 --- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.6.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" -DESCRIPTION = "\ -This is an Openssl 3.x provider to access Hardware or Software Tokens using \ -the PKCS#11 Cryptographic Token Interface\ -\ -This code targets version 3.1 of the interface but should be backwards \ -compatible to previous versions as well.\ -" -HOMEPAGE = "https://github.com/latchset/pkcs11-provider" -SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" -DEPENDS = "\ - openssl \ - p11-kit \ -" - -SRCREV = "93bd41c505cf54dc1ecef6c963df347b9f4abf6d" - -SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https \ - file://0001-meson-add-option-to-allow-override-default-default_p.patch \ -" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig - -# Overwrite default pkcs11 module path -#EXTRA_OEMESON += "-Ddefault_pkcs11_module=/path/to/mymodule.so" - -FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb new file mode 100644 index 0000000000..18a156286d --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "\ + openssl \ + p11-kit \ +" + +SRCREV = "8f6b94409d4872265076df310492da1e5f6abdf7" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +# Overwrite default pkcs11 module path +#EXTRA_OEMESON += "-Ddefault_pkcs11_module=/path/to/mymodule.so" + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" -- cgit v1.2.3-54-g00ecf