[X2Go-Commits] [pyhoca-gui] 02/03: Upgrade VcXsrv to 1.15.2.2-xp+vc2013+x2go1

[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 pyhoca-gui.

commit 7a1d83cd84f610221e5adeb9909199010ce9dacc
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Jan 24 01:44:19 2015 -0500

    Upgrade VcXsrv to 1.15.2.2-xp+vc2013+x2go1
    
    Conflicts:
    	debian/changelog
    	setup.py
---
 debian/changelog |    5 +++++
 setup.py         |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fb3b4f5..640b302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ pyhoca-gui (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
   [ Mike DePaulo ]
   * New upstream version (0.5.0.4):
     - Fix win32 build (missing win32gui.pyd) (Fixes: #649)
+    - Windows: Upgrade from VcXsrv-xp 1.14.3.2 to
+      VcXsrv 1.15.2.2-xp+vc2013+x2go1
+      This new major version includes security fixes such as:
+      OpenSSL update to 1.0.1k
+      xorg-server CVE-2014-8091..8103 fixes
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:34:20 +0100
 
diff --git a/setup.py b/setup.py
index 30e4b21..64aeec9 100755
--- a/setup.py
+++ b/setup.py
@@ -267,7 +267,7 @@ if platform.system() == 'Windows':
     dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))]
     nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.5.0.27_cygwin-2014-10-18\\*.*'))]
     pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-5.0-rev18\\*.*'))]
-    xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\VcXsrv-1.15.2.1-xp+vc2013+x2go1')
+    xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\VcXsrv-1.15.2.2-xp+vc2013+x2go1_bin')
 
     icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca')
     img_files = [("img", glob(r'img\\*.*'))]

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