From aa0d37b16ef5646f528083db4da98dbcd03c8a95 Mon Sep 17 00:00:00 2001
From: bagajjal <bagajjal@microsoft.com>
Date: Tue, 22 Mar 2022 14:45:16 -0700
Subject: [PATCH] Crank V8.9.1.0 (#588)

---
 contrib/win32/install/client.wxs  |  7 +------
 contrib/win32/install/product.wxs |  6 +++++-
 contrib/win32/install/server.wxs  |  4 +---
 contrib/win32/install/shared.wxs  | 25 +++++++++++++++++++++----
 contrib/win32/openssh/version.rc  |  6 +++---
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/contrib/win32/install/client.wxs b/contrib/win32/install/client.wxs
index 698335363..8918abd18 100644
--- a/contrib/win32/install/client.wxs
+++ b/contrib/win32/install/client.wxs
@@ -3,29 +3,24 @@
         <!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. -->
         <ComponentGroup Id="Client" Directory="INSTALLFOLDER">
             <ComponentGroupRef Id="Shared" />
+            <ComponentGroupRef Id="Manifest" />
             <Component>
                 <File Name="ssh.exe" KeyPath="yes" />
-                <File Name="ssh.pdb" />
             </Component>
             <Component>
                 <File Name="sftp.exe" KeyPath="yes" />
-                <File Name="sftp.pdb" />
             </Component>
             <Component>
                 <File Name="ssh-add.exe" KeyPath="yes" />
-                <File Name="ssh-add.pdb" />
             </Component>
             <Component>
                 <File Name="ssh-keyscan.exe" KeyPath="yes" />
-                <File Name="ssh-keyscan.pdb" />
             </Component>
             <Component>
                 <File Name="ssh-sk-helper.exe" KeyPath="yes" />
-                <File Name="ssh-sk-helper.pdb" />
             </Component>
             <Component>
                 <File Name="ssh-pkcs11-helper.exe" KeyPath="yes" />
-                <File Name="ssh-pkcs11-helper.pdb" />
             </Component>
             <Component Id="ClientPATH" Guid="F07FFA0C-B5CF-45A3-9013-A7420DDFD654">
                 <!-- Use same property condition as PowerShell. We can use a shared component GUID here because there should be only one installed on a system. -->
diff --git a/contrib/win32/install/product.wxs b/contrib/win32/install/product.wxs
index 502dc94e4..96920cf96 100644
--- a/contrib/win32/install/product.wxs
+++ b/contrib/win32/install/product.wxs
@@ -32,7 +32,11 @@
 
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="$(var.ProgramFilesFolder)" Name="Program Files">
-                <Directory Id="INSTALLFOLDER" Name="OpenSSH" />
+                <Directory Id="INSTALLFOLDER" Name="OpenSSH" >
+                    <Directory Id="MANIFESTFOLDER" Name="_manifest" >
+                        <Directory Id="SPDXFOLDER" Name="spdx_2.2" />
+                    </Directory>
+                </Directory>
             </Directory>
         </Directory>
     </Product>
diff --git a/contrib/win32/install/server.wxs b/contrib/win32/install/server.wxs
index c7a16c25e..e7f66280d 100644
--- a/contrib/win32/install/server.wxs
+++ b/contrib/win32/install/server.wxs
@@ -3,17 +3,15 @@
         <!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. -->
         <ComponentGroup Id="Server" Directory="INSTALLFOLDER">
             <ComponentGroupRef Id="Shared" />
+            <ComponentGroupRef Id="Manifest" />
             <Component>
                 <File Name="sftp-server.exe" KeyPath="yes" />
-                <File Name="sftp-server.pdb" />
             </Component>
             <Component>
                 <File Name="ssh-shellhost.exe" KeyPath="yes" />
-                <File Name="ssh-shellhost.pdb" />
             </Component>
             <Component>
                 <File Id="sshd.exe" Name="sshd.exe" KeyPath="yes" />
-                <File Name="sshd.pdb" />
                 <RegistryKey Root="HKLM" Key="SOFTWARE\OpenSSH" ForceCreateOnInstall="yes">
                     <PermissionEx Sddl="O:BAG:SYD:P(A;OICI;KR;;;AU)(A;OICI;KA;;;SY)(A;OICI;KA;;;BA)" />
                     <!-- ssh-agent-associated key should only be created if the Server feature is installed. -->
diff --git a/contrib/win32/install/shared.wxs b/contrib/win32/install/shared.wxs
index 4b94e935a..d2b3793f1 100644
--- a/contrib/win32/install/shared.wxs
+++ b/contrib/win32/install/shared.wxs
@@ -4,7 +4,6 @@
         <ComponentGroup Id="Shared" Directory="INSTALLFOLDER">
             <Component>
                 <File Name="libcrypto.dll" KeyPath="yes" />
-                <File Name="libcrypto.pdb" />
             </Component>
             <Component>
                 <File Name="moduli">
@@ -17,13 +16,23 @@
             <Component>
                 <File Name="NOTICE.txt" />
             </Component>
+            <Component>
+                <File Name="FixHostFilePermissions.ps1" />
+            </Component>
+            <Component>
+                <File Name="OpenSSHUtils.psd1" />
+            </Component>
+            <Component>
+                <File Name="FixUserFilePermissions.ps1" />
+            </Component>
+            <Component>
+                <File Name="OpenSSHUtils.psm1" />
+            </Component>
             <Component>
                 <File Name="scp.exe" KeyPath="yes" />
-                <File Name="scp.pdb" />
             </Component>
             <Component>
                 <File Name="ssh-keygen.exe" KeyPath="yes" />
-                <File Name="ssh-keygen.pdb" />
             </Component>
 
             <!-- ssh-agent is useful in both client and server scenarios. -->
@@ -35,7 +44,6 @@
             <Component>
                 <!-- Define the File/@Id to reference in util:EventManifest/@ResourceFile above. -->
                 <File Id="ssh_agent.exe" Name="ssh-agent.exe" KeyPath="yes" />
-                <File Name="ssh-agent.pdb" />
                 <ServiceInstall
                     Name="ssh-agent"
                     DisplayName="OpenSSH Authentication Agent"
@@ -62,6 +70,15 @@
             </Component>
         </ComponentGroup>
 
+        <ComponentGroup Id="Manifest" Directory="SPDXFOLDER">
+             <Component>
+                <File Name="manifest.spdx.json" Source="_manifest\spdx_2.2\manifest.spdx.json" KeyPath="yes" />
+            </Component>
+            <Component>
+                <File Name="manifest.spdx.json.sha256" Source="_manifest\spdx_2.2\manifest.spdx.json.sha256" KeyPath="yes" />
+            </Component>
+        </ComponentGroup>
+
         <!-- Automatically add custom actions if referencing the Shared component group. -->
         <SetProperty Id="SetPrivilegesOnSshAgent" Value="&quot;[SystemFolder]sc.exe&quot; privs ssh-agent SeAssignPrimaryTokenPrivilege/SeTcbPrivilege/SeBackupPrivilege/SeRestorePrivilege/SeImpersonatePrivilege" Sequence="execute" Before="SetPrivilegesOnSshAgent" />
         <CustomAction Id="SetPrivilegesOnSshAgent" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />
diff --git a/contrib/win32/openssh/version.rc b/contrib/win32/openssh/version.rc
index 361ee79ec..d1f4dab65 100644
--- a/contrib/win32/openssh/version.rc
+++ b/contrib/win32/openssh/version.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,9,0,0
- PRODUCTVERSION 8,9,0,0
+ FILEVERSION 8,9,1,0
+ PRODUCTVERSION 8,9,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,7 +67,7 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileVersion", "8.9.0.0"
+            VALUE "FileVersion", "8.9.1.0"
             VALUE "ProductName", "OpenSSH for Windows"
             VALUE "ProductVersion", "OpenSSH_8.9p1 for Windows"
         END