[X2Go-Commits] [x2goclient] 01/01: Upgrade libssh from 0.6.5 to 0.7.0

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 1f3f87f070ebb1f7c71fc07e3973aa4c80480006
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat May 16 07:14:10 2015 -0400

    Upgrade libssh from 0.6.5 to 0.7.0
---
 copy-deps-win32.bat |   24 ++++++++++++------------
 debian/changelog    |   12 ++++++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index 5958b66..8af3885 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -1,16 +1,16 @@
-xcopy /E /Y    D:\x2goclient-contrib\cygwin\20150425-2_bin %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\cygwin\20150425-2_bin %1\
 del %1\nxproxy.exe.unstripped %1\libXcomp.a %1\libXcomp.dll.a
-xcopy /E /Y    D:\x2goclient-contrib\libssh\0.6.5-x2go1-mingw482_bin\bin\libssh.dll %1\
-xcopy /E /Y    D:\x2goclient-contrib\libzip\0.9.3_bin\bin\libzip.dll %1\
-xcopy /E /Y    D:\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %1\
-xcopy /E /Y    D:\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++-6.dll %1\
-xcopy /E /Y    D:\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %1\
-xcopy /E /Y    D:\x2goclient-contrib\MSVC-DLLs\2008-9.0.21022.8-x86 %1\
-xcopy /E /Y    D:\x2goclient-contrib\pulse\6.0-11.1_bin %1\
-xcopy /E /Y    D:\x2goclient-contrib\PuTTY\0.64_bin %1\
-xcopy /E /Y /I D:\x2goclient-contrib\VcXsrv\1.17.0.0-1_bin %1\VcXsrv
-xcopy /E /Y    D:\x2goclient-contrib\zlib\1.2.8_bin\zlib1.dll %1\
-xcopy /E /Y    D:\x2goclient-contrib\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\libssh\0.7.0-x2go1-mingw482_bin\bin\libssh.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\libzip\0.9.3_bin\bin\libzip.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libstdc++-6.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\MSVC-DLLs\2008-9.0.21022.8-x86 %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\pulse\6.0-11.1_bin %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\PuTTY\0.64_bin %1\
+xcopy /E /Y /I C:\x2gobuilds\x2goclient-contrib\VcXsrv\1.17.0.0-1_bin %1\VcXsrv
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\zlib\1.2.8_bin\zlib1.dll %1\
+xcopy /E /Y    C:\x2gobuilds\x2goclient-contrib\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %1\
 REM until Win32OpenSSL 1.0.1k comes out
 xcopy /E /Y    D:\OpenSSL-Win32\bin\ssleay32.dll %1\
 xcopy /E /Y    D:\OpenSSL-Win32\bin\libeay32.dll %1\
diff --git a/debian/changelog b/debian/changelog
index dc02f42..03950c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,10 +47,14 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       also.
     - Windows: Update bundled PuTTY from 0.63 to 0.64.
       In addition to other changes, CVE-2015-2157 has been fixed.
-    - Windows: Update libssh from 0.6.4 to 0.6.5 (while maintaining
-      Pageant support). This fixes CVE-2015-3146.
-      Note that X2Go Client for Windows 4.0.3.2-20150508 has this update
-      also.
+    - Windows: Upgrade libssh from 0.6.4 to 0.7.0 (while maintaining
+      Pageant support).
+      The differences relevant to X2Go are:
+        + CVE-2015-3146 was fixed
+        + Added support for ed25519 keys
+        + Added SHA2 algorithms for HMAC
+      Note that X2Go Client for Windows 4.0.3.2-20150508 has the update
+      to 0.6.5, which fixes the CVE also.
     - Windows: Update bundled nxproxy (nx-libs-lite) from 3.5.0.27 to
       3.5.0.31. (bugfix & feature update)
     - Windows: Update/Upgrade bundled Cygwin components to latest

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git