right and its also needed on master I believe since we have the same version for libp11 in master too. In that case please send it for master first after testing it once its merged in master then send a backport request for scarthgap.
On Sat, Oct 19, 2024 at 6:15 PM Peter Kjellerstedt <[email protected]> wrote: > > > -----Original Message----- > > From: [email protected] > > <[email protected]> On Behalf Of Khem Raj > > Sent: den 19 oktober 2024 18:17 > > To: [email protected] > > Cc: [email protected] > > Subject: Re: [oe] [meta-oe][scarthgap][PATCH] configure: treat all > > openssl-3.x releases the same > > The subject prefix should be "libp11" rather than "configure". > > //Peter > > > > > Thanks for fixing it. I would like to suggest couple of things > > > > 1. Use patch version number when its reworked and sent again v1, v2, v3 > > > > and in the trailer document changes between versions, it helps > > reviewers with context between two patch versions. > > eg. see > > https://www.kernel.org/doc/html/v4.14/process/submitting-patches.html#the-canonical-patch-format > > > > On Sat, Oct 19, 2024 at 9:10 AM Sana Kazi via lists.openembedded.org > > <[email protected]> wrote: > > > > > > OpenSSL's soversion will not change for any 3.x minor release. > > > > > > https://www.openssl.org/policies/general/versioning-policy.html > > > > > > Signed-off-by: Sana <[email protected]> > > > --- > > > .../0002-detect-correct-openssl-3.x.patch | 28 +++++++++++++++++++ > > > .../recipes-support/libp11/libp11_0.4.12.bb | 4 ++- > > > 2 files changed, 31 insertions(+), 1 deletion(-) > > > create mode 100644 > > > meta-oe/recipes-support/libp11/files/0002-detect-correct-openssl-3.x.patch > > > > > > diff --git > > > a/meta-oe/recipes-support/libp11/files/0002-detect-correct-openssl-3.x.patch > > > > > > b/meta-oe/recipes-support/libp11/files/0002-detect-correct-openssl-3.x.patch > > > new file mode 100644 > > > index 000000000..b56e2602d > > > --- /dev/null > > > +++ > > > b/meta-oe/recipes-support/libp11/files/0002-detect-correct-openssl-3.x.patch > > > @@ -0,0 +1,28 @@ > > > +From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001 > > > +From: Mike Gilbert <[email protected]> > > > +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 [email protected] > > > + > > > +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.12.bb > > > index 223778200..87b26bf01 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,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" > > > +SRC_URI = > > > "git://github.com/OpenSC/libp11.git;branch=master;protocol=https \ > > > + file://0002-detect-correct-openssl-3.x.patch \ > > > +" > > > SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" > > > > > > UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" > > > -- > > > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#113063): https://lists.openembedded.org/g/openembedded-devel/message/113063 Mute This Topic: https://lists.openembedded.org/mt/109099694/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
