Update to libXext 1.3.2

This commit is contained in:
matthieu 2013-05-31 22:17:42 +00:00
parent 3e0f48d5eb
commit 1b76b5cfa9
13 changed files with 467 additions and 161 deletions

View File

@ -1,3 +1,357 @@
commit d8366afbb0d2e4fbb1e419b1187f490522270bea
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 31 14:34:58 2013 -0700
libXext 1.3.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit dfe6e1f3b8ede3d0bab7a5fa57f73513a09ec649
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XSyncListSystemCounters() [CVE-2013-1982 6/6]
If the number of counters or amount of data reported by the server is
large enough that it overflows when multiplied by the size of the
appropriate struct, then memory corruption can occur when more bytes
are read from the X server than the size of the buffers we allocated
to hold them.
V2: Make sure we don't walk past the end of the reply when converting
data from wire format to the structures returned to the caller.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6ecd96e8be3c33e2ffad6631cea4aa0a030d93c2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XShapeGetRectangles() [CVE-2013-1982 5/6]
If the number of rectangles reported by the server is large enough that
it overflows when multiplied by the size of the appropriate struct, then
memory corruption can occur when more bytes are read from the X server
than the size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 67ecdcf7e29de9fa78b421122620525ed2c7db88
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XeviGetVisualInfo() [CVE-2013-1982 4/6]
If the number of visuals or conflicts reported by the server is large
enough that it overflows when multiplied by the size of the appropriate
struct, then memory corruption can occur when more bytes are read from
the X server than the size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 96d1da55a08c4cd52b763cb07bdce5cdcbec4da8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
several integer overflows in XdbeGetVisualInfo() [CVE-2013-1982 3/6]
If the number of screens or visuals reported by the server is large enough
that it overflows when multiplied by the size of the appropriate struct,
then memory corruption can occur when more bytes are read from the X server
than the size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 082d70b19848059ba78c9d1c315114fb07e8c0ef
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XcupStoreColors() [CVE-2013-1982 2/6]
If the computed number of entries is large enough that it overflows when
multiplied by the size of a xColorItem struct, or is treated as negative
when compared to the size of the stack allocated buffer, then memory
corruption can occur when more bytes are read from the X server than the
size of the buffer we allocated to hold them.
The requirement to match the number of colors specified by the caller makes
this much harder to hit than the one in XcupGetReservedColormapEntries()
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d05f27a6f74cb419ad5a437f2e4690b17e7faee5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XcupGetReservedColormapEntries() [CVE-2013-1982 1/6]
If the computed number of entries is large enough that it overflows when
multiplied by the size of a xColorItem struct, or is treated as negative
when compared to the size of the stack allocated buffer, then memory
corruption can occur when more bytes are read from the X server than the
size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ca84a813716f9de691dc3f60390d83af4b5ae534
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Apr 13 09:32:12 2013 -0700
Use _XEatDataWords to avoid overflow of rep.length bit shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8eee1236041d46a21faba32e0d27c26985267d89
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dbf4b9ec4a8aa97b0c47d58ee158dd3aa8832af5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 15 14:28:48 2013 -0500
configure: Remove AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7081afc98643e3ef8a3ed711183c8fc8fef30cfa
Author: Eric S. Raymond <esr@thyrsus.com>
Date: Thu Aug 23 13:34:16 2012 -0400
Replace presentationm-level requests with .RS/RE.
This will assist translation to DocBook.
Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
commit d618eac132fc9e13bbfb9e58e3375f015db2a179
Author: Eric S. Raymond <esr@thyrsus.com>
Date: Thu Aug 23 13:25:27 2012 -0400
Replace various unsafe presentation-level requests with .RS/.RE and .EX/EE.
These can be translated structurally into DocBook.
commit e78e51359fd22b69e646167bc9d3f9b28a5c755f
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Jul 18 23:40:18 2012 +0200
Avoid having macros expand code to be: ((f) ? (f)->m1 : NULL)->m2
From Matthew R. Green <mrg@NetBSD.org>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ed8d50ba3a6f837d213ed7c39c2b63d33fc75a38
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 20 15:08:08 2012 -0700
Destroy generic event extension after last display is removed
The extension record is currently leaked and never freed.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c6fc799a81334a223cf0e924cd9e7e94ba147835
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 23 14:59:51 2012 +1000
sync: fix copy/paste error in comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d8366afbb0d2e4fbb1e419b1187f490522270bea
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 31 14:34:58 2013 -0700
libXext 1.3.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit dfe6e1f3b8ede3d0bab7a5fa57f73513a09ec649
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XSyncListSystemCounters() [CVE-2013-1982 6/6]
If the number of counters or amount of data reported by the server is
large enough that it overflows when multiplied by the size of the
appropriate struct, then memory corruption can occur when more bytes
are read from the X server than the size of the buffers we allocated
to hold them.
V2: Make sure we don't walk past the end of the reply when converting
data from wire format to the structures returned to the caller.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6ecd96e8be3c33e2ffad6631cea4aa0a030d93c2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XShapeGetRectangles() [CVE-2013-1982 5/6]
If the number of rectangles reported by the server is large enough that
it overflows when multiplied by the size of the appropriate struct, then
memory corruption can occur when more bytes are read from the X server
than the size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 67ecdcf7e29de9fa78b421122620525ed2c7db88
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XeviGetVisualInfo() [CVE-2013-1982 4/6]
If the number of visuals or conflicts reported by the server is large
enough that it overflows when multiplied by the size of the appropriate
struct, then memory corruption can occur when more bytes are read from
the X server than the size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 96d1da55a08c4cd52b763cb07bdce5cdcbec4da8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
several integer overflows in XdbeGetVisualInfo() [CVE-2013-1982 3/6]
If the number of screens or visuals reported by the server is large enough
that it overflows when multiplied by the size of the appropriate struct,
then memory corruption can occur when more bytes are read from the X server
than the size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 082d70b19848059ba78c9d1c315114fb07e8c0ef
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XcupStoreColors() [CVE-2013-1982 2/6]
If the computed number of entries is large enough that it overflows when
multiplied by the size of a xColorItem struct, or is treated as negative
when compared to the size of the stack allocated buffer, then memory
corruption can occur when more bytes are read from the X server than the
size of the buffer we allocated to hold them.
The requirement to match the number of colors specified by the caller makes
this much harder to hit than the one in XcupGetReservedColormapEntries()
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d05f27a6f74cb419ad5a437f2e4690b17e7faee5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 9 14:40:33 2013 -0800
integer overflow in XcupGetReservedColormapEntries() [CVE-2013-1982 1/6]
If the computed number of entries is large enough that it overflows when
multiplied by the size of a xColorItem struct, or is treated as negative
when compared to the size of the stack allocated buffer, then memory
corruption can occur when more bytes are read from the X server than the
size of the buffer we allocated to hold them.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ca84a813716f9de691dc3f60390d83af4b5ae534
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Apr 13 09:32:12 2013 -0700
Use _XEatDataWords to avoid overflow of rep.length bit shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8eee1236041d46a21faba32e0d27c26985267d89
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dbf4b9ec4a8aa97b0c47d58ee158dd3aa8832af5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 15 14:28:48 2013 -0500
configure: Remove AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7081afc98643e3ef8a3ed711183c8fc8fef30cfa
Author: Eric S. Raymond <esr@thyrsus.com>
Date: Thu Aug 23 13:34:16 2012 -0400
Replace presentationm-level requests with .RS/RE.
This will assist translation to DocBook.
Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
commit d618eac132fc9e13bbfb9e58e3375f015db2a179
Author: Eric S. Raymond <esr@thyrsus.com>
Date: Thu Aug 23 13:25:27 2012 -0400
Replace various unsafe presentation-level requests with .RS/.RE and .EX/EE.
These can be translated structurally into DocBook.
commit e78e51359fd22b69e646167bc9d3f9b28a5c755f
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Jul 18 23:40:18 2012 +0200
Avoid having macros expand code to be: ((f) ? (f)->m1 : NULL)->m2
From Matthew R. Green <mrg@NetBSD.org>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ed8d50ba3a6f837d213ed7c39c2b63d33fc75a38
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 20 15:08:08 2012 -0700
Destroy generic event extension after last display is removed
The extension record is currently leaked and never freed.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c6fc799a81334a223cf0e924cd9e7e94ba147835
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 23 14:59:51 2012 +1000
sync: fix copy/paste error in comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e9c1e346c90e697d5d8f0e756ef8b6e3ed339e29
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 19:54:50 2012 -0800

View File

@ -229,7 +229,6 @@ LINT_FLAGS = @LINT_FLAGS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
@ -332,7 +331,7 @@ all: config.h
.SUFFIXES:
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@ -359,9 +358,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(top_srcdir)/configure: $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
@ -372,7 +371,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(srcdir)/config.h.in: $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@

View File

@ -9344,44 +9344,6 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
# Control maintainer-specific portions of Makefiles.
# Default is to disable them, unless 'enable' is passed literally.
# For symmetry, 'disable' may be passed as well. Anyway, the user
# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
[m4_case(m4_default([$1], [disable]),
[enable], [m4_define([am_maintainer_other], [disable])],
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
am_maintainer_other[ make rules and dependencies not useful
(and sometimes confusing) to the casual installer])],
[USE_MAINTAINER_MODE=$enableval],
[USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST([MAINT])dnl
]
)
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2012 Free Software Foundation, Inc.

54
lib/libXext/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libXext 1.3.1.
# Generated by GNU Autoconf 2.69 for libXext 1.3.2.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -651,8 +651,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libXext'
PACKAGE_TARNAME='libXext'
PACKAGE_VERSION='1.3.1'
PACKAGE_STRING='libXext 1.3.1'
PACKAGE_VERSION='1.3.2'
PACKAGE_STRING='libXext 1.3.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@ -799,9 +799,6 @@ build_vendor
build_cpu
build
LIBTOOL
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
am__untar
am__tar
AMTAR
@ -866,7 +863,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
enable_shared
enable_static
with_pic
@ -1443,7 +1439,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libXext 1.3.1 to adapt to many kinds of systems.
\`configure' configures libXext 1.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1513,7 +1509,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libXext 1.3.1:";;
short | recursive ) echo "Configuration of libXext 1.3.2:";;
esac
cat <<\_ACEOF
@ -1521,9 +1517,6 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
@ -1646,7 +1639,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libXext configure 1.3.1
libXext configure 1.3.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1970,7 +1963,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libXext $as_me 1.3.1, which was
It was created by libXext $as_me 1.3.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2799,7 +2792,7 @@ fi
# Define the identity of the package.
PACKAGE='libXext'
VERSION='1.3.1'
VERSION='1.3.2'
cat >>confdefs.h <<_ACEOF
@ -2846,29 +2839,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
MAINTAINER_MODE_TRUE='#'
MAINTAINER_MODE_FALSE=
fi
MAINT=$MAINTAINER_MODE_TRUE
# Initialize libtool
case `pwd` in
*\ * | *\ *)
@ -18510,10 +18480,6 @@ else
am__EXEEXT_FALSE=
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -18951,7 +18917,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libXext $as_me 1.3.1, which was
This file was extended by libXext $as_me 1.3.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -19017,7 +18983,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libXext config.status 1.3.1
libXext config.status 1.3.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -1,14 +1,13 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libXext], [1.3.1],
AC_INIT([libXext], [1.3.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL

View File

@ -203,7 +203,7 @@ typedef struct {
} XSyncCounterNotifyEvent;
typedef struct {
int type; /* event base + XSyncCounterNotify */
int type; /* event base + XSyncAlarmNotify */
unsigned long serial; /* # of last request processed by server */
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */

View File

@ -166,7 +166,6 @@ LINT_FLAGS = @LINT_FLAGS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
@ -341,7 +340,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .$(LIB_MAN_SUFFIX) .man
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@ -366,9 +365,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):

View File

@ -123,8 +123,7 @@ XRectangle *XShapeGetRectangles (
.fi
.SH STRUCTURES
.nf
.LP
.ta 3i
.ft CW
typedef struct {
int type; /\&* of event */
unsigned long serial; /\&* # of last request processed by server */
@ -137,38 +136,39 @@ typedef struct {
Time time; /\&* server timestamp when region changed */
Bool shaped; /\&* true if the region exists */
} XShapeEvent;
.ft
.fi
.SH DESCRIPTION
The \fIX11 Nonrectangular Window Shape Extension\fP adds nonrectangular
windows to the X Window System.
.SH PREDEFINED VALUES
Operations:
.in +.5i
.RS
.nf
.ZN ShapeSet
.ZN ShapeUnion
.ZN ShapeIntersect
.ZN ShapeSubtract
.ZN ShapeInvert
.in -.5i
.fi
.RE
.sp
Shape Kinds:
.in +.5i
.RS
.nf
.ZN ShapeBounding
.ZN ShapeClip
.in -.5i
.fi
.RE
.sp
Event defines:
.in +.5i
.RS
.nf
.ZN ShapeNotifyMask
.ZN ShapeNotify
.in -.5i
.fi
.RE
.SH BUGS
This manual pages needs a lot more work.
This manual page needs a lot more work.
.SH SEE ALSO
\fIX11 Nonrectangular Window Shape Extension\fP

View File

@ -36,25 +36,32 @@
.ie t \fB\^\\$1\^\fR\\$2
.el \fI\^\\$1\^\fP\\$2
..
.de EX
.nf
.ft CW
..
.de EE
.ft
.fi
..
.TH XMBUF __libmansuffix__ __xorgversion__ "X FUNCTIONS"
.SH NAME
XmbufQueryExtension, XmbufGetVersion, XmbufCreateBuffers, XmbufDestroyBuffers, XmbufDisplayBuffers, XmbufGetWindowAttributes, XmbufChangeWindowAttributes, XmbufGetBufferAttributes, XmbufChangeBufferAttributes, XmbufGetScreenInfo, XmbufCreateStereoWindow - X multibuffering functions
.SH SYNTAX
.nf
.LP
.EX
\&#include <X11/extensions/multibuf.h>
.LP
Bool XmbufQueryExtension(
Display *dpy,
Display *dpy,
int *event_base_return,
int *error_base_return);
.LP
Status XmbufGetVersion(
Display *dpy,
int *major_version_return,
int *minor_version_return);
.LP
int XmbufCreateBuffers(
Display *dpy,
Window window,
@ -62,40 +69,40 @@ int XmbufCreateBuffers(
int update_action,
int update_hint,
Multibuffer *buffers_update);
.LP
void XmbufDestroyBuffers(
Display *dpy,
Window window);
.LP
void XmbufDisplayBuffers(
Display *dpy,
int count,
Multibuffer *buffers,
int min_delay,
int max_delay);
.LP
Status XmbufGetWindowAttributes(
Display *dpy,
Window window,
XmbufWindowAttributes *attributes);
.LP
void XmbufChangeWindowAttributes(
Display *dpy,
Window window,
unsigned long valuemask,
XmbufSetWindowAttributes *attributes);
.LP
Status XmbufGetBufferAttributes(
Display *dpy,
Multibuffer buffer,
XmbufBufferAttributes *attributes);
.LP
void XmbufChangeBufferAttributes(
Display *dpy,
Multibuffer buffer,
unsigned long valuemask,
XmbufSetBufferAttributes *attributes);
.LP
Status XmbufGetScreenInfo(
Display *dpy,
Drawable drawable,
@ -103,7 +110,7 @@ Status XmbufGetScreenInfo(
XmbufBufferInfo **mono_info_return,
int *nstereo_return,
XmbufBufferInfo **stereo_info_return);
.LP
Window XmbufCreateStereoWindow(
Display *dpy,
Window parent,
@ -119,29 +126,31 @@ Window XmbufCreateStereoWindow(
XSetWindowAttributes *attributes,
Multibuffer *left_return,
Multibuffer *right_return);
.fi
.EE
.SH STRUCTURES
.nf
.ta 3i
\fIEvents:\fP
.EX
typedef struct {
int type; /\&* of event */
unsigned long serial; /\&* # of last request processed by server */
int send_event; /\&* true if this came from a SendEvent request */
Display *display; /\&* Display the event was read from */
Multibuffer buffer; /\&* buffer of event */
int state; /\&* see Clobbered constants above */
int type; /\&* of event */
unsigned long serial; /\&* # of last request processed by server */
int send_event; /\&* true if this came from a SendEvent request */
Display *display; /\&* Display the event was read from */
Multibuffer buffer; /\&* buffer of event */
int state; /\&* see Clobbered constants above */
} XmbufClobberNotifyEvent;
.LP
typedef struct {
int type; /\&* of event */
unsigned long serial; /\&* # of last request processed by server */
int send_event; /\&* true if this came from a SendEvent request */
Display *display; /\&* Display the event was read from */
Multibuffer buffer; /\&* buffer of event */
int type; /\&* of event */
unsigned long serial; /\&* # of last request processed by server */
int send_event; /\&* true if this came from a SendEvent request */
Display *display; /\&* Display the event was read from */
Multibuffer buffer; /\&* buffer of event */
} XmbufUpdateNotifyEvent;
.LP
.EE
\fIPer-window attributes that can be got:\fP
.EX
typedef struct {
int displayed_index; /\&* which buffer is being displayed */
int update_action; /\&* Undefined, Background, Untouched, Copied */
@ -150,32 +159,44 @@ typedef struct {
int nbuffers; /\&* Number of buffers */
Multibuffer *buffers; /\&* Buffers */
} XmbufWindowAttributes;
.LP
.EE
\fIPer-window attributes that can be set:\fP
.EX
typedef struct {
int update_hint; /\&* Frequent, Intermittent, Static */
} XmbufSetWindowAttributes;
.LP
.EE
\fIPer-buffer attributes that can be got:\fP
.EX
typedef struct {
Window window; /\&* which window this belongs to */
unsigned long event_mask; /\&* events that have been selected */
int buffer_index; /\&* which buffer is this */
int side; /\&* Mono, Left, Right */
} XmbufBufferAttributes;
.LP
.EE
\fIPer-buffer attributes that can be set:\fP
.EX
typedef struct {
unsigned long event_mask; /\&* events that have been selected */
} XmbufSetBufferAttributes;
.LP
.EE
\fIPer-screen buffer info (there will be lists of them):\fP
.EX
typedef struct {
VisualID visualid; /\&* visual usable at this depth */
int max_buffers; /\&* most buffers for this visual */
int depth; /\&* depth of buffers to be created */
} XmbufBufferInfo;
.fi
.EE
.SH DESCRIPTION
The application programming library for the
\fIX11 Double-Buffering, Multi-Buffering, and Stereo Extension\fP
@ -279,54 +300,54 @@ will be returned if the extension is not available on this display.
.SH PREDEFINED VALUES
.sp
Update_action field:
.in +.5i
.RS
.nf
.ZN MultibufferUpdateActionUndefined
.ZN MultibufferUpdateActionBackground
.ZN MultibufferUpdateActionUntouched
.ZN MultibufferUpdateActionCopied
.in -.5i
.fi
.RE
.sp
Update_hint field:
.in +.5i
.RS
.nf
.ZN MultibufferUpdateHintFrequent
.ZN MultibufferUpdateHintIntermittent
.ZN MultibufferUpdateHintStatic
.in -.5i
.sp
.fi
.RE
.sp
Valuemask fields:
.in +.5i
.RS
.nf
.ZN MultibufferWindowUpdateHint
.ZN MultibufferBufferEventMask
.in -.5i
.fi
.RE
.sp
Mono vs. stereo and left vs. right:
.in +.5i
.RS
.nf
.ZN MultibufferModeMono
.ZN MultibufferModeStereo
.ZN MultibufferSideMono
.ZN MultibufferSideLeft
.ZN MultibufferSideRight
.in -.5i
.fi
.RE
.sp
Clobber state:
.in +.5i
.RS
.nf
.ZN MultibufferUnclobbered
.ZN MultibufferPartiallyClobbered
.ZN MultibufferFullyClobbered
.in -.5i
.fi
.RE
.sp
Event stuff:
.in +.5i
.RS
.nf
.ZN MultibufferClobberNotifyMask
.ZN MultibufferUpdateNotifyMask
@ -335,8 +356,8 @@ Event stuff:
.ZN MultibufferNumberEvents
.ZN MultibufferBadBuffer
.ZN MultibufferNumberErrors
.in -.5i
.fi
.RE
.SH BUGS
This manual page needs more work.
.SH SEE ALSO

View File

@ -191,7 +191,6 @@ LINT_FLAGS = @LINT_FLAGS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
@ -350,7 +349,7 @@ top_srcdir = @top_srcdir@
all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@ -376,9 +375,9 @@ $(top_srcdir)/docbook.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):

View File

@ -209,7 +209,6 @@ LINT_FLAGS = @LINT_FLAGS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
@ -357,7 +356,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@ -382,9 +381,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)

View File

@ -109,8 +109,8 @@ static /* const */ SyncVersionInfo supported_versions[] = {
};
#define NUM_VERSIONS (sizeof(supported_versions)/sizeof(supported_versions[0]))
#define GET_VERSION(info) ((info) ? (const SyncVersionInfo*)(info)->data : NULL)
#define IS_VERSION_SUPPORTED(info) (!!GET_VERSION(info))
#define GET_VERSION(info) ((const SyncVersionInfo*)(info)->data)
#define IS_VERSION_SUPPORTED(info) (!!(info))
static
const SyncVersionInfo* GetVersionInfo(Display *dpy)

View File

@ -218,7 +218,15 @@ _xgeDpyClose(Display* dpy, XExtCodes* codes)
XFree(xge_data);
}
return XextRemoveDisplay(xge_info, dpy);
if(!XextRemoveDisplay(xge_info, dpy))
return 0;
if (xge_info->ndisplays == 0) {
XextDestroyExtension(xge_info);
xge_info = NULL;
}
return 1;
}
/*