summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2024-12-17 17:01:24 +0800
committerKhem Raj <raj.khem@gmail.com>2024-12-19 09:41:28 -0800
commitfc532e0db1ec64a1691e228913947431f260df3a (patch)
treee220a1cd34372a7d169b2e26709140d9fd75ce0e
parentbd8748209b4f0637a8f659e18039de49db3f4757 (diff)
downloadmeta-openembedded-fc532e0db1ec64a1691e228913947431f260df3a.tar.gz
libp11: update 0.4.12 -> 0.4.13
0001-detect-correct-openssl-3.x.patch removed since it's included in 0.4.13 Changelog: ========= - Increased maximum PIN length - Fixed several memory leaks - Don't include libp11.rc VERSIONINFO into pkcs11 - Reimplement CI with GitHub Actions - Improved tests - Added static ENGINE (libpkcas11.a) build - Added a workaround broken foreign key handling in OpenSSL 3.0.12-3.0.13, 3.1.4-3.1.5, 3.2.0-3.2.1 - Added a workaround for conflicting atexit() callbacks - Always login with PIN If FORCE_LOGIN is specified in openssl config - Added OAEP support to RSA_private_decrypt - Added PKCS11_enumerate_*_ext functions - Fixed non-null-terminated label padding - Fixed several object management issues - Deferred libp11 initialization until needed Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch28
-rw-r--r--meta-oe/recipes-support/libp11/libp11_0.4.13.bb (renamed from meta-oe/recipes-support/libp11/libp11_0.4.12.bb)6
2 files changed, 2 insertions, 32 deletions
diff --git a/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch b/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch
deleted file mode 100644
index aa61e9d979..0000000000
--- a/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001
2From: Mike Gilbert <floppym@gentoo.org>
3Date: Thu, 13 Jul 2023 13:52:54 -0400
4Subject: [PATCH] configure: treat all openssl-3.x releases the same
5
6OpenSSL's soversion will not change for any 3.x minor release.
7
8https://www.openssl.org/policies/general/versioning-policy.html
9---
10 configure.ac | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13Upstream-Status: Backport [https://github.com/OpenSC/libp11/commit/74497e0fa5b69b15790d6697e1ebce13af842d4c.patch]
14Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
15
16diff --git a/configure.ac b/configure.ac
17index b96979d9..c344e84a 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -33,7 +33,7 @@ AC_C_BIGENDIAN
21 # issues with applications linking to new openssl, old libp11, and vice versa
22 case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
23 $PKG_CONFIG --modversion openssl`" in
24- 3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
25+ 3.*) # Predicted engines directory prefix for OpenSSL 3.x
26 LIBP11_LT_OLDEST="3"
27 debian_ssl_prefix="openssl-3.0.0";;
28 1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb b/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
index cc4a138e2d..74c70df180 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
@@ -9,11 +9,9 @@ LICENSE = "LGPL-2.0-or-later"
9LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" 9LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
10DEPENDS = "libtool openssl" 10DEPENDS = "libtool openssl"
11 11
12SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https \ 12SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https"
13 file://0001-detect-correct-openssl-3.x.patch \
14"
15 13
16SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" 14SRCREV = "6d669183c7b241ce47ecce28744837ad92814f5c"
17 15
18UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
19 17