commit c3a7903f6a6a27e53ba0372408e0c5a68c608e86
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 11 16:27:10 2008 +0200

    Bump to 1.4.2
    
    And update release date.

commit 08e6292e7efff518730e3c54f3a082c6139d618d
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Jun 8 11:16:23 2008 -0600

    CVE-2008-1379 - MIT-SHM arbitrary memory read
    
    An integer overflow in the validation of the parameters of the
    ShmPutImage() request makes it possible to trigger the copy of
    arbitrary server memory to a pixmap that can subsequently be read by
    the client, to read arbitrary parts of the X server memory space.

commit 8ffaf613705a915c4b53ae11096dacd786fd1d22
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Jun 8 11:16:55 2008 -0600

    CVE-2008-1377 - RECORD and Security extensions memory corruption
    
    Lack of validation of the parameters of the
    SProcSecurityGenerateAuthorization SProcRecordCreateContext
    functions makes it possible for a specially crafted request to trigger
    the swapping of bytes outside the parameter of these requests, causing
    memory corruption.

commit 702e709973252d596be736c2f5c0de4837446501
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Jun 8 11:15:39 2008 -0600

    CVE-2008-2362 - RENDER Extension memory corruption
    
    Integer overflows can occur in the code validating the parameters for
    the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
    and SProcRenderCreateConicalGradient functions, leading to memory
    corruption by swapping bytes outside of the intended request
    parameters.

commit c4937bbb697579ceff0e30b17aca409f56e78566
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Jun 8 11:14:31 2008 -0600

    CVE-2008-2361 - RENDER Extension crash
    
    An integer overflow may occur in the computation of the
    size of the  glyph to be allocated by the ProcRenderCreateCursor()
    function  which will cause less memory to be allocated than expected,
    leading later to dereferencing  un-mapped memory, causing a crash of
    the X server.

commit b1a4a96885bf191d5f4afcfb2b41a88631b8412b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Jun 8 11:13:47 2008 -0600

    CVE-2008-2360 - RENDER Extension heap buffer overflow
    
    An integer overflow may occur in the computation of the size of the
    glyph to be allocated by the AllocateGlyph() function which will cause
    less memory to be allocated than expected, leading to later heap
    overflow.
    
    On systems where the X  SIGSEGV handler includes a stack trace, more
    malloc()-type functions are called, which may lead to other
    exploitable issues.

commit 43285b4f72a0eb47aa0c33e4e41cd10434969991
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Tue Jun 10 18:36:38 2008 +0300

    Bump to 1.4.1
    
    Whatever.  It doesn't have to be perfect.

commit 4d59afd613cd7e82255fc83e921300f6bd3a7552
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Tue Jun 10 18:33:57 2008 +0300

    Xi: event_{x,y} should refer to the extended device (bug #16289)
    
    ProcessOtherEvents was unconditionally stomping the root_{x,y}
    co-ordinates provided by GetPointerEvents with those of the core
    pointer, meaning that both root_{x,y} and event_{x,y} reported to
    clients would reflect the sprite's position, not the position reported
    by the device that generated the DeviceMotionNotify or the
    DeviceButton{Press,Release} event in the first place.
    
    For key events we still take the sprite's co-ords, as we're delivering
    to the focus, which is the (VCP) sprite.
    
    Not cherry-picked from master as MPX fixes this anyway, by taking the
    co-ords of the sprite the device moves (be it visible or no).
    (cherry picked from commit 8259d19f7155d82197ecc2aa16b316376c2dcb12)

commit 7982aaa7f071f9a21ad402da872d5328bd7e51ff
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date:   Fri May 30 19:30:06 2008 +0200

    Fix getValuatorEvents to compute number of valuators correctly.

commit ddcca23a81abf5215f906a7ad097f1ed088ed92b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Thu Feb 7 15:48:04 2008 +1030

    xkb: when copying the keymap, make sure the structs default to 0/NULL.
    
    It actually does help if a pointer is NULL rather than pointing to nirvana
    when you're trying to free it lateron. Who would have thought?
    (cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
    (cherry picked from commit 0b0a09797302ac2171db5df20fc5110aafc8efbb)

commit 4e5cf76ecaa6b20f825738b07c257f4929e4652a
Author: Mart Raudsepp <mart.raudsepp@artecdesign.ee>
Date:   Fri May 16 20:06:31 2008 +0300

    xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
    
    (cherry picked from commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c)
    (cherry picked from commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd)
    ... and backported to 1.4 (back to no new devprivates and "amd" driver name)

commit 22b1a9dd0f68e3307cdcf3e6f8fcaeda34acd483
Author: Michel Dänzer <michel@tungstengraphics.com>
Date:   Thu Oct 18 17:44:48 2007 +0200

    EXA: Skip empty glyphs. (cherry picked from commit ce50bfd3369686cfecee5a138bd84ef1107a249d)

commit 2989f1071648770b5bbbfd80979f04d949f3dc57
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri May 16 19:49:05 2008 +0300

    Prevent the -wm command line option from causing a SEGV
    
    The -wm (when mapped) option for the BackingStore support has been
    causing the server to dereference a NULL pointer.
    
    This has probably been the case since backing store has been
    implemented on top of Composite.
    
    It looks like (some of?) Composite didn’t expect its WIndowPtr
    argument to be the root window.
    
    In Composite’s compCheckRedirect() function we now avoid calling
    compAllocPixmap() and compFreePixmap() when the pWin pointer’s
    parent member is NULL, as is it the case with a server’s root window.
    
    This addresses:
    
    https://bugs.freedesktop.org/show_bug.cgi?id=15878
    (cherry picked from commit 04211c3532ca078420e3745a5eac3d9de120bc32)

commit 33a9ee9ba0ab44548afafa965bbd0a715cb1509c
Author: Adam Jackson <ajax@redhat.com>
Date:   Mon Mar 24 12:22:19 2008 -0400

    Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
    (cherry picked from commit 536f2ff5382aaaace3b55481e15366bb15d87801)

commit a08f848d4cd4c8c6e055a1182542d053a0a32c6b
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date:   Sun Nov 18 11:57:01 2007 -0500

    Bump DEFAULT_DPI to 96.
    
    75 is just nonsense.
    (cherry picked from commit db9ae863536fff80b5463d99e71dc47ae587980d)

commit d5a7badd6a0ea4ecbe76f0205aa53b42f7cd90dc
Author: Adam Jackson <ajax@redhat.com>
Date:   Mon May 5 14:37:07 2008 -0400

    Fix hal shutdown crash.
    
    Removing the device invalidates its ->next pointer.  Copy it aside before
    destroying the device.
    (cherry picked from commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d)

commit 458b487723a7beb792857c920e9be22c2ce4625d
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Aug 17 12:14:16 2007 -0700

    Fix overly-restrictive integer overflow check in EXA pixmap creation.
    
    The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
    created, due to treating a pitch value as a width.
    (cherry picked from commit bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98)

commit 2621380cf680941a0423d64d827fb3513545ebf5
Author: Michel Dänzer <michel@tungstengraphics.com>
Date:   Thu Mar 20 09:18:29 2008 -0400

    Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
    
    This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
    platforms) fixes it for me with the radeon driver and doesn't break intel.
    
    Correct patch this time :)
    (cherry picked from commit da973e962d09854b571320dee7dd9569060bc39e)

commit 9db5401d69f1fab8db4bdd166536a25e4516e231
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date:   Thu May 8 00:08:12 2008 -0700

    xprint: fix linking by including XSERVER_LIBS.

commit 1022c7774b0a92946e87c61aa79b076a6ffe95ff
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date:   Thu May 8 00:07:57 2008 -0700

    xprint: fix build by adding {New,Delete}InputDeviceRequest.

commit 9df3886354152250983171825daeb93a6a845369
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date:   Thu May 8 00:06:16 2008 -0700

    xephyr: fix linking by adding pixman and using XSERVER_LIBS.

commit 6c5c1c5c9819fe9a5f2e2a6995017e414662d6cf
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date:   Thu May 8 00:05:00 2008 -0700

    dmx: link in XSERVER_LIBS.

commit 71f0711f40d825de3f1a7a09de78c6181fb3a521
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date:   Thu May 8 00:04:36 2008 -0700

    dmx: fix build by adding {New,Delete}InputDeviceRequest.

commit d0554a57489e272233bcb38cb453f2c0bc0b1729
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Tue May 13 16:39:30 2008 -0700

    When XKB fails to open rules file, log the file name, not the NULL file pointer
    (cherry picked from commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0)

commit 3f8ba890762513edc7eddbbbd4bb26f908540c8d
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun May 11 23:17:27 2008 +0200

    kdrive: allow disabling Composite
    
    KdInitOutput() used to enable Composite when it was disabled by default,
    but now this hack prevents ``-extension Composite'' from working.
    Remove it, as Composite is enabled by default anyway.
    (cherry picked from commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082)

commit 104048501f37b139d4113562ef1711978cc76018
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Wed May 7 23:11:31 2008 +0300

    XKB: Actually explain keymap failures
    
    When something went wrong building a keymap, try to explain to the user
    what it actually was, instead of the dreaded 'Failed to load XKB keymap'
    catch-all.
    (cherry picked from commit cf20df39cc78203d17b99223908af388ecbf7d0e)
    
    Conflicts:
    	xkb/ddxLoad.c

commit b1145a6b428db2037c79ffb36116e7183f30829f
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date:   Sat Feb 2 23:04:46 2008 +0100

    dix: Move motion history update until after screen crossing and clipping
    
    Cross screen and clip the coordinates before updating the motion history
    so that it will have the same contents as the events that are reported.
    (cherry picked from commit a56ef7aaa4b6ac13c8181f68fc7dad3ca89e6973)

commit a68d0ef4a65bcd52c52ba54e6925082a9145fad3
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date:   Sat Feb 2 23:03:51 2008 +0100

    dix: Skip call to clipAxis for relative core-events
    
    Relative events that generates both core and extention
    events will have its axis cliped and screen changed by
    miPointerSetPosition when the events are processed. For
    absolute and non core-generating relative events the
    axis must be clipped if we shouldn't end up completely
    outside the defined ranges (if any).
    (cherry picked from commit a0284d577aabea8406b72dd63773e341430ebe56)

commit b51ca35a7578b64190f663dc825d7fb551b92e73
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date:   Sat Feb 2 22:57:32 2008 +0100

    Bug # 10324: dix: Add scaling of X and Y on the reported pointer-events
    
    Restore the rescaling code for x and y axis when generating
    motion events.
    (cherry picked from commit d9e23c4ff1607a62164b34717ef9afd352ce2b94)

commit 1d79ba8193e9584370ffaaa8dffb4db604125dea
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date:   Sat Feb 2 22:45:31 2008 +0100

    Bug # 10324: dix: Allow arbitrary value ranges in GetPointerEvents
    
    Don't use a possitive value as a marker for if a max-value
    is defined on the valuators. Use the existence of a valid
    value range instead. This will also make it possible to
    define arbitrary start and end-values for min and max as
    long as min < max.
    (cherry picked from commit f04c0838699f1a733735838e74cfbb1677b15dc4)

commit 7fa7031cfa9145f55881b87bc39f6e2c8a49ff76
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date:   Sat Feb 2 22:44:31 2008 +0100

    dix: Always add valuator information if present
    
    Send valuator information for all event types, not only for
    MotionEvents and absolute button events.
    (cherry picked from commit 12e532403210c15a25200ef448bfe9701735ab20)

commit b95befdfd2c9bcb6b0cd896f2b8dfaaeb129dbff
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Fri Dec 7 17:28:37 2007 -0800

    Check for <sys/sdt.h> as well when determining to enable dtrace probes
    
    Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
    named dtrace installed, but not the dynamic tracing facility named dtrace

commit 0fab9843c7b553bb59d57e68d9c3ea2d754bf809
Author: Ben Byer <bbyer@bbyer.apple.com>
Date:   Fri Sep 21 17:07:36 2007 -0700

    So, like, checking return codes of system calls (signal, etc) is good.
    Also, only restore an old signal handler if one was actually set
    (prevents the server from dying on OS X).

commit a02b989c68864a7388553fb96e4fbaf91f941c4a
Author: Eric Anholt <eric@anholt.net>
Date:   Wed Sep 12 13:23:13 2007 +0000

    Fix build on FreeBSD after Popen changes.

commit 6a5066c2e9e872d4ef85ec70745c34d93580177e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date:   Tue Sep 11 11:37:06 2007 -0400

    Ignore - not just block - SIGALRM around Popen()/Pclose().
    
    Because our "popen" implementation uses stdio, and because nobody's stdio
    library is capable of surviving signals, we need to make absolutely sure
    that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
    open a menu in openoffice, and it recompiles XKB to deal with the
    accelerators, and you popen xkbcomp because we suck, then the scheduler
    will tell you you're taking forever doing something stupid, and the
    wait() code will get confused, and input will hang and your CPU usage
    slams to 100%.  Down, not across.

commit ff4006bd5a71d39cc5655679447c5c47a99a2751
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Tue Jan 29 10:01:37 2008 +1030

    xfree86: fix AlwaysCore handling. (Bug #14256)
    
    Assume AlwaysCore being set by default, just like the other options.
    
    X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
    (cherry picked from commit 5b8641a5fdc112c19e78ca2954878712e328d403)

commit fdfb57d342da0ace14eed635804ebc31441240c5
Author: Thomas Jaeger <thjaeger@gmail.com>
Date:   Tue Apr 1 15:27:06 2008 +0300

    XKB: Fix processInputProc wrapping
    
    If input processing is frozen, only wrap realInputProc: don't smash
    processInputProc as well.  When input processing is thawed, pIP will be
    rewrapped correctly.
    
    This supersedes the previous workaround in 50e80c9.
    
    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
    (cherry picked from commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96)

commit 6afcf996cade0c9464d6af9b04b177b1de138cfd
Author: Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
Date:   Tue Oct 23 16:45:13 2007 +0200

    EXA: Fix off-by-one in polyline drawing.
    (cherry picked from commit d502521c3669f3f22b94c39a64ab63bfd92c6a97)

commit 9e9eeca2b094fa9edb9c20002d42aeafb14ad1e4
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date:   Thu Apr 10 21:36:19 2008 +0200

    Fixed configure.ac for autoconf 2.62.
    (cherry picked from commit 3c337e18b933881e22b0d03312511f1d23a8640b)

commit dd6b0de38d649617600a8357e576955c9b831328
Author: Hasso Tepper <hasso@estpak.ee>
Date:   Mon Apr 7 14:09:04 2008 +0300

    configure.ac: DragonFly BSD support
    
    Add support for DragonFly BSD, which is just the same as FreeBSD for all
    of these cases.
    (cherry picked from commit 0f87b41a432a6472a15ec0c9dee997e3bddbd0f2)

commit 76b950cd6e03f0060afe463871de4570fca90213
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date:   Thu Aug 16 11:20:12 2007 -0500

    Add some more support for DragonFly. From Joerg Sonnenberger
    and pkgsrc.
    (cherry picked from commit 1d4bea6106d7a1c83e1dfe37fad8268589feaa0b)

commit a65d4aed06acd839fb21153f74144498abda3e18
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date:   Wed Feb 27 16:49:34 2008 +0000

    Fix context sharing between direct/indirect contexts

commit 44f46bfb981ca69515dafc520f62f33654711194
Author: Matthias Hopf <mhopf@suse.de>
Date:   Mon Jan 21 16:13:21 2008 +0100

    CVE-2007-6429: Always test for size+offset wrapping.

commit bcbfd619f8da888224afd80ee3a2db7d500523eb
Author: Kristian Høgsberg <krh@redhat.com>
Date:   Wed Jan 16 20:24:11 2008 -0500

    Don't break grab and focus state for a window when redirecting it.
    
    Composite uses an unmap/map cycle to trigger backing pixmap allocation
    and cliprect recomputation when a window is redirected or unredirected.
    To avoid protocol visible side effects, map and unmap events are
    disabled temporarily.  However, when a window is unmapped it is also
    removed from grabs and loses focus, but these state changes are not
    disabled.
    
    This change supresses the unmap side effects during the composite
    unmap/map cycle and fixes this bug:
    
      http://bugzilla.gnome.org/show_bug.cgi?id=488264
    
    where compiz would cause gnome-screensaver to lose its grab when
    compiz unredirects the fullscreen lock window.

commit dc30ade6496c7cc24e38c419e229159525fe042f
Author: Maarten Maathuis <madman2003@gmail.com>
Date:   Sun Feb 17 18:47:28 2008 +0100

    Fix rotation for multi-monitor situation.
    
    - The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
    - Fix bug #13787.
    (cherry picked from commit a48cc88ea2674c28b69b8d738b168cbafcf4001f)

commit 3db5930c61aeb849de3b21e7ba0d86d3c0cf72bb
Author: Maarten Maathuis <madman2003@gmail.com>
Date:   Sun Feb 17 11:21:01 2008 +0100

    Resize composite overlay window when the root window changes.
    
    - This allows some compositing managers to work, even after randr12 has changed the root window size.
    - Thanks to ajax for figuring out the best place to put this.
    - Example:
    	- xf86RandR12SetMode() calls EnableDisableFBAccess().
    	- That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize().
    	- The final step is the call to PositionWindow().
    (cherry picked from commit 70c0592a97c7dc9db0576d32b3bdbe4766520509)

commit 74b40bba327a2e97780e8e3f995f784add2d6231
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date:   Thu Feb 14 19:47:44 2008 -0500

    security: Fix for Bug #14480: untrusted access broken in 7.3.

commit bc72ef3a159efd67067322c043bba444869dc356
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Wed Jan 30 10:39:54 2008 +1030

    xkb: don't update LEDs if they don't exist. (Bug #13961)
    
    In some weird cases we call this function when there is no SrvLedInfo on the
    device. And it turns out null-pointer dereferences are bad.
    
    X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961>
    (cherry picked from commit d954f9c80348de294602d931d387e5cd1ef4b9a5)

commit e98027c3ac7195fec665ef393d980b02870ca1b8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Tue Dec 18 13:57:07 2007 +1030

    dix: set the correct number of valuators in valuator events.
    
    (first_valuator + num_valuators) must never be larger than the number of axes,
    otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
    wrong too.
    (cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e)

commit b6d4cdf64f43ae805beada6122c8be2ed138742c
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri Jan 18 14:41:20 2008 -0500

    CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
    
    Move size validation after depth validation, and only validate size if
    the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
    protected from overflow by the width and height checks.
    (cherry picked from commit e9fa7c1c88a8130a48f772c92b186b8b777986b5)

commit 19b95cdd1d14a1e7d1abba1880ab023c96f19bf5
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date:   Thu Jan 17 17:03:39 2008 +0100

    Fix for CVE-2007-5958 - File existence disclosure.

commit f09b8007e7f6e60e0b9c9665ec632b578ae08b6f
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date:   Thu Jan 17 15:29:06 2008 +0100

    Fix for CVE-2008-0006 - PCF Font parser buffer overflow.

commit 8b14f7b74284900b95a319ec80c4333e63af2296
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date:   Thu Jan 17 15:28:42 2008 +0100

    Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.

commit d244c8272e0ac47c41a9416e37293903b842a78b
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date:   Thu Jan 17 15:27:34 2008 +0100

    Fix for CVE-2007-6427 - Xinput extension memory corruption.

commit 4848d49d05a318559afe7a17a19ba055947ee1f5
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date:   Thu Jan 17 15:28:03 2008 +0100

    Fix for CVE-2007-6428 - TOG-cup extension memory corruption.

commit 59a3b83922c810316a374a19484b24901c7437ae
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date:   Thu Jan 17 15:26:41 2008 +0100

    Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index

commit 636aa9e7be2822a0148067a11499ad48fe682cd9
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Jan 5 10:47:39 2008 +0200

    Xephyr: One-time keyboard leak fix
    
    Don't leak the originally-allocated keysym map.
    (cherry picked from commit e85130c85f727466fc27be1cfa46c88b257499fb)

commit 8a3acd3ec41b887b4aeaa0b2932265522c1e2836
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Jan 5 10:43:53 2008 +0200

    XKB: XkbCopyKeymap: Don't leak all the sections
    
    Previously, we'd just keep num_sections at 0, which would break the
    geometry and lead us to leak sections.  Don't do that.
    (cherry picked from commit 0137b0394a248f694448a7d97c9a1a3efcf24e81)

commit 02e805f0ff4b6af551372ba5fc5fb369c8834d1d
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Jan 5 10:38:16 2008 +0200

    OS: IO: Zero out client buffers
    
    For alignment reasons, we can write out uninitialised bytes, so allocate
    the whole thing with xcalloc.
    (cherry picked from commit b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2)

commit 60144ac814ee26e151186f7c93cb1a273468d497
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Wed Dec 19 16:20:36 2007 +1030

    include: never overwrite realInputProc with enqueueInputProc. Bug #13511
    
    In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
    can overwrite the device's realInputProc with the enqueueInputProc. When the
    grab is released and the events are replayed, we end up in an infinite loop.
    Each event is replayed and in replaying pushed to the end of the queue again.
    
    This fix is a hack only. It ensures that the realInputProc is never
    overwritten with the enqueueInputProc.
    
    This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
    (cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335)
    (cherry picked from commit 50e80c39870adfdc84fdbc00dddf1362117ad443)

commit 102c012c206cbb3bbf0fa5b0c8f0ce2ce9bba72a
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Dec 28 15:49:50 2007 +0200

    Input: Don't reinit devices
    
    If a device is already initialised (i.e. the virtual core devices) during
    IASD, don't init them again.  This fixes a leak.
    (cherry picked from commit 1f6015c8fe62c28cfaa82cc855b5b9c28fd34607)

commit a304fc1d4a7062f65161ef8748fd358639ec73de
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Dec 28 15:48:57 2007 +0200

    KDrive: Xephyr: Don't leak screen damage structure
    (cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5)

commit 38d8cfaaff0ae6273d9e921aae08b2706355f0d2
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Dec 28 15:48:25 2007 +0200

    OS: Don't leak connection translation table on regeneration
    (cherry picked from commit e868e0bc0d2318e62707d3ae68532b0029959154)

commit 30fc8053a5e734c3b70156bdae94fd7d5d7865a5
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Dec 28 15:47:57 2007 +0200

    Config: HAL: Don't leak options on failure to add device
    
    This showed up in Xephyr in particular, which denies new device requests.
    (cherry picked from commit 2bb199056edf6c63cf978d1a8ad49a57ce1938f3)

commit 81c5950d0af8d5859f850b98c98a532784e9a757
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Dec 28 15:47:21 2007 +0200

    Config: D-Bus: Don't leak timers
    
    TimerCancel doesn't free the timer: you need TimerFree for that.
    (cherry picked from commit 25deaa7e6b29b3913b35efa39b9c8b25de5e6d95)

commit d988da6eee8422774dff364050bf431b843a714a
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date:   Thu Dec 13 00:09:08 2007 +0200

    Xprint: Clean up generated files
    
    Remember to clean generated wrapper files.
    (cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3)

commit 41f735fbe02f59bc7bcca335c6e743c72c2fc44c
Author: Hong Liu <hong.liu@intel.com>
Date:   Tue Sep 4 08:46:46 2007 +0100

    bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
    
    This patch should fix bug 8080.
    (cherry picked from commit 9adea807038b64292403ede982075fe1dcfd4c9a)

commit f4bcb53e86bb103b6bcf8a3a170a36137c34d272
Author: Hong Liu <hong.liu@intel.com>
Date:   Wed Dec 5 17:48:28 2007 +0100

    Bug 13308: Verify and reject obviously broken modes.
    (cherry picked from commit c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1)

commit d63efecc9471ac53535932b80a85b7f408f06fb9
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Wed Dec 12 21:57:59 2007 +0200

    Bump to 1.4.0.90

commit 446efcc554195970cb3ddcd992f7aac617d45b1d
Author: Bartosz Fabianowski <freebsd@chillt.de>
Date:   Fri Dec 7 02:38:14 2007 +0000

    Input: Fix proximity events with valuators
    
    Initialise num_events to 1, so we always send a proximity event, and then
    optionally valuator events.  Also make sure mieq can deal with valuator
    events sent after proximity events.
    (cherry picked from commit 2dcfab37d38c0c72e9be7cc724047405c8029e88)

commit 9f4689173ef9db080592497dc2212ae79b8d6e02
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Thu Dec 6 00:46:32 2007 +0000

    KDrive: Xephyr: Fix non-GLX builds
    
    Only set noGlxExtension if we're actually building GLX.

commit d37351308b255d5f9bff3438b6767c62974902da
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Wed Dec 5 19:37:48 2007 +0000

    XKB: Actions: Don't run certain actions on the core keyboard
    
    Don't run VT switches, terminations, or anything, on the core keyboard: only
    run actions which affect the keyboard state.  If we get an action such as VT
    switch, just swallow the event.
    (cherry picked from commit 320abd7d1d906807448fa01ad3377daf707f46cc)

commit 27da1367c9ea143946b8b8d3dbd0f9d44c4a9039
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Wed Dec 5 19:36:59 2007 +0000

    WaitForSomething: Ignore EAGAIN
    
    If select ever returns EAGAIN, don't bother complaining.
    (cherry picked from commit 85dd8efac1bc0715f03c99d261b1c5d0980623e1)

commit 259f86b13b453f3503afd3d523de32b43996d334
Author: Rich Coe <Richard.Coe@med.ge.com>
Date:   Wed Dec 5 19:36:37 2007 +0000

    OS: Connection: Keep trying select while it gets interrupted (bug #9240)
    
    If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
    than shutting clients down on either of these errors.
    (cherry picked from commit b7f3618f3933a810778093fd47564a1e3bf3fde6)

commit 90649e6a39dc6caad8313b25ef869a089f81aba7
Author: Rich Coe <Richard.Coe@med.ge.com>
Date:   Wed Dec 5 19:31:07 2007 +0000

    OS: Connection: Don't shut down disappeared clients (bug #7876)
    
    If a client disappears in the middle of CheckConnections (presumably
    because its appgroup leader disappears), then don't attempt to shut it down
    a second time, when it's already vanished.
    (cherry picked from commit d8b2cad3771a09860e7be1726f67e684cf7caeec)

commit 25d26b55e74b50a2fd0632329cb0bdca017fe8e6
Author: Kanru Chen <koster@debian.org.tw>
Date:   Mon Dec 3 12:46:45 2007 +0000

    Config: HAL: Fix XKB option parsing
    
    Actually combine the XKB options into a string, rather than just repeatedly
    writing a comma.
    (cherry picked from commit da893908feb2dcf7c22420b3426ab3ac65c7ca99)

commit b037e4a5abb878ad89e7f27c2b6c23004625f6c3
Author: Peter Harris <peter.harris@hummingbird.com>
Date:   Mon Oct 29 18:05:19 2007 -0400

    Add missing swaps in panoramiXSwap.c
    (cherry picked from commit cb67a10b7f6f564e0345de19316934361ea28720)

commit 3e0993fcf38e47dd42c27a2dcb5dde7d23222ca8
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Nov 30 20:35:26 2007 +0200

    ProcessOtherEvent: Don't do double translation of button events
    
    We already deal with the button mapping in GetPointerEvents, so don't
    do the remapping again in ProcessOtherEvent.
    (cherry picked from commit 7ff002fe3e229330216d7f2ff16cdabe63014bcd)

commit cbf775cde7bb737ddf71fa3aa5b08c859d516084
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Sat Nov 17 22:50:07 2007 +0100

    XKB: Generate correct key repeat events (bug #13114)
    
    Make sure we send the correct event for the type of device when we're
    sending key repeat events, which stops repeats being sent to incorrect
    windows.

commit 3e987ea670aadefeb3a6ad05d9a39dd7902985f9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date:   Thu Oct 18 17:44:14 2007 +0200

    EXA: Don't attempt to move in pixmaps that can't be accelerated.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
    
    (Related to commit 5d74416740de883b7ef0994afea4bbd4d3901be0 on master.)

commit 75b9dc907b332d64d074083cae0c6b099960f09b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date:   Thu Sep 27 13:08:41 2007 +0200

    EXA: Make sure tile offsets passed to drivers are never negative.
    
    Thanks to Björn Steinbrink for pointing out the problem on IRC.
    
    (cherry picked from commit 006f6525057970a74382132237b2131286ad147c with
     modifications.)

commit 732d586b0919e57ed836999f4117db3e776e2934
Author: Michel Dänzer <michel@tungstengraphics.com>
Date:   Thu Sep 27 13:08:40 2007 +0200

    EXA: Punt on fallback case not handled correctly in exaFillRegionTiled.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=12520 .
    
    (From master commit c7d6d1f5, modified to suit.)

commit a3aed33244914b64d08630e19100c71ab81e1a81
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Nov 17 22:34:47 2007 +0100

    XKB: Don't ring the bell when we don't have a BellProc (bug #13246)
    (cherry picked from commit 55888552769ce6361174285b09dfb78ee22c170d)

commit f3a5d67688a0f691ef23cb44b1fdda190b5b8bef
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sun Sep 23 12:43:31 2007 +0300

    GetKeyboardEvents: Reject out-of-range keycodes (bug #12528)
    
    We can only deal with keycodes between 8 and 255, so make sure that we never
    accept anything out of this range.
    (cherry picked from commit 0e800ca4651a947ccef239e6fe7bf64aab92257c)

commit 35bf7c738a8286a382aeef38c0f035773b3ab96a
Author: Naoki Hamada <nao@tom-yam.or.jp>
Date:   Thu Oct 25 18:45:50 2007 +0300

    Input: Fix key down test (bug #12858)
    
    Fix the botched previous key_is_down test, which would give false positives.
    Also move key_autorepeats to a separate inline function.
    (cherry picked from commit 242f56f722243938e908d1957781ee53c2999783)

commit b3de1b9d375c98b72c88991ac2011e492254c61f
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Fri Oct 26 09:12:15 2007 +0300

    XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
    
    When we're building with --enable-debug, don't emit an ErrorF every time a
    function gets called.
    (cherry picked from commit 6d59bb5709a99ab60b482bbf3393ebffda7f9407)

commit 007e2239cf65535c4df3486e7b2cc42a4e86eb56
Author: Dodji Seketeli <dodji@seketeli.org>
Date:   Mon Nov 12 20:29:12 2007 +0100

    Xephyr: don't initialise the GLX extension

commit 7f231de5e05a8755d76e18595c57baf2e239a4be
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Tue Nov 6 15:05:06 2007 +0000

    .gitignore: Ignore build directories
    
    Ignore directories people might use for building.
    (cherry picked from commit 36df34cffd0cfcfb250fb42596781b3d4e9871eb)

commit 4c20d6104691b370f14216035b5ff07ad5633098
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Fri Aug 17 15:29:16 2007 -0700

    Actually build Secure RPC authentication support (missed in modularization)
    (cherry picked from commit 23fbd5292d356067e85e1eec4eb4f743532b0503)

commit f350c81a912cf5eab8d88a7800a828141945a2f0
Author: Matthias Hopf <mhopf@suse.de>
Date:   Wed Oct 24 20:31:51 2007 +0200

    Prefer configured DisplaySize to probed DDC data, if available.
    
    Based on patch by Hong Liu <hong.liu@intel.com>.
    (cherry picked from commit 48ca5961caee62f2980017a6bdc96a1b4c747727)

commit c5501865703d5d4ee49e081b6075ab89a583deb6
Author: Keith Packard <keithp@koto.keithp.com>
Date:   Sun Aug 19 20:29:37 2007 -0700

    Screen size changing should leave FB alone when X is inactive.
    
    xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with
    suitable vtSema checks to avoid invoking driver code while the X server is
    inactive.
    (cherry picked from commit 265a633cf1fcbf497d6916d9e22403dffdde2e07)

commit 9244b8e4a2274946b56d9cf6d43487e11c29f7d7
Author: Elvis Pranskevichus <el@prans.net>
Date:   Tue Nov 6 09:40:14 2007 +0000

    Config: D-Bus: Fix dbus_bus_request_name failure check
    
    The code in connect_hook incorrectly checks for dbus_bus_request_name failure.
    The dbus_bus_request_name error indicator is -1, not 0. This leads
    to subsequent assertion failure in libdbus.
    (cherry picked from commit ddce48ede036f3996f8e584b0012c396c5df42fb)

commit 0050d7e78d990fa945bd808554b0a86721262786
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Tue Nov 6 14:52:03 2007 +0000

    DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug #10639)
    
    XkbRemoveResourceClient wants to access xkbInfo if it exists, so make
    sure we NULL it after freeing it.  It doesn't make much sense to move
    the RemoveResourceClient call first, as there's not much point in
    notifying clients while we're shutting the server down anyway.
    (cherry picked from commit 23023af1c5a33546a2027cad23a946a2882e9893)

commit 846745c58108856e5fc1b6d94c91a245cbc4f16f
Author: Markku Vire <markku.vire@movial.fi>
Date:   Thu Nov 1 22:43:04 2007 +0200

    Config: HAL: Touchpads are pointers too
    
    Treat touchpads -- not just mice -- as pointer devices.
    (cherry picked from commit 3f1b6765aadf665ede8253464da19a5878f16e56)

commit ab80b27250bb583e3a40bf92cfe5edc117e4bd58
Author: Mark Vytlacil <mrv@wi.rr.com>
Date:   Thu Nov 1 21:05:43 2007 +0200

    XFree86: Input: Save/restore errno around SIGIO (bug #10683)
    
    Make sure errno is saved and restored from the SIGIO handler, so errors
    from system calls in input handlers don't break the interrupted code.
    (cherry picked from commit 41c3069f7cf28155f8e6cfe0c10a12a1f5f76c7d)

commit ad05d5d035b32b05d304b2fc598f6fadeb077516
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sun Sep 23 17:17:03 2007 +0300

    Input: Generate XKB mapping changes for all core-sending devices (bug #12523)
    
    When we change the mapping on a core device, make sure we propagate this
    through to XKB for all extended devices as well.
    (cherry picked from commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe)

commit 84040b655e3ea9188a6c9d6dafea429ffc4690de
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Thu Sep 6 18:57:00 2007 +0930

    xfree86: wrap keyboard devices for XKB.
    
    Call ProcessOtherEvents first, then for all keyboard devices let them be
    wrapped by XKB. This way all XI events will go through XKB.
    
    Note that the VCK is still not wrapped, so core events will bypass XKB.
    
    (cherry picked from commit d627061b48ae06d27b37be209d67a3f4f2388dd3)
    (cherry picked from commit 8ead41388e36e21eea6fa0408c847f174911eab0)

commit e26e93c54e54ab4010dfdede47c3e56e4418bcbd
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Oct 27 21:32:47 2007 +0300

    XKB: Cope with all events in XkbProcessKeyboardEvent
    
    Cope with Xi and pointer events in the (now increasingly misnamed)
    XkbProcessKeyboardEvent.  If it's the wrong type, call through the wrapping
    chain to get out; else, process it.
    (cherry picked from commit e717cf08e99746761d74289c426bbd84176f4435)

commit 37c690cfa4e9055209732ab5431fffb8886c7d67
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Oct 27 21:31:39 2007 +0300

    XKB: Don't update indicators on all devices, add missing include file
    
    Don't get XkbUpdateIndicators to update the indicators on all our devices: we
    already deal with that ourselves.
    Add exevents.h include to get more (proto)types.
    (cherry picked from commit 9db8846fa53d91193bbfe541b244e2326440011d)

commit 1dce9c20283279eac4d6e5cafc4f73a333548c07
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Wed Sep 26 18:04:59 2007 +0930

    xkb: Unwrap properly in ProcessPointerEvent.
    
    Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly
    and then call the unwrapped processInputProc. Seems to be a better idea,
    especially since it makes stuff actually work...
    (cherry picked from commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84)
    (cherry picked from commit ee3aa948eb8ed181d037294ed87df6ceec81684e)

commit 940cce1f4856a3ffc6fdba9c807c8238ed1acf8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Thu Sep 27 11:44:03 2007 +0930

    xkb: xkbHandleActions: let wrapping take care of event delivery.
    
    This is hopefully better than hardcodey calling CoreProcessPointerEvent.
    (cherry picked from commit 32d0440c7f6e604807cb14dd32349df6f22c903b)
    (cherry picked from commit d3588a0aee33fbd233082f881c0d37152c6d4d8b)

commit 5909fb3c406356505440af8d53785d9ee06ab9be
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Wed Sep 12 17:40:11 2007 +0930

    dix: don't compress motion events from different devices (EventEnqueue)
    
    (cherry picked from commit 8840829ab93c4eb62eb58753c015da5307133fe5)
    (cherry picked from commit 352c5a311200bf491153fe9ef16126c5877a57bb)

commit 600752bece350592f374470dd54b9e1cd2900d0b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Thu Sep 6 18:52:02 2007 +0930
