This is an automated email from the git hooks/post-receive script. x2go pushed a change to tag 1.14.3.1 in repository vcxsrv. at 2c826fe (commit) This tag includes the following new commits: new 3691880 Initial work to get VcXsrv to build with MSVC2012 xp compatibility, and for my build environment with cygwin bash. new 0ab0f87 Fix CVE-2013-4396 (2013-10-08). The fix is included in upstream xserver 1.14.4 . new 1c038fd Fix CVE-2013-6462 (2014-01-07). The fix is included in upstream libXfont 1.4.7 . new 0369f4e Switch back from regular NSIS to Unicode NSIS. The upstream VcXsrv project is using the latter. new 2c826fe Bump version string & Date: 1.14.3 (19 Sep 2013) -> 1.14.3.1 (05 Apr 2014) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to tag 1.14.3.1 in repository vcxsrv. commit 0ab0f870694adbca389833d62e4514b92c13e8bc Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 5 11:56:01 2014 -0400 Fix CVE-2013-4396 (2013-10-08). The fix is included in upstream xserver 1.14.4 . --- xorg-server/dix/dixfonts.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index 22c2365..dd77008 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -1459,6 +1459,7 @@ doImageText(ClientPtr client, ITclosurePtr c) GC *pGC; unsigned char *data; ITclosurePtr new_closure; + ITclosurePtr old_closure; /* We're putting the client to sleep. We need to save some state. Similar problem to that handled @@ -1470,12 +1471,14 @@ doImageText(ClientPtr client, ITclosurePtr c) err = BadAlloc; goto bail; } + old_closure = c; *new_closure = *c; c = new_closure; data = malloc(c->nChars * itemSize); if (!data) { free(c); + c = old_closure; err = BadAlloc; goto bail; } @@ -1486,6 +1489,7 @@ doImageText(ClientPtr client, ITclosurePtr c) if (!pGC) { free(c->data); free(c); + c = old_closure; err = BadAlloc; goto bail; } @@ -1498,6 +1502,7 @@ doImageText(ClientPtr client, ITclosurePtr c) FreeScratchGC(pGC); free(c->data); free(c); + c = old_closure; err = BadAlloc; goto bail; } -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to tag 1.14.3.1 in repository vcxsrv. commit 3691880b30d149d27b9116f48069cf6e33bb6ff9 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 5 10:57:08 2014 -0400 Initial work to get VcXsrv to build with MSVC2012 xp compatibility, and for my build environment with cygwin bash. --- buildall.sh | 2 +- freetype/freetype.vcxproj | 8 ++++---- setvcenv.sh | 22 ++++++++++++++-------- xorg-server/installer/packageall.bat | 12 ++++++------ 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/buildall.sh b/buildall.sh index fd79763..3fc7765 100755 --- a/buildall.sh +++ b/buildall.sh @@ -65,7 +65,7 @@ check-error 'Error compiling mhmake for release' MSBuild.exe tools/mhmake/mhmakevc10.sln /t:Build /p:Configuration=Debug /p:Platform=Win32 check-error 'Error compiling mhmake for debug' -export MHMAKECONF=`cygpath -da .` +export MHMAKECONF=`cygpath -wa .` tools/mhmake/release/mhmake $PARBUILD -C xorg-server MAKESERVER=1 DEBUG=1 check-error 'Error compiling vcxsrv for debug' diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index 86d867a..9a2db05 100755 --- a/freetype/freetype.vcxproj +++ b/freetype/freetype.vcxproj @@ -43,7 +43,7 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v110_xp</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -55,7 +55,7 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v110_xp</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -67,7 +67,7 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v110_xp</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -79,7 +79,7 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v110_xp</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> diff --git a/setvcenv.sh b/setvcenv.sh index a016d89..5bc769a 100644 --- a/setvcenv.sh +++ b/setvcenv.sh @@ -1,9 +1,15 @@ -export MHMAKECONF=`cygpath -da .` +export MHMAKECONF=`cygpath -wa .` -export VCINSTALLDIR="c:\Program Files\Microsoft Visual Studio 10.0\VC\\" -export VS100COMNTOOLS="C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\\" -export VSINSTALLDIR="C:\Program Files\Microsoft Visual Studio 10.0\\" -export WindowsSdkDir="C:\Program Files\Microsoft SDKs\Windows\v7.0A\\" -export LIB="c:\Program Files\Microsoft Visual Studio 10.0\VC\lib;c:\Program Files\Microsoft SDKs\Windows\v7.0A\lib" -export INCLUDE="c:\Program Files\Microsoft Visual Studio 10.0\VC\include;c:\Program Files\Microsoft SDKs\Windows\v7.0A\Include" -export PATH="/vcxsrv:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/VC/bin:/cygdrive/c/Program Files/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.0A/bin:$PATH" + +export VisualStudioVersion="11.0" + +export VCINSTALLDIR="c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\\" +export VS100COMNTOOLS="C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\\" +export VS110COMNTOOLS="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\\" +export VSINSTALLDIR="C:\Program Files (x86)\Microsoft Visual Studio 11.0\\" +export WindowsSdkDir="C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0\\" +export WindowsSdkDir_35="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\\" +export WindowsSdkDir_old="C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\\" +export LIB="c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\lib;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\lib" +export INCLUDE="c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include" +export PATH="/vcxsrv:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 11.0/Common7/IDE:/cygdrive/c/Program Files/Microsoft SDKs/Windows/v7.1A/bin:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Program Files (x86)/Windows Kits/8.0/bin/x86/:$PATH" diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index d8b2450..e5e765d 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -8,9 +8,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcp110d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcr110d.dll" -if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi +if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv.nsi + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-debug.nsi ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi @@ -24,9 +24,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcp110d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcr110d.dll" -if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64-debug.nsi +if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64.nsi + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64-debug.nsi ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv-64.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to tag 1.14.3.1 in repository vcxsrv. commit 1c038fd0033fc8ba7dcc6b306ce218640365ffbb Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 5 12:03:22 2014 -0400 Fix CVE-2013-6462 (2014-01-07). The fix is included in upstream libXfont 1.4.7 . --- libXfont/src/bitmap/bdfread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libXfont/src/bitmap/bdfread.c b/libXfont/src/bitmap/bdfread.c index e2770dc..e11c5d2 100644 --- a/libXfont/src/bitmap/bdfread.c +++ b/libXfont/src/bitmap/bdfread.c @@ -338,7 +338,7 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState, char charName[100]; int ignore; - if (sscanf((char *) line, "STARTCHAR %s", charName) != 1) { + if (sscanf((char *) line, "STARTCHAR %99s", charName) != 1) { bdfError("bad character name in BDF file\n"); goto BAILOUT; /* bottom of function, free and return error */ } -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to tag 1.14.3.1 in repository vcxsrv. commit 0369f4edc8c0630f86fe2429d3c68a1aae1d7fdb Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 5 12:58:11 2014 -0400 Switch back from regular NSIS to Unicode NSIS. The upstream VcXsrv project is using the latter. --- xorg-server/installer/packageall.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index e5e765d..d8b2450 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -8,9 +8,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcp110d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcr110d.dll" -if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv.nsi - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-debug.nsi +if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( + "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi + "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi @@ -24,9 +24,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcp110d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcr110d.dll" -if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64.nsi - "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64-debug.nsi +if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( + "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi + "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64-debug.nsi ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv-64.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to tag 1.14.3.1 in repository vcxsrv. commit 2c826fe506bec8ee9aa70b2f7b1b3d823e67b9c6 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 5 13:14:10 2014 -0400 Bump version string & Date: 1.14.3 (19 Sep 2013) -> 1.14.3.1 (05 Apr 2014) --- include/dix-config.h | 2 +- xorg-server/hw/xwin/XWin.rc | 2 +- xorg-server/installer/vcxsrv-64-debug.nsi | 2 +- xorg-server/installer/vcxsrv-64.nsi | 2 +- xorg-server/installer/vcxsrv-debug.nsi | 2 +- xorg-server/installer/vcxsrv.nsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/dix-config.h b/include/dix-config.h index a05707d..0476a01 100644 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -357,7 +357,7 @@ #undef XORG_RELEASE /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((14) * 100000) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((14) * 100000) + ((3) * 1000) + 1) /* Xorg release date */ #define XORG_DATE "10 Sept 2009" diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 38d142f..e15a201 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -47,7 +47,7 @@ BEGIN LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 LTEXT "http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8 LTEXT "marha@users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8 - LTEXT "Version 1.14.3 (19 Sep 2013)", IDC_STATIC, 36, 38, 220, 8 + LTEXT "Version 1.14.3.1 (05 Apr 2014)", IDC_STATIC, 36, 38, 220, 8 DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index 470d9c6..d74f53c 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-64-debug.1.14.3.installer.exe" +OutFile "vcxsrv-64-debug.1.14.3.1.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES64\VcXsrv diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index 9c04e3e..fdd47c6 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-64.1.14.3.installer.exe" +OutFile "vcxsrv-64.1.14.3.1.installer.exe" ; The default installation directory InstallDir $programfiles64\VcXsrv diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 8a3ea20..cbefffa 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-debug.1.14.3.installer.exe" +OutFile "vcxsrv-debug.1.14.3.1.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index f7e02a9..7cebd55 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv.1.14.3.installer.exe" +OutFile "vcxsrv.1.14.3.1.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
-
git-admin＠x2go.org