[cpp-sp] branch main updated: Update to OpenSSL 3.0.0

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=92077a9c4cd9ab24adccdf0458fe1cffc24f8ae4

The following commit(s) were added to refs/heads/main by this push:
     new 92077a9c Update to OpenSSL 3.0.0
92077a9c is described below

commit 92077a9c4cd9ab24adccdf0458fe1cffc24f8ae4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 20 16:19:44 2021 +0100

    Update to OpenSSL 3.0.0
    
    The LICENSE file is now called LICENSE.txt.  So the installer
    needs to be changed.
---
 msi/WiX/MergeModules/OpenSSL-x64.wxs | 3 ++-
 msi/WiX/MergeModules/OpenSSL-x86.wxs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index b2ae9087..7ae3cb36 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -70,7 +70,8 @@
             </Directory><!-- lib -->
             <Directory Id="doc" Name="doc">
               <Component Id="OPENSSL.LICENSE" Guid="{10B77A21-E554-47F2-99F0-7171304FE899}" Win64="yes">
-                <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE" />
+                <!-- Note the name change for OpenSSL 3.0.0 -->
+                <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE.txt" />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index cf0f6bcd..47c42323 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -71,7 +71,8 @@
             </Directory><!-- lib -->
             <Directory Id="doc" Name="doc">
               <Component Id="OPENSSL.LICENSE" Guid="{CEC1CC66-6D48-475A-8C99-B687B0B901AA}">
-                <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE" />
+                <!-- NOTE the name change for OpenSSL 3.0.0 -->
+                <File KeyPath="yes" Name="OPENSSL.LICENSE" Source="$(var.BuildDirectory)\$(var.openssl)\LICENSE.txt" />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->

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