From 40d7ccf880a8a793abe93cbb0e5457ddc1362b84 Mon Sep 17 00:00:00 2001
From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Wed, 16 Feb 2022 05:28:32 +0100
Subject: [PATCH] [boinc] Add custom patch (copied from mainstream unreleased
 code) to support OpenSSL3 (#22945)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
---
 ports/boinc/001-add-openssl3-support.patch | 13 +++++++++++++
 ports/boinc/portfile.cmake                 |  2 ++
 ports/boinc/vcpkg.json                     |  3 ++-
 versions/b-/boinc.json                     |  5 +++++
 versions/baseline.json                     |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 ports/boinc/001-add-openssl3-support.patch

diff --git a/ports/boinc/001-add-openssl3-support.patch b/ports/boinc/001-add-openssl3-support.patch
new file mode 100644
index 0000000000..d0fd5ea890
--- /dev/null
+++ b/ports/boinc/001-add-openssl3-support.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/crypt.cpp b/lib/crypt.cpp
+index 01249cfc340..9b1f69160b8 100644
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
+@@ -672,7 +672,7 @@ int check_validity_of_cert(
+         }
+ #ifdef HAVE_OPAQUE_RSA_DSA_DH
+         RSA *rsa;
+-        rsa = EVP_PKEY_get0_RSA(pubKey);
++        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/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake
index 52227bf475..0009b0e746 100644
--- a/ports/boinc/portfile.cmake
+++ b/ports/boinc/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF client_release/7.18/7.18.1
     SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532
     HEAD_REF master
+    PATCHES
+        001-add-openssl3-support.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json
index fadcafb094..f962c47a59 100644
--- a/ports/boinc/vcpkg.json
+++ b/ports/boinc/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "boinc",
   "version": "7.18.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Open-source software for volunteer computing and grid computing.",
   "homepage": "https://boinc.berkeley.edu/",
+  "license": "LGPL-3.0-or-later",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "openssl",
diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json
index 13433d6288..3b7ff3232e 100644
--- a/versions/b-/boinc.json
+++ b/versions/b-/boinc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "47df312abbe66c9c58fd67b1deb72ec906421a68",
+      "version": "7.18.1",
+      "port-version": 5
+    },
     {
       "git-tree": "33d681acad2362813b5aa9e547c73741d11432d4",
       "version": "7.18.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index dafb0e6083..f2829a9a17 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -506,7 +506,7 @@
     },
     "boinc": {
       "baseline": "7.18.1",
-      "port-version": 4
+      "port-version": 5
     },
     "bond": {
       "baseline": "9.0.3",