Message ID | 20241019061945.146707-1-sanakazi720@gmail.com |
---|---|
State | Under Review |
Headers | show |
Series | [meta-oe,scarthgap] configure: treat all openssl-3.x releases the same | expand |
On Sat, Oct 19, 2024 at 5:48 AM Sana Kazi via lists.openembedded.org <sanakazi720=gmail.com@lists.openembedded.org> 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 <sanakazi720@gmail.com> > --- > .../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 <floppym@gentoo.org> > +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 sana.kazi@kpit.com > + > +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..afab932a6 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://files/0002-detect-correct-openssl-3.x.patch \ Here the path won't be found and bitbake should complain about it during parsing. How did you test this ? > +" > 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 (#113058): https://lists.openembedded.org/g/openembedded-devel/message/113058 > Mute This Topic: https://lists.openembedded.org/mt/109099694/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 <floppym@gentoo.org> +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 sana.kazi@kpit.com + +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..afab932a6 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://files/0002-detect-correct-openssl-3.x.patch \ +" SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
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 <sanakazi720@gmail.com> --- .../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