[X2Go-Commits] [x2goclient] 02/04: Update bundled VcXsrv from 1.15.2.5 to 1.15.2.6

[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 b8975f03be60dc32b698fd00fce0f23ee19723d6
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Fri May 8 19:52:26 2015 -0400

    Update bundled VcXsrv from 1.15.2.5 to 1.15.2.6
    
    Conflicts:
    	debian/changelog
---
 copy-deps-win32.bat |    2 +-
 debian/changelog    |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index bf3405b..a329dc8 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -8,7 +8,7 @@ xcopy /E /Y    D:\x2goclient-contrib\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-r
 xcopy /E /Y    D:\x2goclient-contrib\MSVC-DLLs\2008-9.0.21022.8-x86 %1\
 xcopy /E /Y    D:\x2goclient-contrib\pulse\5.0-rev18_bin %1\
 xcopy /E /Y    D:\x2goclient-contrib\PuTTY\0.64_bin %1\
-xcopy /E /Y /I D:\x2goclient-contrib\VcXsrv\1.15.2.5_bin %1\VcXsrv
+xcopy /E /Y /I D:\x2goclient-contrib\VcXsrv\1.15.2.6_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\
 REM until Win32OpenSSL 1.0.1k comes out
diff --git a/debian/changelog b/debian/changelog
index b438faa..d41943f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ x2goclient (4.0.3.2-20150508) UNRELEASED; urgency=medium
 
   [ Mike DePaulo ]
   * New upstream release (4.0.3.2-20150508):
+    - Windows: Update bundled VcXsrv from 1.15.2.5 (X2Go/Arctica
+      Build) to 1.15.2.6 (X2Go/Arctica Build)
+      The differences relevant to X2Go are:
+        + CVE-2015-3418 was fixed in VcXsrv itself
+        + Font files no longer differ in each build due to timestamp
+          differences
 
  -- 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