[X2Go-Commits] [x2goclient] 03/04: Update libssh from 0.6.4 to 0.6.5

[git-admin at x2go.org]

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

x2go pushed a commit to branch release/4.0.3.2-mswin
in repository x2goclient.

commit c68dcf46b80d3b27baedaca6e277b6c77a0a4e51
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Fri May 8 19:59:25 2015 -0400

    Update libssh from 0.6.4 to 0.6.5
    
    Conflicts:
    	debian/changelog
---
 copy-deps-win32.bat |    2 +-
 debian/changelog    |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index a329dc8..ee2ddcd 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -1,6 +1,6 @@
 xcopy /E /Y    D:\x2goclient-contrib\cygwin\20141018-5_bin %1\
 del %1\nxproxy.exe.unstripped %1\libXcomp.a %1\libXcomp.dll.a
-xcopy /E /Y    D:\x2goclient-contrib\libssh\0.6.4-x2go1-mingw482_bin\bin\libssh.dll %1\
+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\
diff --git a/debian/changelog b/debian/changelog
index d41943f..0f847c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ x2goclient (4.0.3.2-20150508) UNRELEASED; urgency=medium
         + CVE-2015-3418 was fixed in VcXsrv itself
         + Font files no longer differ in each build due to timestamp
           differences
+    - Windows: Update libssh from 0.6.4 to 0.6.5 (while maintaining
+      Pageant support). This fixes CVE-2015-3146.
 
  -- Mike DePaulo <mikedep333 at gmail.com>  Fri, 08 May 2015 20:05:00 -0400
 

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