tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crank V8.9.1.0 (#588)

This commit is contained in:
bagajjal 2022-03-22 14:45:16 -07:00 committed by GitHub
parent 0bac502e32
commit aa0d37b16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/win32/install/client.wxs
View File

@ -3,29 +3,24 @@
<!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. --> <!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. -->
<ComponentGroup Id="Client" Directory="INSTALLFOLDER"> <ComponentGroup Id="Client" Directory="INSTALLFOLDER">
<ComponentGroupRef Id="Shared" /> <ComponentGroupRef Id="Shared" />
<ComponentGroupRef Id="Manifest" />
<Component> <Component>
<File Name="ssh.exe" KeyPath="yes" /> <File Name="ssh.exe" KeyPath="yes" />
<File Name="ssh.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="sftp.exe" KeyPath="yes" /> <File Name="sftp.exe" KeyPath="yes" />
<File Name="sftp.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="ssh-add.exe" KeyPath="yes" /> <File Name="ssh-add.exe" KeyPath="yes" />
<File Name="ssh-add.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="ssh-keyscan.exe" KeyPath="yes" /> <File Name="ssh-keyscan.exe" KeyPath="yes" />
<File Name="ssh-keyscan.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="ssh-sk-helper.exe" KeyPath="yes" /> <File Name="ssh-sk-helper.exe" KeyPath="yes" />
<File Name="ssh-sk-helper.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="ssh-pkcs11-helper.exe" KeyPath="yes" /> <File Name="ssh-pkcs11-helper.exe" KeyPath="yes" />
<File Name="ssh-pkcs11-helper.pdb" />
</Component> </Component>
<Component Id="ClientPATH" Guid="F07FFA0C-B5CF-45A3-9013-A7420DDFD654"> <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. --> <!-- Use same property condition as PowerShell. We can use a shared component GUID here because there should be only one installed on a system. -->

6
contrib/win32/install/product.wxs
View File

@ -32,7 +32,11 @@
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.ProgramFilesFolder)" Name="Program Files"> <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>
</Directory> </Directory>
</Product> </Product>

4
contrib/win32/install/server.wxs
View File

@ -3,17 +3,15 @@
<!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. --> <!-- KeyPath is necessary for multi-file components to identify the key file - preferrably versioned. -->
<ComponentGroup Id="Server" Directory="INSTALLFOLDER"> <ComponentGroup Id="Server" Directory="INSTALLFOLDER">
<ComponentGroupRef Id="Shared" /> <ComponentGroupRef Id="Shared" />
<ComponentGroupRef Id="Manifest" />
<Component> <Component>
<File Name="sftp-server.exe" KeyPath="yes" /> <File Name="sftp-server.exe" KeyPath="yes" />
<File Name="sftp-server.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="ssh-shellhost.exe" KeyPath="yes" /> <File Name="ssh-shellhost.exe" KeyPath="yes" />
<File Name="ssh-shellhost.pdb" />
</Component> </Component>
<Component> <Component>
<File Id="sshd.exe" Name="sshd.exe" KeyPath="yes" /> <File Id="sshd.exe" Name="sshd.exe" KeyPath="yes" />
<File Name="sshd.pdb" />
<RegistryKey Root="HKLM" Key="SOFTWARE\OpenSSH" ForceCreateOnInstall="yes"> <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)" /> <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. --> <!-- ssh-agent-associated key should only be created if the Server feature is installed. -->

25
contrib/win32/install/shared.wxs
View File

@ -4,7 +4,6 @@
<ComponentGroup Id="Shared" Directory="INSTALLFOLDER"> <ComponentGroup Id="Shared" Directory="INSTALLFOLDER">
<Component> <Component>
<File Name="libcrypto.dll" KeyPath="yes" /> <File Name="libcrypto.dll" KeyPath="yes" />
<File Name="libcrypto.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="moduli"> <File Name="moduli">
@ -17,13 +16,23 @@
<Component> <Component>
<File Name="NOTICE.txt" /> <File Name="NOTICE.txt" />
</Component> </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> <Component>
<File Name="scp.exe" KeyPath="yes" /> <File Name="scp.exe" KeyPath="yes" />
<File Name="scp.pdb" />
</Component> </Component>
<Component> <Component>
<File Name="ssh-keygen.exe" KeyPath="yes" /> <File Name="ssh-keygen.exe" KeyPath="yes" />
<File Name="ssh-keygen.pdb" />
</Component> </Component>
<!-- ssh-agent is useful in both client and server scenarios. --> <!-- ssh-agent is useful in both client and server scenarios. -->
@ -35,7 +44,6 @@
<Component> <Component>
<!-- Define the File/@Id to reference in util:EventManifest/@ResourceFile above. --> <!-- Define the File/@Id to reference in util:EventManifest/@ResourceFile above. -->
<File Id="ssh_agent.exe" Name="ssh-agent.exe" KeyPath="yes" /> <File Id="ssh_agent.exe" Name="ssh-agent.exe" KeyPath="yes" />
<File Name="ssh-agent.pdb" />
<ServiceInstall <ServiceInstall
Name="ssh-agent" Name="ssh-agent"
DisplayName="OpenSSH Authentication Agent" DisplayName="OpenSSH Authentication Agent"
@ -62,6 +70,15 @@
</Component> </Component>
</ComponentGroup> </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. --> <!-- 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" /> <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" /> <CustomAction Id="SetPrivilegesOnSshAgent" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />

6
contrib/win32/openssh/version.rc
View File

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,9,0,0 FILEVERSION 8,9,1,0
PRODUCTVERSION 8,9,0,0 PRODUCTVERSION 8,9,1,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -67,7 +67,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileVersion", "8.9.0.0" VALUE "FileVersion", "8.9.1.0"
VALUE "ProductName", "OpenSSH for Windows" VALUE "ProductName", "OpenSSH for Windows"
VALUE "ProductVersion", "OpenSSH_8.9p1 for Windows" VALUE "ProductVersion", "OpenSSH_8.9p1 for Windows"
END END