[cpp-msbuild] branch main updated: Update curl, openssl, SP patch versions.
Scott Cantor
cantor.2 at osu.edu
Tue Feb 7 17:50:42 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-msbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=67eb3e457299faad85d72f546843f04f3e13b40e
The following commit(s) were added to refs/heads/main by this push:
new 67eb3e4 Update curl, openssl, SP patch versions.
67eb3e4 is described below
commit 67eb3e457299faad85d72f546843f04f3e13b40e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 7 12:50:37 2023 -0500
Update curl, openssl, SP patch versions.
---
Versions.props | 30 +++++++++++++++---------------
dependencies/config.bat | 8 ++++----
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Versions.props b/Versions.props
index 6c8a6dd..0a319d3 100644
--- a/Versions.props
+++ b/Versions.props
@@ -12,7 +12,7 @@
<!-- These control the version of the installer -->
<ShibbolethVersion>3.4.1</ShibbolethVersion>
- <ShibbolethPatchVersion>0</ShibbolethPatchVersion>
+ <ShibbolethPatchVersion>1</ShibbolethPatchVersion>
<!-- These control the versions in the DLLs and Executables.
Note that the PatchVersion is left to the individual resource file.
@@ -22,7 +22,7 @@
<SPFileVersionSP>3,4,1</SPFileVersionSP> <!-- Special for ShibSp.dll -->
<SPProductVersion>3,4,1</SPProductVersion> <!-- PRODUCTVERSION in the SP projects (but overidden by resourceCommon.rci on output-->
- <!-- XML Tooling only has one RC file. Edit that by hand -->
+ <!-- XMLTooling only has one RC file. Edit that by hand -->
<!-- OpemSAML has two RC files (saml.rc and samlsign.rc). Edit them by hand -->
<!--
@@ -89,7 +89,7 @@
</PropertyGroup>
<PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '10'">
<CurlVersion Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_VERSION)</CurlVersion>
- <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.86.0</CurlVersion>
+ <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.87.0</CurlVersion>
<curl Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_DIR)</curl>
<curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
@@ -111,29 +111,29 @@
<PropertyGroup Label="OpenSSLGeneral">
<!-- Just for now -->
- <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_0_7</OPENSSL_FILE_VERSION>
+ <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_0_8</OPENSSL_FILE_VERSION>
- <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.0.7</openssl>
+ <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.0.8</openssl>
<openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
</PropertyGroup>
- <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_0_7'">
+ <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_0_8'">
<!--- If you revert to a pre-V3.0 version of OpenSSL you need to change the name of the
License file in cpp-sp/msi/WiX/MergeModules/OpenSSL-x64/x86.wxs -->
<OpenSSLFileVersion>BAD_OPENSSL_FILE_VERSION</OpenSSLFileVersion>
<!-- Changing OPENSSL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
</PropertyGroup>
- <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_0_7'">
+ <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_0_8'">
<OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
<!-- Change the 8 components below iff OpenSSLFileVersion changes -->
- <LibEay32Component>{0C04FB12-2BC3-42F9-B684-4055BA1CCAFE}</LibEay32Component>
- <SSlEay32Component>{0CA696ED-C19F-499A-89CA-61C3C75A1E4C}</SSlEay32Component>
- <LibEay32Componentd>{49C9DECA-5B57-494B-BF10-750490E8164D}</LibEay32Componentd>
- <SSlEay32Componentd>{F4B9026E-A874-4AB8-AC25-D248D506228B}</SSlEay32Componentd>
- <LibEay64Component>{F6B44977-FA8E-4394-9B7D-0769F3387D42}</LibEay64Component>
- <SSlEay64Component>{E23AD99F-636B-4BEF-B973-8098AC653BF3}</SSlEay64Component>
- <LibEay64Componentd>{F3A71114-8E0C-4A02-A5AC-38823C1B4ABF}</LibEay64Componentd>
- <SSlEay64Componentd>{21B6E017-9EA7-4029-AEBD-15DB1AE6508E}</SSlEay64Componentd>
+ <LibEay32Component>{DFA6D635-4698-41C9-9818-AAA905BDFAF1}</LibEay32Component>
+ <SSlEay32Component>{D8CF145E-BC7B-4B8B-A739-0FCC12BB185B}</SSlEay32Component>
+ <LibEay32Componentd>{32682268-4B51-434F-97D4-6C4D81B69406}</LibEay32Componentd>
+ <SSlEay32Componentd>{E4EE465F-1384-4A56-A608-209A578884FC}</SSlEay32Componentd>
+ <LibEay64Component>{620E46DF-A75C-4AF8-A7DE-7511748898EA}</LibEay64Component>
+ <SSlEay64Component>{289CEA4B-57CD-46BD-845B-38272EBB6218}</SSlEay64Component>
+ <LibEay64Componentd>{4CA4935C-9814-4C98-9E65-01C73E464358}</LibEay64Componentd>
+ <SSlEay64Componentd>{9BDB9237-7D10-40CA-AE65-55AE5D02451D}</SSlEay64Componentd>
</PropertyGroup>
<PropertyGroup Label="XSecGeneral">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index f3a1372..f7946a9 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -93,9 +93,9 @@ REM OPENSSL_DIR is the directory name
REM OPENSSL_MM_VERSION is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
REM OPENSSL_FILE_VERSION is the distinction on the name of the DLLS
REM if it changes you *MUST* change Version.props
-set OPENSSL_DIR=openssl-3.0.7
-set OPENSSL_MM_VERSION=3.0.7.0
-set OPENSSL_FILE_VERSION=3_0_7
+set OPENSSL_DIR=openssl-3.0.8
+set OPENSSL_MM_VERSION=3.0.8.0
+set OPENSSL_FILE_VERSION=3_0_8
REM
REM CURL CONFIG
@@ -103,7 +103,7 @@ REM
REM CURL_DIR is the directory name
REM CURL_VERSION is the version
REM
-Set LIBCURL_VERSION=7.86.0
+Set LIBCURL_VERSION=7.87.0
set LIBCURL_DIR=curl-%LIBCURL_VERSION%
set LIBCURL_FILE_VERSION=10
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list