diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-support/libp11/libp11_0.4.12.bb | 5 |
2 files changed, 32 insertions, 1 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 new file mode 100644 index 000000000..aa61e9d97 --- /dev/null +++ b/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mike Gilbert <floppym@gentoo.org> | ||
3 | Date: Thu, 13 Jul 2023 13:52:54 -0400 | ||
4 | Subject: [PATCH] configure: treat all openssl-3.x releases the same | ||
5 | |||
6 | OpenSSL's soversion will not change for any 3.x minor release. | ||
7 | |||
8 | https://www.openssl.org/policies/general/versioning-policy.html | ||
9 | --- | ||
10 | configure.ac | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | Upstream-Status: Backport [https://github.com/OpenSC/libp11/commit/74497e0fa5b69b15790d6697e1ebce13af842d4c.patch] | ||
14 | Signed-off-by: Sana Kazi <sanakazi720@gmail.com> | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 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.12.bb index 223778200..cc4a138e2 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb +++ b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb | |||
@@ -9,7 +9,10 @@ LICENSE = "LGPL-2.0-or-later" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" |
10 | DEPENDS = "libtool openssl" | 10 | DEPENDS = "libtool openssl" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https \ |
13 | file://0001-detect-correct-openssl-3.x.patch \ | ||
14 | " | ||
15 | |||
13 | SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" | 16 | SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" |
14 | 17 | ||
15 | UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" |