[meta-oe][PATCH] boinc-client: unblacklist and update from 7.16.16 to 7.18.1. Add patch from upstream to fix openssl 3.0 build failure.

[meta-oe][PATCH] boinc-client: unblacklist and update from 7.16.16 to 7.18.1. Add patch from upstream to fix openssl 3.0 build failure.

[Gianfranco Costamagna]

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
---
 .../boinc/boinc-client/openssl-3.0.patch      | 25 +++++++++++++++++++
 ...ient_7.16.16.bb => boinc-client_7.18.1.bb} |  6 ++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
 rename meta-oe/recipes-extended/boinc/{boinc-client_7.16.16.bb => boinc-client_7.18.1.bb} (95%)

diff --git a/meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch b/meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
new file mode 100644
index 000000000..9dcf4bd36
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/openssl-3.0.patch
@@ -0,0 +1,25 @@
+commit 689dc20ede9768377d4032ff8c70b58269c8dc9c
+Author: Charlie Fenton <charlief@example.com>
+Date:   Mon Oct 18 01:43:08 2021 -0700
+
+    Mac: update dependent libraries to latest: c-ares-1.17.2, curl-7.79.1, freetype-2.11.0, openssl-3.0.0
+    Previously updated to wxWidgets-3.1.5. FTGL version ftgl-2.1.3~rc5  is still the current version.
+
+Upstream-Status: Backport [https://github.com/BOINC/boinc/commit/689dc20ede9768377d4032ff8c70b58269c8dc9c]
+
+diff --git a/lib/crypt.cpp b/lib/crypt.cpp
+index 01249cfc34..9b1f69160b 100644
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
+@@ -672,7 +672,10 @@ int check_validity_of_cert(
+         }
+ #ifdef HAVE_OPAQUE_RSA_DSA_DH
+         RSA *rsa;
+-        rsa = EVP_PKEY_get0_RSA(pubKey);
++        // CAUTION: In OpenSSL 3.0.0, EVP_PKEY_get0_RSA() now returns a
++        // pointer of type "const struct rsa_st*" to an immutable value.
++        // Do not try to modify the contents of the returned struct.
++        rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey);
+         if (!RSA_blinding_on(rsa, c)) {
+ #else
+         if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
similarity index 95%
rename from meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
rename to meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
index 79aaad9d8..dcbe220fa 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
@@ -16,7 +16,6 @@ global warming, discover sources of gravitational waves, and many other types \
 of scientific and mathematical research."
 
 HOMEPAGE = "http://boinc.berkeley.edu/"
-PNBLACKLIST[boinc-client] ?= "Needs porting to openssl 3.x"
 LICENSE = "LGPLv2+ & GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
@@ -30,11 +29,12 @@ DEPENDS = "curl \
            ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \
            nettle \
 "
-SRCREV = "df0239e6f074207798a8ecf1358a74545dda9132"
-BRANCH = "client_release/7/7.16"
+SRCREV = "b49adfb118211e11c719766c0d71e7bdfe7f3363"
+BRANCH = "client_release/7/7.18"
 SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
            file://boinc-AM_CONDITIONAL.patch \
            file://gtk-configure.patch \
+           file://openssl-3.0.patch \
 "
 
 inherit gettext autotools pkgconfig features_check systemd
-- 
2.25.1