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 @@ -From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 13 Jul 2023 13:52:54 -0400 -Subject: [PATCH] configure: treat all openssl-3.x releases the same - -OpenSSL's soversion will not change for any 3.x minor release. - -https://www.openssl.org/policies/general/versioning-policy.html ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-Status: Backport [https://github.com/OpenSC/libp11/commit/74497e0fa5b69b15790d6697e1ebce13af842d4c.patch] -Signed-off-by: Sana Kazi - -diff --git a/configure.ac b/configure.ac -index b96979d9..c344e84a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,7 +33,7 @@ AC_C_BIGENDIAN - # issues with applications linking to new openssl, old libp11, and vice versa - case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \ - $PKG_CONFIG --modversion openssl`" in -- 3.0.*) # Predicted engines directory prefix for OpenSSL 3.x -+ 3.*) # Predicted engines directory prefix for OpenSSL 3.x - LIBP11_LT_OLDEST="3" - debian_ssl_prefix="openssl-3.0.0";; - 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 similarity index 87% rename from meta-oe/recipes-support/libp11/libp11_0.4.12.bb rename to 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" LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" -SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https \ - file://0001-detect-correct-openssl-3.x.patch \ -" +SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" -SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" +SRCREV = "6d669183c7b241ce47ecce28744837ad92814f5c" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P\d+(\.\d+)+)"