Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[boinc] Add custom patch (copied from mainstream unreleased code) to support OpenSSL3 #22945

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/boinc/001-add-openssl3-support.patch
Original file line number Diff line number Diff line change
@@ -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)) {
2 changes: 2 additions & 0 deletions ports/boinc/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
3 changes: 2 additions & 1 deletion ports/boinc/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boinc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "47df312abbe66c9c58fd67b1deb72ec906421a68",
"version": "7.18.1",
"port-version": 5
},
{
"git-tree": "33d681acad2362813b5aa9e547c73741d11432d4",
"version": "7.18.1",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
},
"boinc": {
"baseline": "7.18.1",
"port-version": 4
"port-version": 5
},
"bond": {
"baseline": "9.0.3",
Expand Down