libX11: Changes to 'libX11-1.3-branch'

[Alan Coopersmith]

 configure.ac    |    2 +-
 man/Compose.man |    2 +-
 man/Makefile.am |    1 +
 src/Xprivate.h  |    2 +-
 src/xcb_io.c    |    2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 54a963608d23d35cd9233b2223f880ac3671f10b
Author: Jamey Sharp <jamey at minilop.net>
Date:   Fri Aug 6 15:51:56 2010 -0700

    Fix use-after-free in _XReply on X errors.
    
    _XReply would always call dequeue_pending_request on errors.  When it
    got an error for the current request, it would call dequeue, then break
    out of the loop; then, if it had an error in the event queue, it would
    compare it with the sequence number of the now-freed pending request.
    _XReply already stored that sequence number in dpy->last_request_read
    before freeing it, so look at that instead.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29412
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>
    Signed-off-by: Josh Triplett <josh at joshtriplett.org>
    (cherry picked from commit 4b8ff7db39f2fe7ef12968d462aaf3f9054b6c18)

commit 8da90e33865340fe954bcb6b99dfcb1b7617ab10
Author: Julien Cristau <jcristau at debian.org>
Date:   Sat Jul 24 22:13:07 2010 +0200

    Compose.man: default user compose file is .XCompose, not .Xcompose
    
    The path was correct in the DESCRIPTION section, but not in FILES.
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    (cherry picked from commit 8e603413586ff42b1351688f6f99318cbe243bca)

commit 2cce273a4ac89662e9f00a6a8317c84b0c8c391d
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jul 12 16:52:12 2010 -0700

    launchd: Explicitly search /sbin
    
    Previously, launchd wasn't found if /sbin wasn't in the user's PATH.
    https://bugs.freedesktop.org/show_bug.cgi?id=29028
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit a151346a2b7810e988f1de4b1e00b37672dc587a)

commit 2b82daa88538022cfb49d8ceab22650e8062cacc
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jun 24 13:13:11 2010 -0700

    Define FILE_MAN_DIR_SUFFIX so XCompose shadow page has correct path
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit d6ba13009fc9ef876a104b907ffef73c6e405d4b)

commit c1e35695d9d3b22b63db762ad0a1f040a72e958a
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri Jun 4 13:57:45 2010 +0200

    Hide _XSeqSyncFunction
    
    Commit a6d974dc59f2722b36e2df9d4f07aeee4f83ce43 made _XSeqSyncFunction
    non-static, but we don't need to export it.
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    (cherry picked from commit abcd1b67c8135ad652833e5a60d818837c39fce1)