libxfixes: Changes to 'upstream-unstable'

[Andreas Boll]

 configure.ac |2 +-
 src/Region.c |   15 ---
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 84df9cb81cc31bbed27ba241a23ae04f61da57db
Author: Matthieu Herrb 
Date:   Tue Oct 4 21:11:55 2016 +0200

libXfixes 5.0.3

Signed-off-by: Matthieu Herrb 

diff --git a/configure.ac b/configure.ac
index a9052cf..0ec7b86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PREREQ([2.60])
 # that 'revision' number appears in Xfixes.h and has to be manually
 # synchronized.
 #
-AC_INIT(libXfixes, [5.0.2],
+AC_INIT(libXfixes, [5.0.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit 61c1039ee23a2d1de712843bed3480654d7ef42e
Author: Tobias Stoeckmann 
Date:   Sun Sep 25 22:38:44 2016 +0200

Integer overflow on illegal server response

The 32 bit field "rep.length" is not checked for validity, which allows
an integer overflow on 32 bit systems.

A malicious server could send INT_MAX as length, which gets multiplied
by the size of XRectangle. In that case the client won't read the whole
data from server, getting out of sync.

Signed-off-by: Tobias Stoeckmann 
Reviewed-by: Matthieu Herrb 

diff --git a/src/Region.c b/src/Region.c
index cb0cf6e..59bcc1a 100644
--- a/src/Region.c
+++ b/src/Region.c
@@ -23,6 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include 
 #endif
+#include 
 #include "Xfixesint.h"
 
 XserverRegion
@@ -333,9 +334,17 @@ XFixesFetchRegionAndBounds (Display*dpy,
 bounds->y = rep.y;
 bounds->width = rep.width;
 bounds->height = rep.height;
-nbytes = (long) rep.length << 2;
-nrects = rep.length >> 1;
-rects = Xmalloc (nrects * sizeof (XRectangle));
+
+if (rep.length < (INT_MAX >> 2)) {
+   nbytes = (long) rep.length << 2;
+   nrects = rep.length >> 1;
+   rects = Xmalloc (nrects * sizeof (XRectangle));
+} else {
+   nbytes = 0;
+   nrects = 0;
+   rects = NULL;
+}
+
 if (!rects)
 {
_XEatDataWords(dpy, rep.length);

libxfixes: Changes to 'upstream-unstable'

[Julien Cristau]

 configure.ac|   10 ++
 src/Xfixesint.h |   14 --
 2 files changed, 2 insertions(+), 22 deletions(-)

New commits:
commit b2406ed9031991b7ddc5b76b308623afc8a590c5
Author: Matt Turner 
Date:   Wed May 25 18:53:28 2016 -0700

libXfixes 5.0.2

Signed-off-by: Matt Turner 

diff --git a/configure.ac b/configure.ac
index 2a59af8..a9052cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PREREQ([2.60])
 # that 'revision' number appears in Xfixes.h and has to be manually
 # synchronized.
 #
-AC_INIT(libXfixes, [5.0.1],
+AC_INIT(libXfixes, [5.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit 1702cdfe45c9bdd7dacfc8f27a49f89fcd1d02c3
Author: Michael Joost 
Date:   Mon Nov 18 16:11:26 2013 +0100

Remove fallback for _XEatDataWords, require libX11 1.6 for it

_XEatDataWords was orignally introduced with the May 2013 security
patches, and in order to ease the process of delivering those,
fallback versions of _XEatDataWords were included in the X extension
library patches so they could be applied to older versions that didn't
have libX11 1.6 yet.   Now that we're past that hurdle, we can drop
the fallbacks and just require libX11 1.6 for building new versions
of the extension libraries.

Reviewed-by: Alan Coopersmith 
Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index f85bd72..2a59af8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,13 +55,7 @@ FIXESEXT_VERSION=[`echo $VERSION | sed 
's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
 AC_SUBST(FIXESEXT_VERSION)
 
 # Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto 
x11)
-
-# Check for _XEatDataWords function that may be patched into older Xlib 
releases
-SAVE_LIBS="$LIBS"
-LIBS="$FIXESEXT_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
+PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto 
[x11 >= 1.6])
 
 
 AC_CONFIG_FILES([Makefile
diff --git a/src/Xfixesint.h b/src/Xfixesint.h
index 7bf5bfd..8a4d5fd 100644
--- a/src/Xfixesint.h
+++ b/src/Xfixesint.h
@@ -60,18 +60,4 @@ XFixesFindDisplay (Display *dpy);
 #define XFixesSimpleCheckExtension(dpy,i) \
   if (!XFixesHasExtension(i)) { return; }
 
-#ifndef HAVE__XEATDATAWORDS
-#include   /* for LONG64 on 64-bit platforms */
-#include 
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
-if (n >= (ULONG_MAX >> 2))
-_XIOError(dpy);
-# endif
-_XEatData (dpy, n << 2);
-}
-#endif
-
 #endif /* _XFIXESINT_H_ */

libxfixes: Changes to 'upstream-unstable'

[Julien Cristau]

 Makefile.am |6 +++---
 autogen.sh  |4 +++-
 configure.ac|   10 --
 include/X11/extensions/Xfixes.h |6 +++---
 man/Xfixes.man  |6 +++---
 src/Cursor.c|   34 --
 src/Makefile.am |7 +++
 src/Region.c|   12 ++--
 src/SaveSet.c   |2 +-
 src/Selection.c |2 +-
 src/Xfixes.c|   26 +-
 src/Xfixesint.h |   16 ++--
 12 files changed, 78 insertions(+), 53 deletions(-)

New commits:
commit 0cb446962381f750e05d97bfb974ca1e32481d5d
Author: Alan Coopersmith 
Date:   Tue May 28 21:11:10 2013 -0700

libXfixes 5.0.1

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index bb8e976..f85bd72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PREREQ([2.60])
 # that 'revision' number appears in Xfixes.h and has to be manually
 # synchronized.
 #
-AC_INIT(libXfixes, [5.0],
+AC_INIT(libXfixes, [5.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit c480fe3271873ec7471b0cbd680f4dac18ca8904
Author: Alan Coopersmith 
Date:   Sat Apr 13 10:24:08 2013 -0700

integer overflow in XFixesGetCursorImage() [CVE-2013-1983]

If the reported cursor dimensions or name length are too large, the
calculations to allocate memory for them may overflow, leaving us
writing beyond the bounds of the allocation.

Reported-by: Ilja Van Sprundel 
Signed-off-by: Alan Coopersmith 

diff --git a/src/Cursor.c b/src/Cursor.c
index 641b747..33590b7 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -47,6 +47,7 @@
 #include 
 #endif
 #include "Xfixesint.h"
+#include 
 
 void
 XFixesSelectCursorInput (Display   *dpy,
@@ -74,9 +75,9 @@ XFixesGetCursorImage (Display *dpy)
 XFixesExtDisplayInfo   *info = XFixesFindDisplay (dpy);
 xXFixesGetCursorImageAndNameReq*req;
 xXFixesGetCursorImageAndNameReply  rep;
-intnpixels;
-intnbytes_name;
-intnbytes, nread, rlength;
+size_t npixels;
+size_t nbytes_name;
+size_t nbytes, nread, rlength;
 XFixesCursorImage  *image;
 char   *name;
 
@@ -101,16 +102,21 @@ XFixesGetCursorImage (Display *dpy)
 }
 npixels = rep.width * rep.height;
 nbytes_name = rep.nbytes;
-/* reply data length */
-nbytes = (long) rep.length << 2;
-/* bytes of actual data in the reply */
-nread = (npixels << 2) + nbytes_name;
-/* size of data returned to application */
-rlength = (sizeof (XFixesCursorImage) +
-  npixels * sizeof (unsigned long) +
-  nbytes_name + 1);
+if ((rep.length < (INT_MAX >> 2)) &&
+   npixels < (((INT_MAX >> 3) - sizeof (XFixesCursorImage) - 1)
+  - nbytes_name)) {
+   /* reply data length */
+   nbytes = (size_t) rep.length << 2;
+   /* bytes of actual data in the reply */
+   nread = (npixels << 2) + nbytes_name;
+   /* size of data returned to application */
+   rlength = (sizeof (XFixesCursorImage) +
+  npixels * sizeof (unsigned long) +
+  nbytes_name + 1);
 
-image = (XFixesCursorImage *) Xmalloc (rlength);
+   image = Xmalloc (rlength);
+} else
+   image = NULL;
 if (!image)
 {
_XEatDataWords(dpy, rep.length);

commit b031e3b60fa1af9e49449f23d4a84395868be3ab
Author: Alan Coopersmith 
Date:   Sat Apr 13 10:20:59 2013 -0700

Use _XEatDataWords to avoid overflow of _XEatData calculations

rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index b942ffa..bb8e976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,13 @@ AC_SUBST(FIXESEXT_VERSION)
 # Obtain compiler/linker options for depedencies
 PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto 
x11)
 
+# Check for _XEatDataWords function that may be patched into older Xlib 
releases
+SAVE_LIBS="$LIBS"
+LIBS="$FIXESEXT_LIBS"
+AC_CHECK_FUNCS([_XEatDataWords])
+LIBS="$SAVE_LIBS"
+
+
 AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
diff --git a/src/Cursor.c b/src/Cursor.c
index b3dfed1..641b747 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -113,7 +113,7 @@ XFixesGetCursorImage (Display *dpy)
 image = (XFixesCursorImage *) Xmalloc (rlength);
 if (!image)
 {
-   _XEatData (dpy, nbytes);
+   _XEatDataWords(dpy, rep

libxfixes: Changes to 'upstream-unstable'

[Cyril Brulebois]

 configure.ac|   98 +++-
 include/X11/extensions/Xfixes.h |   15 ++
 src/Cursor.c|   60 
 src/Xfixesint.h |2 
 4 files changed, 123 insertions(+), 52 deletions(-)

New commits:
commit 54926675a9bbb732d3317316db4958e22922ea3f
Author: Adam Jackson 
Date:   Mon Nov 22 14:50:13 2010 -0500

libXfixes v5: Pointer barriers

v2: Use int * for device list, consistent with libXi.
v3: Update copyright year.

Reviewed-by: Julien Cristau 
Reviewed-by: Peter Hutterer 
Signed-off-by: Adam Jackson 

diff --git a/configure.ac b/configure.ac
index cf9a8d4..fc8c1e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PREREQ([2.60])
 # that 'revision' number appears in Xfixes.h and has to be manually
 # synchronized.
 #
-AC_INIT(libXfixes, [4.0.5],
+AC_INIT(libXfixes, [5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
index 0c00310..10a7e2e 100644
--- a/include/X11/extensions/Xfixes.h
+++ b/include/X11/extensions/Xfixes.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -249,6 +250,20 @@ XFixesShowCursor (Display *dpy, Window win);
 
 #endif /* XFIXES_MAJOR >= 4 */
 
+#if XFIXES_MAJOR >= 5
+
+typedef XID PointerBarrier;
+
+PointerBarrier
+XFixesCreatePointerBarrier(Display *dpy, Window w, int x1, int y1,
+  int x2, int y2, int directions,
+  int num_devices, int *devices);
+
+void
+XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b);
+
+#endif /* XFIXES_MAJOR >= 5 */
+
 _XFUNCPROTOEND
 
 #endif /* _XFIXES_H_ */
diff --git a/src/Cursor.c b/src/Cursor.c
index edd179d..0d656f7 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -274,3 +275,62 @@ XFixesShowCursor (Display *dpy, Window win)
 UnlockDisplay (dpy);
 SyncHandle ();
 }
+
+PointerBarrier
+XFixesCreatePointerBarrier(Display *dpy, Window w, int x1, int y1,
+  int x2, int y2, int directions,
+  int num_devices, int *devices)
+{
+XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
+xXFixesCreatePointerBarrierReq *req;
+PointerBarrier barrier;
+int extra = 0;
+
+XFixesCheckExtension (dpy, info, 0);
+if (info->major_version < 5)
+   return 0;
+
+if (num_devices)
+   extra = (((2 * num_devices) + 3) / 4) * 4;
+
+LockDisplay (dpy);
+GetReqExtra (XFixesCreatePointerBarrier, extra, req);
+req->reqType = info->codes->major_opcode;
+req->xfixesReqType = X_XFixesCreatePointerBarrier;
+barrier = req->barrier = XAllocID (dpy);
+req->window = w;
+req->x1 = x1;
+req->y1 = y1;
+req->x2 = x2;
+req->y2 = y2;
+req->directions = directions;
+if ((req->num_devices = num_devices)) {
+   int i;
+   CARD16 *devs = (CARD16 *)(req + 1);
+   for (i = 0; i < num_devices; i++)
+   devs[i] = (CARD16)(devices[i]);
+}
+
+UnlockDisplay (dpy);
+SyncHandle();
+return barrier;
+}
+
+void
+XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b)
+{
+XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
+xXFixesDestroyPointerBarrierReq *req;
+
+XFixesSimpleCheckExtension (dpy, info);
+if (info->major_version < 5)
+   return;
+
+LockDisplay (dpy);
+GetReq (XFixesDestroyPointerBarrier, req);
+req->reqType = info->codes->major_opcode;
+req->xfixesReqType = X_XFixesDestroyPointerBarrier;
+req->barrier = b;
+UnlockDisplay (dpy);
+SyncHandle();
+}

commit c301e75b0316c00599caa88d95f384d63eb8bec0
Author: Gaetan Nadon 
Date:   Wed Feb 2 11:43:42 2011 -0500

config: comment, minor upgrade, quote and layout configure.ac

Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments

Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
No functional configuration changes

This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines

diff --git a/configure.ac b/configure.ac
in

libxfixes: Changes to 'upstream-unstable'

[Julien Cristau]

 .gitignore  |   73 
 COPYING |   20 ++
 INSTALL |8 
 Makefile.am |   10 +++--
 configure.ac|   15 
 include/X11/extensions/Xfixes.h |   38 ++--
 man/Makefile.am |   55 --
 man/Xfixes.man  |3 -
 src/Cursor.c|   38 ++--
 src/SaveSet.c   |1 
 src/Selection.c |1 
 src/Xfixes.c|2 -
 src/Xfixesint.h |1 
 13 files changed, 157 insertions(+), 108 deletions(-)

New commits:
commit 01e803aebdfddfce6374b03e5f31723698aa0c00
Author: Alan Coopersmith 
Date:   Wed Jun 9 20:18:25 2010 -0700

libXfixes 4.0.5

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index fe3ea23..f6a8ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,10 @@ dnl protocol, so Xfixes version l.n.m corresponds to 
protocol version l.n,
 dnl that 'revision' number appears in Xfixes.h and has to be manually
 dnl synchronized.
 dnl
-AC_INIT(libXfixes, 4.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes)
+AC_INIT(libXfixes,
+   4.0.5,
+   [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+   libXfixes)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 7d08b9841ce01628881969b9cdd08d732c87aad7
Author: Alan Coopersmith 
Date:   Tue Jun 8 19:14:44 2010 -0700

Fix .TH values in Xfixes.man

Requires xorg-macros 1.8 in order to get the updated XORG_MANPAGE_SECTIONS
that sets $(SED) & $(MAN_SUBSTS) from configure for us.

Signed-off-by: Alan Coopersmith 
Reviewed-by: Dan Nicholson 

diff --git a/configure.ac b/configure.ac
index 52d3b5b..fe3ea23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,10 @@ AC_INIT(libXfixes, 4.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xo
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
diff --git a/man/Makefile.am b/man/Makefile.am
index e7bbe54..b54f92a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,15 +31,7 @@ EXTRA_DIST = $(libman_PRE)
 
 CLEANFILES = $(libman_DATA)
 
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-   -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
-   -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' 
+# String replacements for man pages now come from xorg-macros.m4 via configure
 
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
diff --git a/man/Xfixes.man b/man/Xfixes.man
index ddc6c46..075b78f 100644
--- a/man/Xfixes.man
+++ b/man/Xfixes.man
@@ -25,7 +25,7 @@
 .ns
 .TP \\$1
 ..
-.TH XFIXES 3 "Version 1.0" "XFree86"
+.TH XFIXES __libmansuffix__ __xorgversion__
 
 .SH NAME
 XFixes \- Augmented versions of core protocol requests

commit e81d298c3dd043ee2234156f81d75cac394ad896
Author: Alan Coopersmith 
Date:   Tue Jun 8 19:04:01 2010 -0700

Sun's copyrights now belong to Oracle

Signed-off-by: Alan Coopersmith 

diff --git a/COPYING b/COPYING
index 06dfed9..66012a9 100644
--- a/COPYING
+++ b/COPYING
@@ -19,7 +19,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
index 1ba11f5..0c00310 100644
--- a/include/X11/extensions/Xfixes.h
+++ b/include/X11/extensions/Xfixes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/man/Makefile.am b/man/Makefile.am
index 75174cd..e7bbe54 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright © 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affi

libxfixes: Changes to 'upstream-unstable'

[Timo Aaltonen]

 .gitignore  |9 
 COPYING |1 
 ChangeLog   |   85 
 Makefile.am |   14 --
 README  |   24 +++
 configure.ac|   19 +++-
 include/X11/extensions/Xfixes.h |8 ++-
 man/.gitignore  |2 
 man/Makefile.am |3 -
 man/Xfixes.man  |6 +-
 src/.gitignore  |7 ---
 src/Cursor.c|   12 ++---
 src/Makefile.am |4 -
 src/Region.c|8 +--
 src/Xfixes.c|   18 
 15 files changed, 79 insertions(+), 141 deletions(-)

New commits:
commit ed2f91926bcef1610abe3c9cef61b1bb1c918ec8
Author: Alan Coopersmith 
Date:   Thu Oct 8 08:45:02 2009 -0700

libXfixes 4.0.4

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index acd52a5..a73bf6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ dnl protocol, so Xfixes version l.n.m corresponds to protocol 
version l.n,
 dnl that 'revision' number appears in Xfixes.h and has to be manually
 dnl synchronized.
 dnl
-AC_INIT(libXfixes, 4.0.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes)
+AC_INIT(libXfixes, 4.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit dc9e2c696121f677065919bc5b011eb650791831
Author: Alan Coopersmith 
Date:   Thu Oct 8 08:44:24 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 754ef2c..acd52a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,15 +36,17 @@ AC_INIT(libXfixes, 4.0.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xo
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
  
 # Check fixesext configuration, strip extra digits from package version to
 # find the required protocol version
@@ -52,14 +54,9 @@ XORG_CWARNFLAGS
 FIXESEXT_VERSION=[`echo $VERSION | sed 
's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
 AC_SUBST(FIXESEXT_VERSION)
 PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto 
x11)
-FIXESEXT_CFLAGS="$CWARNFLAGS $FIXESEXT_CFLAGS"
 AC_SUBST(FIXESEXT_CFLAGS)
 AC_SUBST(FIXESEXT_LIBS)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
   src/Makefile
   man/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 6668aff..3d95e5f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -47,4 +47,4 @@ MAN_SUBSTS = \
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-   sed $(MAN_SUBSTS) < $< > $@
+   $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ba9522..544230f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ libXfixes_la_SOURCES =  \
Xfixesint.h
 
 libXfixes_la_LIBADD = @FIXESEXT_LIBS@
-AM_CFLAGS = @FIXESEXT_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/include/X11/extensions
 

commit c83a721ba0b142177b3f01dd0c0a5e47e06a991a
Author: Alan Coopersmith 
Date:   Mon Feb 2 20:34:33 2009 -0800

Add README with pointers to mailing list, bugzilla & git repos

Signed-off-by: Alan Coopersmith 

diff --git a/README b/README
index 67cf1d8..ea00b68 100644
--- a/README
+++ b/README
@@ -8,3 +8,27 @@ extension.  Library and server implementations are separate.
 
 Keith Packard
 kei...@keithp.com
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+git://anongit.freedesktop.org/git/xorg/lib/libXfixes
+
+http://cgit.freedesktop.org/xorg/lib/libXfixes
+
+For patch submission instructions, see:
+
+   http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+http://wiki.x.org/wiki/GitPage
+

commit 9784df5ba9f04163da7486c005eaf2383c37b127
Author: Paulo Cesar Pereira de Andrade 
Date:   Thu Jan 29 17:40:24 2009 -0200

Janitor

libxfixes: Changes to 'upstream-unstable'

[David Nusinow]

New branch 'upstream-unstable' available with the following commits:
commit cad41f810023db454f33feea4f89d4d053737732
Author: Daniel Stone <[EMAIL PROTECTED]>
Date:   Wed Nov 8 16:14:41 2006 +0200

bump to 4.0.3

commit 9dc7945eaa9216bf7b0056e815fba5bf8b5ded07
Author: Lars Knoll <[EMAIL PROTECTED]>
Date:   Sun Oct 15 14:13:14 2006 -0700

Don't unlock the Display when you have not locked it.

Acked-by: Jamey Sharp <[EMAIL PROTECTED]>

commit fcd9a56f0614521127d82954c4a4d77c92e62e53
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Fri Oct 13 16:12:54 2006 -0400

Bump to 4.0.2

commit 8b43f6b0b5d77ab33efc50e4b1f588e51d029eb8
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Wed Sep 27 19:03:11 2006 -0700

Add *~ to .gitignore to skip over emacs droppings

commit 6c4d82990973b02a756ab3ba83ea345fed4bf87e
Author: Stuart Kreitman <[EMAIL PROTECTED]>
Date:   Wed Sep 27 19:02:02 2006 -0700

Sun bug #5099413/Xorg bugzilla #1554: Gnopernicus full-screen mag not 
working

Sun bug #5099413: Gnopernicus full-screen magnification not working


includes fix for Xorg bug #1554: rect defined in XFixesInvertRegion is not 
used


commit cd58068a11dbec3a17099fb699885e5e20e6ae36
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Sep 18 18:24:29 2006 -0400

Add 01_include_xlib.h.diff. Xfixes.h relies on the "Bool" define from
X11/Xlib.h but did not include that header (directly or indirectly)
See debian bug #372756

commit 78e08086c13b2053f7cf1f74a8ec49b7e970a420
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date:   Fri Sep 1 17:12:39 2006 +0200

Bug #4902: _XRead32() expects a signed long pointer on 64 bit systems.

commit 4ac8fb34617e392a5af35bf34d86df61903ec482
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Thu Jul 13 14:58:54 2006 -0700

renamed: .cvsignore -> .gitignore

commit f506712c5117d48cee6b36bc8b9ef1760b0506d6
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Fri May 12 15:18:54 2006 +

Fix the soversion to 3.1.0.

commit 2284047bd919826e2ef1a8898eabfc3c8ec5d1a8
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Fri Apr 28 20:53:15 2006 +

Bump to 4.0

commit 0ce5551f030c27705b3828b41647824577e30f74
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Mon Apr 3 00:58:13 2006 +

Coverity #576: Plug a leak on the error path.

commit e9e432a987682ee16ed0dbc1e9b520fa5720150c
Author: Deron Johnson <[EMAIL PROTECTED]>
Date:   Mon Mar 13 21:59:05 2006 +

Part 2 of 3 (Other parts are in proto and xserver) Composite Version 0.3:
CompositeGetOverlayWindow, CompositeReleaseOverlayWindow Xfixes Version
4.0: XFixesHideCursor, XFixesShowCursor

commit 96275f0b9f97be0fd9e002fd14bce4f4a015278a
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Thu Dec 15 00:24:29 2005 +

Update package version number for final X11R7 release candidate.

commit c775b60f1aec6730be283cba3e9ba4b2348fb6ba
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Tue Dec 6 22:48:43 2005 +

Change *man_SOURCES ==> *man_PRE to fix autotools warnings.

commit eb7159b541fe31d0d84313b49503bedd44a95bec
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Sat Dec 3 05:49:43 2005 +

Update package version number for X11R7 RC3 release.

commit be6cbf68064b4d45f77cbb0a1d4670e9789d2343
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Mon Nov 28 22:03:05 2005 +

Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)

commit 4b9884c72b23b276eeb2b2e6b3c749fbb54fdc36
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Sat Nov 19 07:15:41 2005 +

Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.

commit 593a37675b72053c36924785a2fea51a06ad1c37
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Sun Nov 13 01:48:25 2005 +

Use sed to substitute variables in man pages.

commit b21e46646371edbf7155eae621fefc0b572b006e
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Wed Nov 9 21:31:20 2005 +

Bump version numbers for X11R6.9/X11R7 RC2.

commit 097f483e522f721eae4816e659237da94a4796d3
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Wed Nov 9 21:19:13 2005 +

Update package version number for X11R7 RC2 release.

commit 750cac0b61ecde7489ea98e69f60417d169329c7
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Tue Nov 1 15:11:51 2005 +

Update pkgcheck dependencies to work with separate build roots.

commit 92f0e71679f00f6ce18f445f505962bd1c6c8141
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Oct 26 22:27:27 2005 +

Bug #4868: Add check for xproto.

commit 15fba21d80922c8f93f5406b0616022b92eaa5c1
Author: Kevin E Martin <[EMAI