Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '1.15.2.x' of https://github.com/ArcticaProject/vcxsrv into ↵ | Mike DePaulo | 2015-03-08 | 1 | -2/+4 |
|\ | | | | | | | 1.15.2.x | ||||
| * | Current version is 1.15.2.4-xp+vc2013+x2go1 | Mike DePaulo | 2015-03-08 | 1 | -2/+4 |
| | | |||||
* | | add releasenote_1.15.2.4-xp+vc2013+x2go1 | Mike DePaulo | 2015-03-08 | 1 | -0/+1189 |
| | | |||||
* | | add releasenote_1.15.2.3-xp+vc2013+x2go1 | Mike DePaulo | 2015-03-08 | 1 | -0/+1183 |
| | | |||||
* | | add releasenote_1.15.2.2-xp+vc2013+x2go1 | Mike DePaulo | 2015-03-08 | 1 | -0/+1176 |
| | | |||||
* | | add releasenote_1.15.2.1-xp+vc2013+x2go1 | Mike DePaulo | 2015-03-08 | 1 | -0/+1169 |
| | | |||||
* | | add releasenote_1.15.2.0-xp+vc2013+x2go1 | Mike DePaulo | 2015-03-08 | 1 | -0/+1163 |
|/ | |||||
* | Delete buildall.bat. It hasn't been working for a while. | Mike DePaulo | 2015-03-08 | 1 | -44/+0 |
| | |||||
* | Create README.md | Mike DePaulo | 2015-03-08 | 1 | -0/+48 |
| | |||||
* | Increase version string to 1.15.2.41.15.2.4-xp+vc2013+x2go1 | Mike DePaulo | 2015-02-28 | 6 | -6/+6 |
| | | | | | | | | | Conflicts: xorg-server/hw/xwin/XWin.rc xorg-server/installer/vcxsrv-64-debug.nsi xorg-server/installer/vcxsrv-64.nsi xorg-server/installer/vcxsrv-debug.nsi xorg-server/installer/vcxsrv.nsi | ||||
* | Update packages.txt about openssl 1.0.1k | Mike DePaulo | 2015-02-28 | 1 | -1/+1 |
| | |||||
* | Updated to freetype 2.5.5 | Mike DePaulo | 2015-02-28 | 289 | -19654/+22091 |
| | | | | | | | Conflicts: freetype/src/base/ftbdf.c freetype/src/base/fttype1.c freetype/src/pfr/pfrobjs.c | ||||
* | Increase version string to 1.15.2.3-xp+vc2013+x2go11.15.2.3-xp+vc2013+x2go1 | Mike DePaulo | 2015-02-20 | 6 | -6/+6 |
| | |||||
* | Now using: VS Express -> VS Community Edition. | Mike DePaulo | 2015-02-20 | 1 | -2/+1 |
| | | | | | | Also, community edition is supposed to have the same features as Professional, so we can safely assume that Professional and other commercial editions will work fine. | ||||
* | VS 2013 Update 3 -> VS 2013 Update 4 | Mike DePaulo | 2015-02-20 | 1 | -1/+1 |
| | |||||
* | Correct building.txt in terms of Python | Mike DePaulo | 2015-02-20 | 1 | -3/+4 |
| | |||||
* | xkb: Check strings length against request size | Olivier Fourdan | 2015-02-19 | 1 | -25/+40 |
| | | | | | | | | | | | | Ensure that the given strings length in an XkbSetGeometry request remain within the limits of the size of the request. Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43) (cherry picked from commit f160e722672dbb2b5215870b47bcc51461d96ff1) Signed-off-by: Julien Cristau <jcristau@debian.org> | ||||
* | xkb: Don't swap XkbSetGeometry data in the input buffer | Olivier Fourdan | 2015-02-19 | 1 | -16/+19 |
| | | | | | | | | | | | | | | | | | | | | | | The XkbSetGeometry request embeds data which needs to be swapped when the server and the client have different endianess. _XkbSetGeometry() invokes functions that swap these data directly in the input buffer. However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once (if there is more than one keyboard), thus causing on swapped clients the same data to be swapped twice in memory, further causing a server crash because the strings lengths on the second time are way off bounds. To allow _XkbSetGeometry() to run reliably more than once with swapped clients, do not swap the data in the buffer, use variables instead. Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 81c90dc8f0aae3b65730409b1b615b5fa7280ebd) (cherry picked from commit 29be310c303914090298ddda93a5bd5d00a94945) Signed-off-by: Julien Cristau <jcristau@debian.org> | ||||
* | Fix OpenSSL build - upstream fix for #2091.15.2.2-xp+vc2013+x2go1 | Mike DePaulo | 2015-01-10 | 2 | -2/+2 |
| | |||||
* | Remove accidentally added Makefile.bak | Mike DePaulo | 2015-01-10 | 1 | -686/+0 |
| | |||||
* | Update openssl to version openssl-1.0.1k | Mike DePaulo | 2015-01-10 | 111 | -3634/+2451 |
| | | | | | Conflicts: openssl/Makefile | ||||
* | Increase version string to 1.15.2.2-xp+vc2013+x2go1 | Mike DePaulo | 2015-01-10 | 6 | -6/+6 |
| | |||||
* | Fix CVE-2014-8091..8103. Patches were ported from Ubuntu 14.04 (xorg-server ↵ | Mike DePaulo | 2015-01-10 | 57 | -323/+917 |
| | | | | 1.15.1) | ||||
* | Call makensis.exe from the PATH1.15.2.1-xp+vc2013+x2go1 | Mike DePaulo | 2014-10-18 | 1 | -14/+4 |
| | |||||
* | Increase version string to 1.15.2.1-xp+vc2013+x2go1 | Mike DePaulo | 2014-10-18 | 6 | -7/+7 |
| | |||||
* | Update openssl to version openssl-1.0.1j | Mike DePaulo | 2014-10-18 | 93 | -676/+2019 |
| | | | | | | Conflicts: openssl/Makefile openssl/crypto/opensslconf.h | ||||
* | Fix for last commit1.15.2.0-xp+vc2013+x2go1 | Mike DePaulo | 2014-09-02 | 4 | -4/+4 |
| | |||||
* | Simplify the version string: 1.15.2.0-xp+vc2013+x2gochanges1 -> ↵ | Mike DePaulo | 2014-09-02 | 1 | -1/+1 |
| | | | | 1.15.2.0-xp+vc2013+x2go1 | ||||
* | Update "About VcXsrv" and update the version string to ↵ | Mike DePaulo | 2014-09-02 | 5 | -7/+7 |
| | | | | 1.15.2.0-xp+vc2013+x2gochanges1 (A simplified version of the branch name) | ||||
* | Incorporate winmultiwindow.patch from Oleksandr Shneyder (phoca GmbH) | Mike DePaulo | 2014-09-02 | 1 | -1/+48 |
| | |||||
* | Revert permissions changes on 3 OpenSSL files | Mike DePaulo | 2014-09-01 | 3 | -0/+0 |
| | |||||
* | Update packages.txt for OpenSSL 1.0.1i | Mike DePaulo | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Update OpenSSL from 1.0.1h to 1.0.1i | Mike DePaulo | 2014-09-01 | 173 | -5991/+3405 |
| | |||||
* | Update buildall.bat to work with VS express edition. Note that I am not ↵ | Mike DePaulo | 2014-09-01 | 1 | -5/+5 |
| | | | | using buildall.bat to build currently. | ||||
* | Update NSIS scripts to specify that we are "XP Compatible" | Mike DePaulo | 2014-09-01 | 4 | -8/+8 |
| | | | | | | | | Conflicts: xorg-server/installer/vcxsrv-64-debug.nsi xorg-server/installer/vcxsrv-64.nsi xorg-server/installer/vcxsrv-debug.nsi xorg-server/installer/vcxsrv.nsi | ||||
* | Call setvcenv.sh from buildall.sh | Mike DePaulo | 2014-09-01 | 2 | -1/+2 |
| | |||||
* | Specify that buildall.sh should be called, not buildall.bat. | Mike DePaulo | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Build was successful. Update building.txt for Python 3, which is now required. | Mike DePaulo | 2014-09-01 | 1 | -1/+2 |
| | |||||
* | Fix build of mhmake | Mike DePaulo | 2014-09-01 | 1 | -7/+5 |
| | |||||
* | Additional changes for XP targeting. From [1b493f] on the xp-fixesonly branch. | Mike DePaulo | 2014-09-01 | 2 | -142/+142 |
| | |||||
* | Update building.txt, you need to decide which build script to use | Mike DePaulo | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Initial work to get VcXsrv 1.15.2.0 to compile under the MSVC2013 XP target | Mike DePaulo | 2014-09-01 | 7 | -38/+62 |
| | |||||
* | Increased to version 1.15.2.01.15.2.0 | marha | 2014-07-05 | 9 | -8/+1159 |
| | |||||
* | Merge remote-tracking branch 'origin/released' | marha | 2014-07-04 | 86 | -802/+673 |
|\ | |||||
| * | fontconfig mesa pixman xserver git update 4 July 2014 | marha | 2014-07-04 | 86 | -802/+673 |
| | | | | | | | | | | | | | | xserver commit a61ca6f006d70343c88fe45206fae0669d1e8971 pixman commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5 fontconfig commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7 mesa commit 9a37eb8adb6558a4abf47774b583cb582a0ae116 | ||||
* | | Synchronised files and solved compilaton errors | marha | 2014-07-01 | 15 | -1054/+4141 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2014-07-01 | 73 | -1145/+1138 |
|\| | | | | | | | | | * origin/released: fontconfig mesa pixman git update 1 July 2014 | ||||
| * | fontconfig mesa pixman git update 1 July 2014 | marha | 2014-07-01 | 73 | -1145/+1138 |
| | | | | | | | | | | | | pixman commit 5a2edb3f2c2cfde6b25ac614e2004a9f78583d74 fontconfig commit dab60e4476ada4ad4639599ea24dd012d4a79584 mesa commit 1bfc0a11027449ae7ab7c28eb695f26de530eccf | ||||
* | | Update project files to solved compilation problems due to latest merge | marha | 2014-06-26 | 9 | -2/+38 |
| | | |||||
* | | Solved freetype compilation problems | marha | 2014-06-26 | 207 | -418/+418 |
| | |