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.

Sign up for GitHub

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

Jump to bottom

[OpenSSL] Update to 3.0.7. #27594

Merged
merged 3 commits into from
Nov 2, 2022
Merged

[OpenSSL] Update to 3.0.7. #27594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac2a0a2
[OpenSSL] Update to 3.0.7.
BillyONeal Oct 31, 2022
404e150
Revert unintentional boringssl change.
BillyONeal Nov 1, 2022
a3afcb7
Add vcpkg_minimum_required and switch back to GitHub now that a tag i…
BillyONeal Nov 1, 2022
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
2 changes: 1 addition & 1 deletion ports/openssl/openssl.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Version: @OPENSSL_VERSION@
Version: @VERSION@
vicroms marked this conversation as resolved.
Show resolved Hide resolved
@pc_data@
7 changes: 3 additions & 4 deletions ports/openssl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright"
OR EXISTS "${CURRENT_INSTALLED_DIR}/share/boringssl/copyright")
message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.")
Expand All @@ -11,17 +12,15 @@ It can be installed on alpine systems via apk add linux-headers.]]
)
endif()

set(OPENSSL_VERSION 3.0.5)

if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
set(OPENSSL_PATCHES "${CMAKE_CURRENT_LIST_DIR}/windows/flags.patch")
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openssl/openssl
REF openssl-${OPENSSL_VERSION}
SHA512 e426f2d48dcd87ad938b246cea69988710198c3ed2f5bb9065aa9e74492161b056336f5b1f29be64e70dfd86a77808fe727ebb46eae10331c76f1ff08e341133
REF openssl-${VERSION}
SHA512 27dd3ef0c1827a74ec880d20232acb818c7d05e004ad7389c355e200a01e899f1b1ba5c34dcce44ecf7c8767c5e1bfbb2c795e3fa5461346087e7e3b95c8a51f
PATCHES ${OPENSSL_PATCHES}
)

Expand Down
3 changes: 1 addition & 2 deletions ports/openssl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "openssl",
"version": "3.0.5",
"port-version": 5,
"version": "3.0.7",
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
"homepage": "https://www.openssl.org",
"license": "Apache-2.0",
Expand Down
13 changes: 0 additions & 13 deletions ports/openssl/windows/flags.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 66bc81d..2364633 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1302,7 +1302,7 @@ my %targets = (
inherit_from => [ "BASE_Windows" ],
template => 1,
CC => "cl",
- CPP => '"$(CC)" /EP /C',
+ CPP => '$(CC) /EP /C',
CFLAGS => "/W3 /wd4090 /nologo",
coutflag => "/Fo",
LD => "link",
diff --git a/Configure b/Configure
index 8b234f6..e031768 100644
--- a/Configure
Expand Down
12 changes: 6 additions & 6 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5497,8 +5497,8 @@
"port-version": 4
},
"openssl": {
"baseline": "3.0.5",
"port-version": 5
"baseline": "3.0.7",
"port-version": 0
},
"openssl-unix": {
"baseline": "deprecated",
Expand Down Expand Up @@ -6832,6 +6832,10 @@
"baseline": "1.3.1",
"port-version": 0
},
"shader-slang": {
"baseline": "0.23.13",
"port-version": 0
},
"shaderc": {
"baseline": "2021.1",
"port-version": 3
Expand Down Expand Up @@ -6916,10 +6920,6 @@
"baseline": "1.13.0",
"port-version": 2
},
"shader-slang": {
"baseline": "0.23.13",
"port-version": 0
},
"sleef": {
"baseline": "3.5.1",
"port-version": 3
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openssl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "09701bf7506bd0d161bf671eff1c7f5b3d73e3a9",
"version": "3.0.7",
"port-version": 0
},
{
"git-tree": "067a790dfd1559e77d5a199ccbe982322882d667",
"version": "3.0.5",
Expand Down