[X2Go-Commits] [x2goclient] 03/10: Windows: Upgrade libssh from 0.7.4 to 0.9.3 (while maintaining Pageant support).
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 7 19:01:36 CET 2020
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 05133817e2464e5590bf4ea66a0279c2a992ea26
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Feb 6 15:33:13 2020 +0100
Windows: Upgrade libssh from 0.7.4 to 0.9.3 (while maintaining Pageant support).
Drop libssh_threads library not provided (or used) any longer.
---
copy-deps-win32.bat | 3 +--
debian/changelog | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index 1bdd3fb..f26cda4 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -4,8 +4,7 @@ if "%~3"=="" (
)
xcopy /E /Y %1\cygwin\20180615-1_bin %3\ || exit /b %errorlevel%
del %3\nxproxy.exe.unstripped %3\libXcomp.a %3\libXcomp.dll.a || exit /b %errorlevel%
-xcopy /E /Y %1\libssh\0.7.4-x2go1-mingw482_bin\bin\libssh.dll %3\ || exit /b %errorlevel%
-xcopy /E /Y %1\libssh\0.7.4-x2go1-mingw482_bin\bin\libssh_threads.dll %3\ || exit /b %errorlevel%
+xcopy /E /Y %1\libssh\0.9.3-x2go1-mingw482_bin\bin\libssh.dll %3\ || exit /b %errorlevel%
xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %3\ || exit /b %errorlevel%
xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++-6.dll %3\ || exit /b %errorlevel%
xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %3\ || exit /b %errorlevel%
diff --git a/debian/changelog b/debian/changelog
index 5e7576a..95c06f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -163,6 +163,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
- Windows: remove libz. Was previously used by libzip, which has not been
shipped for quite some time.
- Windows: Update Win32 OpenSSL from 1.0.2n to 1.0.2u. Implicit.
+ - Windows: Upgrade libssh from 0.7.4 to 0.9.3 (while maintaining Pageant
+ support). Drop libssh_threads library not provided (or used) any longer.
* debian/control:
+ Add build-depend on pkg-config.
* x2goclient.spec:
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list