Skip to content

Commit aa0d37b

Browse files
bagajjalbagajjal
authored
Crank V8.9.1.0 (#588)
1 parent 0bac502 commit aa0d37b

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

‎contrib/win32/install/client.wxs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,24 @@
33
<!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. -->
44
<ComponentGroup Id="Client" Directory="INSTALLFOLDER">
55
<ComponentGroupRef Id="Shared" />
6+
<ComponentGroupRef Id="Manifest" />
67
<Component>
78
<File Name="ssh.exe" KeyPath="yes" />
8-
<File Name="ssh.pdb" />
99
</Component>
1010
<Component>
1111
<File Name="sftp.exe" KeyPath="yes" />
12-
<File Name="sftp.pdb" />
1312
</Component>
1413
<Component>
1514
<File Name="ssh-add.exe" KeyPath="yes" />
16-
<File Name="ssh-add.pdb" />
1715
</Component>
1816
<Component>
1917
<File Name="ssh-keyscan.exe" KeyPath="yes" />
20-
<File Name="ssh-keyscan.pdb" />
2118
</Component>
2219
<Component>
2320
<File Name="ssh-sk-helper.exe" KeyPath="yes" />
24-
<File Name="ssh-sk-helper.pdb" />
2521
</Component>
2622
<Component>
2723
<File Name="ssh-pkcs11-helper.exe" KeyPath="yes" />
28-
<File Name="ssh-pkcs11-helper.pdb" />
2924
</Component>
3025
<Component Id="ClientPATH" Guid="F07FFA0C-B5CF-45A3-9013-A7420DDFD654">
3126
<!-- Use same property condition as PowerShell. We can use a shared component GUID here because there should be only one installed on a system. -->

‎contrib/win32/install/product.wxs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232

3333
<Directory Id="TARGETDIR" Name="SourceDir">
3434
<Directory Id="$(var.ProgramFilesFolder)" Name="Program Files">
35-
<Directory Id="INSTALLFOLDER" Name="OpenSSH" />
35+
<Directory Id="INSTALLFOLDER" Name="OpenSSH" >
36+
<Directory Id="MANIFESTFOLDER" Name="_manifest" >
37+
<Directory Id="SPDXFOLDER" Name="spdx_2.2" />
38+
</Directory>
39+
</Directory>
3640
</Directory>
3741
</Directory>
3842
</Product>

‎contrib/win32/install/server.wxs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
<!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. -->
44
<ComponentGroup Id="Server" Directory="INSTALLFOLDER">
55
<ComponentGroupRef Id="Shared" />
6+
<ComponentGroupRef Id="Manifest" />
67
<Component>
78
<File Name="sftp-server.exe" KeyPath="yes" />
8-
<File Name="sftp-server.pdb" />
99
</Component>
1010
<Component>
1111
<File Name="ssh-shellhost.exe" KeyPath="yes" />
12-
<File Name="ssh-shellhost.pdb" />
1312
</Component>
1413
<Component>
1514
<File Id="sshd.exe" Name="sshd.exe" KeyPath="yes" />
16-
<File Name="sshd.pdb" />
1715
<RegistryKey Root="HKLM" Key="SOFTWARE\OpenSSH" ForceCreateOnInstall="yes">
1816
<PermissionEx Sddl="O:BAG:SYD:P(A;OICI;KR;;;AU)(A;OICI;KA;;;SY)(A;OICI;KA;;;BA)" />
1917
<!-- ssh-agent-associated key should only be created if the Server feature is installed. -->

‎contrib/win32/install/shared.wxs

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<ComponentGroup Id="Shared" Directory="INSTALLFOLDER">
55
<Component>
66
<File Name="libcrypto.dll" KeyPath="yes" />
7-
<File Name="libcrypto.pdb" />
87
</Component>
98
<Component>
109
<File Name="moduli">
@@ -17,13 +16,23 @@
1716
<Component>
1817
<File Name="NOTICE.txt" />
1918
</Component>
19+
<Component>
20+
<File Name="FixHostFilePermissions.ps1" />
21+
</Component>
22+
<Component>
23+
<File Name="OpenSSHUtils.psd1" />
24+
</Component>
25+
<Component>
26+
<File Name="FixUserFilePermissions.ps1" />
27+
</Component>
28+
<Component>
29+
<File Name="OpenSSHUtils.psm1" />
30+
</Component>
2031
<Component>
2132
<File Name="scp.exe" KeyPath="yes" />
22-
<File Name="scp.pdb" />
2333
</Component>
2434
<Component>
2535
<File Name="ssh-keygen.exe" KeyPath="yes" />
26-
<File Name="ssh-keygen.pdb" />
2736
</Component>
2837

2938
<!-- ssh-agent is useful in both client and server scenarios. -->
@@ -35,7 +44,6 @@
3544
<Component>
3645
<!-- Define the File/@Id to reference in util:EventManifest/@ResourceFile above. -->
3746
<File Id="ssh_agent.exe" Name="ssh-agent.exe" KeyPath="yes" />
38-
<File Name="ssh-agent.pdb" />
3947
<ServiceInstall
4048
Name="ssh-agent"
4149
DisplayName="OpenSSH Authentication Agent"
@@ -62,6 +70,15 @@
6270
</Component>
6371
</ComponentGroup>
6472

73+
<ComponentGroup Id="Manifest" Directory="SPDXFOLDER">
74+
<Component>
75+
<File Name="manifest.spdx.json" Source="_manifest\spdx_2.2\manifest.spdx.json" KeyPath="yes" />
76+
</Component>
77+
<Component>
78+
<File Name="manifest.spdx.json.sha256" Source="_manifest\spdx_2.2\manifest.spdx.json.sha256" KeyPath="yes" />
79+
</Component>
80+
</ComponentGroup>
81+
6582
<!-- Automatically add custom actions if referencing the Shared component group. -->
6683
<SetProperty Id="SetPrivilegesOnSshAgent" Value="&quot;[SystemFolder]sc.exe&quot; privs ssh-agent SeAssignPrimaryTokenPrivilege/SeTcbPrivilege/SeBackupPrivilege/SeRestorePrivilege/SeImpersonatePrivilege" Sequence="execute" Before="SetPrivilegesOnSshAgent" />
6784
<CustomAction Id="SetPrivilegesOnSshAgent" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />

‎contrib/win32/openssh/version.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ END
5151
//
5252

5353
VS_VERSION_INFO VERSIONINFO
54-
FILEVERSION 8,9,0,0
55-
PRODUCTVERSION 8,9,0,0
54+
FILEVERSION 8,9,1,0
55+
PRODUCTVERSION 8,9,1,0
5656
FILEFLAGSMASK 0x3fL
5757
#ifdef _DEBUG
5858
FILEFLAGS 0x1L
@@ -67,7 +67,7 @@ BEGIN
6767
BEGIN
6868
BLOCK "040904b0"
6969
BEGIN
70-
VALUE "FileVersion", "8.9.0.0"
70+
VALUE "FileVersion", "8.9.1.0"
7171
VALUE "ProductName", "OpenSSH for Windows"
7272
VALUE "ProductVersion", "OpenSSH_8.9p1 for Windows"
7373
END

0 commit comments

Comments
 (0)