aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* xkb: Check strings length against request sizeOlivier Fourdan2015-02-191-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 bufferOlivier Fourdan2015-02-191-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+x2go1Mike DePaulo2015-01-102-2/+2
|
* Remove accidentally added Makefile.bakMike DePaulo2015-01-101-686/+0
|
* Update openssl to version openssl-1.0.1kMike DePaulo2015-01-10111-3634/+2451
| | | | | Conflicts: openssl/Makefile
* Increase version string to 1.15.2.2-xp+vc2013+x2go1Mike DePaulo2015-01-106-6/+6
|
* Fix CVE-2014-8091..8103. Patches were ported from Ubuntu 14.04 (xorg-server ↵Mike DePaulo2015-01-1057-323/+917
| | | | 1.15.1)
* Call makensis.exe from the PATH1.15.2.1-xp+vc2013+x2go1Mike DePaulo2014-10-181-14/+4
|
* Increase version string to 1.15.2.1-xp+vc2013+x2go1Mike DePaulo2014-10-186-7/+7
|
* Update openssl to version openssl-1.0.1jMike DePaulo2014-10-1893-676/+2019
| | | | | | Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
* Fix for last commit1.15.2.0-xp+vc2013+x2go1Mike DePaulo2014-09-024-4/+4
|
* Simplify the version string: 1.15.2.0-xp+vc2013+x2gochanges1 -> ↵Mike DePaulo2014-09-021-1/+1
| | | | 1.15.2.0-xp+vc2013+x2go1
* Update "About VcXsrv" and update the version string to ↵Mike DePaulo2014-09-025-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 DePaulo2014-09-021-1/+48
|
* Revert permissions changes on 3 OpenSSL filesMike DePaulo2014-09-013-0/+0
|
* Update packages.txt for OpenSSL 1.0.1iMike DePaulo2014-09-011-1/+1
|
* Update OpenSSL from 1.0.1h to 1.0.1iMike DePaulo2014-09-01173-5991/+3405
|
* Update buildall.bat to work with VS express edition. Note that I am not ↵Mike DePaulo2014-09-011-5/+5
| | | | using buildall.bat to build currently.
* Update NSIS scripts to specify that we are "XP Compatible"Mike DePaulo2014-09-014-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.shMike DePaulo2014-09-012-1/+2
|
* Specify that buildall.sh should be called, not buildall.bat.Mike DePaulo2014-09-011-1/+1
|
* Build was successful. Update building.txt for Python 3, which is now required.Mike DePaulo2014-09-011-1/+2
|
* Fix build of mhmakeMike DePaulo2014-09-011-7/+5
|
* Additional changes for XP targeting. From [1b493f] on the xp-fixesonly branch.Mike DePaulo2014-09-012-142/+142
|
* Update building.txt, you need to decide which build script to useMike DePaulo2014-09-011-1/+1
|
* Initial work to get VcXsrv 1.15.2.0 to compile under the MSVC2013 XP targetMike DePaulo2014-09-017-38/+62
|
* Increased to version 1.15.2.01.15.2.0marha2014-07-059-8/+1159
|
* Merge remote-tracking branch 'origin/released'marha2014-07-0486-802/+673
|\
| * fontconfig mesa pixman xserver git update 4 July 2014marha2014-07-0486-802/+673
| | | | | | | | | | | | | | xserver commit a61ca6f006d70343c88fe45206fae0669d1e8971 pixman commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5 fontconfig commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7 mesa commit 9a37eb8adb6558a4abf47774b583cb582a0ae116
* | Synchronised files and solved compilaton errorsmarha2014-07-0115-1054/+4141
| |
* | Merge remote-tracking branch 'origin/released'marha2014-07-0173-1145/+1138
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update 1 July 2014
| * fontconfig mesa pixman git update 1 July 2014marha2014-07-0173-1145/+1138
| | | | | | | | | | | | pixman commit 5a2edb3f2c2cfde6b25ac614e2004a9f78583d74 fontconfig commit dab60e4476ada4ad4639599ea24dd012d4a79584 mesa commit 1bfc0a11027449ae7ab7c28eb695f26de530eccf
* | Update project files to solved compilation problems due to latest mergemarha2014-06-269-2/+38
| |
* | Solved freetype compilation problemsmarha2014-06-26207-418/+418
| |
* | Merge remote-tracking branch 'origin/released'marha2014-06-26344-16740/+29319
|\| | | | | | | | | * origin/released: Updated to freetype 2.5.3
| * Updated to freetype 2.5.3marha2014-06-26344-16740/+29319
| |
* | Merge remote-tracking branch 'origin/released'marha2014-06-26343-1577/+4752
|\| | | | | | | | | | | | | | | * origin/released: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 Conflicts: openssl/Makefile
| * Opdated to openssl-1.0.1hmarha2014-06-26344-1578/+4753
| | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 xserver commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37 libxcb commit 125135452a554e89e49448e2c1ee6658324e1095 libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38 xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca libX11 commit a4679baaa18142576d42d423afe816447f08336c fontconfig commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1 mesa commit 9a8acafa47558cafeb37f80f4b30061ac1962c69
* | Solved compile problems due to latest mergemarha2014-06-083-1/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2014-06-0834-1696/+2558
|\| | | | | | | | | Conflicts: X11/Xwindows.h
| * Updated to libXfont 1.4.8marha2014-06-0817-260/+1055
| |
| * Updated following packages:marha2014-06-0818-1436/+1503
| | | | | | | | | | | | xproto 7.0.26 fontsproto 2.1.3 inputproto 2.3.1
* | Merge remote-tracking branch 'origin/released'marha2014-06-08112-744/+1454
|\| | | | | | | | | | | Conflicts: apps/xwininfo/xwininfo.c xorg-server/hw/xwin/glx/indirect.c
| * xwininfo libX11 mesa mkfontscale xserver git updated 8 June 2014marha2014-06-08112-745/+1456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit e27a839bf0488d5b1cc2e2a887f2ea0e3d790790 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 libxcb/xcb-proto commit 389889e2f95af19e7fc7ac89e7faeb2f28652415 xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e libX11 commit d81fed46144d089bdfa1d916a28dffc9ebffe1e4 libXdmcp commit fe8eab93e9bcdbe8bb8052434bb5e676e3a0ee8f libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 48e541dc2f2fc3f4e99d3e168c28241ff5adff4d xwininfo commit 017b3736489985999d8dcf4d9e473e1fd6dd3647 libXft commit 214f9b5306d833e2787c75fe41dfdc9228fcb738 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 fontconfig commit f44bfad235e63bb792c38e16ae1fbd281ec1453b mesa commit eb58aa9cf015e79a0fcf2e088676e6aa1d5dabce
* | Merge remote-tracking branch 'origin/released'marha2014-05-2931-18068/+22210
|\| | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c
| * mesa xkeyboard-config git update 29 Mar 2014marha2014-05-2931-18068/+22210
| | | | | | | | | | xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e mesa commit dfd117b8570a69a429e660c069997e78b181ab6d
* | Synchronised makefilemarha2014-05-291-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2014-05-252-6/+6
|\|
| * libX11 git update 25 May 2014marha2014-05-252-6/+6
| | | | | | | | libX11 commit c6bc28d433243c32b3f74955f1478451b4fd27b5
* | Merge remote-tracking branch 'origin/released'marha2014-05-2348-4492/+674
|\| | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/gl_gentable.py xorg-server/include/servermd.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 18:55:30 +0000