mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 05:21:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openssl] correct fipsmodule install (#31142)

Browse Source 
* Corrected fipsmodule.cnf install

move it to the same position as openssl.cnf, both are only examples of openssl

* Adjusted port version

* Adjusted SHA for vcpkg x-add-version --all

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
lbermes 2023-04-28 07:48:59 +02:00 committed by GitHub
parent 187712658b
commit e52999ee1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openssl/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "openssl",
"version": "3.1.0",
"port-version": 2,
"port-version": 3,
"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",

2
ports/openssl/windows/portfile.cmake
View File

@ -89,6 +89,7 @@ set(scripts "bin/c_rehash.pl" "misc/CA.pl" "misc/tsget.pl")
if("tools" IN_LIST FEATURES)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/openssl.cnf")
file(RENAME "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fipsmodule.cnf")
foreach(script IN LISTS scripts)
file(COPY "${CURRENT_PACKAGES_DIR}/${script}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}")
@ -96,6 +97,7 @@ if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN)
else()
file(REMOVE "${CURRENT_PACKAGES_DIR}/openssl.cnf")
file(REMOVE "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf")
foreach(script IN LISTS scripts)
file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}")
endforeach()

2
versions/baseline.json
View File

@ -5890,7 +5890,7 @@
},
"openssl": {
"baseline": "3.1.0",
"port-version": 2
"port-version": 3
},
"openssl-unix": {
"baseline": "deprecated",

5
versions/o-/openssl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b99152f5be63f45b2f3be6eb1624d96d70b21b49",
"version": "3.1.0",
"port-version": 3
},
{
"git-tree": "64fc47730d346ecacc9f948c2c3138363ed8f702",
"version": "3.1.0",