Skip to content

Commit ce28cb9

Browse files
rayhayesrayhayes
committed
Merge PowerShell.
2 parents b47cc46 + 8eab288 commit ce28cb9

33 files changed

+1094
-1621
lines changed

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,5 +277,17 @@ Makefile.in
277277
d2utmpa*
278278
configure
279279
contrib/win32/openssh/Win32-OpenSSH.VC.opendb
280+
contrib/win32/openssh/Win32-OpenSSH.VC.db
280281
*.opendb
281282
*.db
283+
284+
# Visual C++ cache files
285+
ipch/
286+
*.aps
287+
*.ncb
288+
*.opendb
289+
*.opensdf
290+
*.sdf
291+
*.cachefile
292+
*.VC.db
293+
*.VC.VC.opendb

‎contrib/win32/openssh/config.h.vs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,6 +1632,9 @@
16321632
#define HAVE_STRNCASECMP 1
16331633
#endif
16341634

1635+
/* Define to 1 if you have the locale.h header. */
1636+
#define HAVE_LOCALE_H 1
1637+
16351638
#define HAVE_STRUCT_IN6_ADDR 1
16361639
#define HAVE_STRUCT_SOCKADDR_IN6 1
16371640
#define HAVE_STRUCT_TIMEVAL 1
@@ -1725,6 +1728,6 @@ typedef long ssize_t;
17251728
#define HAVE_MBLEN 1
17261729

17271730
#define SSHDIR "."
1728-
#define _PATH_SFTP_SERVER "./sftp-server.exe"
1729-
#define _PATH_SSH_PROGRAM "./ssh.exe"
1731+
#define _PATH_SFTP_SERVER "sftp-server.exe"
1732+
#define _PATH_SSH_PROGRAM "ssh.exe"
17301733
#define _PATH_LS "dir"

‎contrib/win32/openssh/paths.targets‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
<OpenSSH-Src-Path>$(SolutionDir)..\..\..\</OpenSSH-Src-Path>
55
<OpenSSH-Bin-Path>$(SolutionDir)..\..\..\bin\</OpenSSH-Bin-Path>
66
<OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path>
7-
<OpenSSL-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\</OpenSSL-Path>
8-
<OpenSSL-Win32-Release-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\Win32\Release\</OpenSSL-Win32-Release-Path>
9-
<OpenSSL-Win32-Debug-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\Win32\Debug\</OpenSSL-Win32-Debug-Path>
10-
<OpenSSL-x64-Release-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\x64\Release\</OpenSSL-x64-Release-Path>
11-
<OpenSSL-x64-Debug-Path>$(SolutionDir)..\..\..\..\OpenSSL\1.0.2d\VS2015\x64\Debug\</OpenSSL-x64-Debug-Path>
7+
<OpenSSL-Path>g:\openssl-1.0.2h-x64\OpenSSLInstallx64_vs2015-debug\</OpenSSL-Path>
8+
<OpenSSL-Win32-Release-Path>g:\openssl-1.0.2h-x86\OpenSSLInstallx86_vs2015\</OpenSSL-Win32-Release-Path>
9+
<OpenSSL-Win32-Debug-Path>g:\openssl-1.0.2h-x86\OpenSSLInstallx86_vs2015-debug\</OpenSSL-Win32-Debug-Path>
10+
<OpenSSL-x64-Release-Path>g:\openssl-1.0.2h-x64\OpenSSLInstallx64_vs2015\</OpenSSL-x64-Release-Path>
11+
<OpenSSL-x64-Debug-Path>g:\openssl-1.0.2h-x64\OpenSSLInstallx64_vs2015-debug\</OpenSSL-x64-Debug-Path>
12+
<OpenSSL-x86-ARM-Release-Path>g:\openssl-1.0.2h-arm-x86\OpenSSLInstallx86_vs2015\</OpenSSL-x86-ARM-Release-Path>
13+
<OpenSSL-x86-ARM-Debug-Path>g:\openssl-1.0.2h-arm-x86\OpenSSLInstallx86_vs2015\</OpenSSL-x86-ARM-Debug-Path>
1214
</PropertyGroup>
1315
</Project>

‎contrib/win32/openssh/scp.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ClCompile Include="$(OpenSSH-Src-Path)scp.c" />
24+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c" />
2425
</ItemGroup>
2526
<ItemGroup>
2627
<ResourceCompile Include="version.rc" />
@@ -116,6 +117,7 @@
116117
<SubSystem>Console</SubSystem>
117118
<GenerateDebugInformation>true</GenerateDebugInformation>
118119
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
120+
119121
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
120122
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
121123
</Link>
@@ -135,6 +137,7 @@
135137
<SubSystem>Console</SubSystem>
136138
<GenerateDebugInformation>true</GenerateDebugInformation>
137139
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
140+
138141
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
139142
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
140143
</Link>
@@ -158,6 +161,7 @@
158161
<EnableCOMDATFolding>true</EnableCOMDATFolding>
159162
<OptimizeReferences>true</OptimizeReferences>
160163
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
164+
161165
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
162166
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
163167
</Link>
@@ -181,6 +185,7 @@
181185
<EnableCOMDATFolding>true</EnableCOMDATFolding>
182186
<OptimizeReferences>true</OptimizeReferences>
183187
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
188+
184189
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
185190
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
186191
</Link>

‎contrib/win32/openssh/scp.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<ClCompile Include="$(OpenSSH-Src-Path)scp.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c">
22+
<Filter>Source Files</Filter>
23+
</ClCompile>
2124
</ItemGroup>
2225
<ItemGroup>
2326
<ResourceCompile Include="version.rc">

‎contrib/win32/openssh/sftp-server.vcxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<ClCompile Include="$(OpenSSH-Src-Path)sftp-common.c" />
2424
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server-main.c" />
2525
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c" />
26+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c" />
2627
</ItemGroup>
2728
<ItemGroup>
2829
<ResourceCompile Include="version.rc" />
@@ -118,7 +119,8 @@
118119
<Link>
119120
<SubSystem>Console</SubSystem>
120121
<GenerateDebugInformation>true</GenerateDebugInformation>
121-
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
122+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
123+
122124
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
123125
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
124126
</Link>

‎contrib/win32/openssh/sftp-server.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c">
28+
<Filter>Source Files</Filter>
29+
</ClCompile>
2730
</ItemGroup>
2831
<ItemGroup>
2932
<ResourceCompile Include="version.rc">

‎contrib/win32/openssh/sftp.vcxproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<ClCompile Include="$(OpenSSH-Src-Path)sftp-common.c" />
2626
<ClCompile Include="$(OpenSSH-Src-Path)sftp-glob.c" />
2727
<ClCompile Include="$(OpenSSH-Src-Path)sftp.c" />
28+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c" />
2829
</ItemGroup>
2930
<ItemGroup>
3031
<ResourceCompile Include="version.rc" />
@@ -120,7 +121,8 @@
120121
<Link>
121122
<SubSystem>Console</SubSystem>
122123
<GenerateDebugInformation>true</GenerateDebugInformation>
123-
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
124+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
125+
124126
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125127
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
126128
</Link>
@@ -140,7 +142,8 @@
140142
<Link>
141143
<SubSystem>Console</SubSystem>
142144
<GenerateDebugInformation>true</GenerateDebugInformation>
143-
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
145+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
146+
144147
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Debug-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
145148
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
146149
</Link>
@@ -163,7 +166,8 @@
163166
<GenerateDebugInformation>false</GenerateDebugInformation>
164167
<EnableCOMDATFolding>true</EnableCOMDATFolding>
165168
<OptimizeReferences>true</OptimizeReferences>
166-
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
169+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
170+
167171
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-Win32-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
168172
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
169173
</Link>
@@ -186,7 +190,8 @@
186190
<GenerateDebugInformation>false</GenerateDebugInformation>
187191
<EnableCOMDATFolding>true</EnableCOMDATFolding>
188192
<OptimizeReferences>true</OptimizeReferences>
189-
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
193+
<AdditionalDependencies>Netapi32.lib;win32iocompat.lib;bcrypt.lib;Userenv.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;openbsd_compat.lib;libssh.lib;win32compat.lib;libeay32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
194+
190195
<AdditionalLibraryDirectories>$(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(OpenSSL-x64-Release-Path)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
191196
<EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
192197
</Link>

‎contrib/win32/openssh/sftp.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<ClCompile Include="$(OpenSSH-Src-Path)sftp.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
33+
<ClCompile Include="$(OpenSSH-Src-Path)win32_dirent.c">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
3336
</ItemGroup>
3437
<ItemGroup>
3538
<ResourceCompile Include="version.rc">

‎contrib/win32/openssh/win32iocompat.vcxproj‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,10 @@
150150
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\signal_sigalrm.c" />
151151
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\signal_sigchld.c" />
152152
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\w32log.c" />
153-
<ClCompile Include="..\win32compat\pwd.c" />
154-
<ClCompile Include="..\win32compat\wmain.c" />
153+
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\pwd.c" />
154+
155+
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\wmain.c" />
156+
155157
</ItemGroup>
156158
<ItemGroup>
157159
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\w32fd.h" />
@@ -170,9 +172,12 @@
170172
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\dlfcn.h" />
171173
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\syslog.h" />
172174
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\signal_internal.h" />
173-
<ClInclude Include="..\win32compat\inc\pwd.h" />
174-
<ClInclude Include="..\win32compat\inc\sys\param.h" />
175-
<ClInclude Include="..\win32compat\inc\utf.h" />
175+
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\pwd.h" />
176+
177+
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\sys\param.h" />
178+
179+
<ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\inc\utf.h" />
180+
176181
</ItemGroup>
177182
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
178183
<ImportGroup Label="ExtensionTargets">

0 commit comments

Comments
 (0)