[cpp-msbuild] branch master updated: Update libcurl, openssl versions.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=1e498aa1939c54c0b5ed0becfe218ed254373fbc

The following commit(s) were added to refs/heads/master by this push:
       new  1e498aa   Update libcurl, openssl versions.
1e498aa is described below

commit 1e498aa1939c54c0b5ed0becfe218ed254373fbc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 21 16:10:42 2018 -0400

    Update libcurl, openssl versions.
---
 Versions.props          | 16 ++++++++--------
 dependencies/config.bat | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Versions.props b/Versions.props
index 105b1fb..5d136d9 100644
--- a/Versions.props
+++ b/Versions.props
@@ -77,21 +77,21 @@
 
   </PropertyGroup>
 
-  <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '7_58'">
+  <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '7_60'">
     <CurlFileVersion>BAD_LIBCURL_FILE_VERSION</CurlFileVersion>
     <!-- Changing LIBCURL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
   </PropertyGroup>
-  <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '7_58'">
+  <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '7_60'">
     <CurlVersion Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_VERSION)</CurlVersion>
-    <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.58.0</CurlVersion>
+    <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.60.0</CurlVersion>
     <curl Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_DIR)</curl>
     <curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
 
     <CurlFileVersion>$(LIBCURL_FILE_VERSION)</CurlFileVersion>
-    <LibCurlGuid32>{6776E638-553C-462a-9A02-325959466949}</LibCurlGuid32>
-    <LibCurlGuid64>{1238EFBD-6C88-45e0-8ABB-343A2B3E4303}</LibCurlGuid64>
-    <LibCurlGuid32d>{D383D9F8-106E-4940-B05E-B670DB823E64}</LibCurlGuid32d>
-    <LibCurlGuid64d>{976F36F0-927B-4ca9-9ADB-9AFACD6858BB}</LibCurlGuid64d>
+    <LibCurlGuid32>{CB071587-2CD1-4143-A330-030A09C98C23}</LibCurlGuid32>
+    <LibCurlGuid64>{0C42C9A5-6CFC-41EF-8BA1-2C4222DBA564}</LibCurlGuid64>
+    <LibCurlGuid32d>{F4625619-BC37-4D29-A4EA-B1D6F6B0D0E0}</LibCurlGuid32d>
+    <LibCurlGuid64d>{00417DC2-952F-43C1-9D06-3A70F11E6CB5}</LibCurlGuid64d>
   </PropertyGroup>
 
   <PropertyGroup Label="Apache">
@@ -107,7 +107,7 @@
     <!-- Just for now -->
     <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">1_1</OPENSSL_FILE_VERSION>
 
-    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.0g</openssl>
+    <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-1.1.0h</openssl>
     <openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
   </PropertyGroup>
 
diff --git a/dependencies/config.bat b/dependencies/config.bat
index f072b82..d576d54 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -17,7 +17,7 @@ rem set DEBUG_INSTALLER=YES
 SET APACHE_13_ROOT=C:\Apache
 SET APACHE_20_ROOT=C:\Apache2.0.63\Apache
 SET APACHE_22_ROOT=C:\Apache2
-SET APACHE_22_ROOT64=C:\Apache22-64
+SET APACHE_22_ROOT64=C:\Apache2-64
 SET APACHE_24_ROOT=C:\Apache24
 SET APACHE_24_ROOT64=C:\Apache24-64
 
@@ -67,8 +67,8 @@ goto path_done
 ## OPENSSL_MM_VERSION   is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
 ## OPENSSL_FILE_VERSION is the distinction on the name of the DLLS
 ##                      if it changes you *MUST* change Version.props
-set OPENSSL_DIR=openssl-1.1.0g
-set OPENSSL_MM_VERSION=1.1.0.7
+set OPENSSL_DIR=openssl-1.1.0h
+set OPENSSL_MM_VERSION=1.1.0.8
 set OPENSSL_FILE_VERSION=1_1_0
 
 ##
@@ -77,9 +77,9 @@ set OPENSSL_FILE_VERSION=1_1_0
 ## CURL_DIR             is the directory name
 ## CURL_VERSION         is the version
 ##
-Set LIBCURL_VERSION=7.58.0
+Set LIBCURL_VERSION=7.60.0
 set LIBCURL_DIR=curl-%LIBCURL_VERSION%
-set LIBCURL_FILE_VERSION=7_58
+set LIBCURL_FILE_VERSION=7_60
 
 ##
 ## XML SECURITY CONFIG

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.