ChangeLog | 422 +++++++++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 5
debian/rules | 6
debian/watch | 2
include/X11/XlibConf.h | 40 ----
5 files changed, 431 insertions(+), 44 deletions(-)
New commits:
commit 8fb3c3744e042a80113538ac70786957cc74f37f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jun 5 00:53:58 2007 +0200
Various minor updates
+ update the upstream changelog
+ add a watch file
+ install the NEWS file
+ don't run dh_install with --list-missing in binary-indep, there are
too many false positives for this to be useful
diff --git a/ChangeLog b/ChangeLog
index 3db5109..2cfd6e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,425 @@
+commit 65f0ab5d46d80d55fc04d4eb14fa05f130eb8b9c
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sun Jun 3 21:41:47 2007 -0700
+
+ Move security fixes to the top of NEWS, and fix spacing.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit a549a258b8fcb1ba9d0c1b01b72967e385f67cab
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sun Jun 3 21:29:40 2007 -0700
+
+ Add NEWS item for bugfix in commit
e2c1d788d1fe7bd2d34756493951552441e59b8c.
+
+ Commit by Josh Triplett and Jamey Sharp
+
+commit 5123b77a3d32d3ad479462f319762c328278aed9
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sun Jun 3 21:24:54 2007 -0700
+
+ Xlib/XCB: Inline and simplify handle_event, since only process_responses
calls it now.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 582ca690ea4f3ffd2b94826c4db97229bd3c7238
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sun Jun 3 20:59:12 2007 -0700
+
+ Xlib/XCB: Fix _XReadEvents to always enqueue a new event, even if an error
occurs
+
+ Commit c337f9de7cfd89f983f83956b7457a274dd412f3 broke the invariant that
+ _XReadEvents always enqueues at least one event even if an error occurred,
+ because the one call to xcb_wait_for_event would then return an error, not
an
+ event, and nothing else ensured that process_responses would obtain an
event.
+ Fix this by reverting most of c337f9de7cfd89f983f83956b7457a274dd412f3 and
+ f417570735aac865eb6b576d1ea76b5bfcd8573b and implementing the correct fix.
In
+ process_responses, wait_for_first_event now serves as a flag, cleared when
+ actually handling an event.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit e2c1d788d1fe7bd2d34756493951552441e59b8c
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sun Jun 3 17:33:23 2007 -0700
+
+ Xlib/XCB: Only remove pending_requests when there are provably no more
responses.
+
+commit 7a6dbd4b07ca0a49c30ca7a1d2437eafb2e15eab
+Author: Josh Triplett <[EMAIL PROTECTED]>
+Date: Sun Jun 3 15:39:39 2007 -0700
+
+ Bump version number to 1.1.2, and add NEWS entry for 1.1.2
+
+ Signed-off-by: Josh Triplett <[EMAIL PROTECTED]>
+
+commit 416f38f2e67ee1979b3d2feac6f06b3670238804
+Author: Josh Triplett <[EMAIL PROTECTED]>
+Date: Sun Jun 3 12:13:44 2007 -0700
+
+ Revert "Revert "include: don't distribute XlibConf.h""
+
+ This reverts commit 79fa3d8070d95b960ba486f2439225872471dadd.
+
+ Re-revert the XlibConf.h change, which prevented distribution, not
+ installation.
+
+commit 79fa3d8070d95b960ba486f2439225872471dadd
+Author: Josh Triplett <[EMAIL PROTECTED]>
+Date: Sat Jun 2 22:05:16 2007 -0700
+
+ Revert "include: don't distribute XlibConf.h"
+
+ This reverts commit c9e28e05ae01ce8a29bea09df759b6271865b44c.
+
+ The installed XlibInt.h includes XlibConf.h , so libX11 should ship
+ XlibConf.h. (Commit c9e28e05ae01ce8a29bea09df759b6271865b44c didn't
actually
+ prevent automake from shipping XlibConf.h, because it used
+ nodist_x11include_HEADERS rather than nodist_HEADERS.)
+
+commit f417570735aac865eb6b576d1ea76b5bfcd8573b
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sat Jun 2 17:59:15 2007 -0700
+
+ Xlib/XCB: inline wait_or_poll_for_event, which now had only one caller.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit c337f9de7cfd89f983f83956b7457a274dd412f3
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sat Jun 2 17:46:41 2007 -0700
+
+ Xlib/XCB: Ensure _XReadEvents reads at least one new event and blocks for
exactly one event.
+
+ Commit by Jamey Sharp and Josh Triplett.
+
+commit 7f66c897f04806b75e574b55b48921b48045e3f9
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sat Jun 2 16:43:39 2007 -0700
+
+ Update _XReply's copy of _XCBUnlockDisplay's guts.
+
+ We introduced this bug in 6b81cbbedfb521ce046b77ee3cc54e884a1dc0c5.
+
+ Also add a comment in _XCBUnlockDisplay to discourage this problem from
+ respawning.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 740ead23512f8d2eaafaa69e514f1ebafad475b9
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sat Jun 2 16:01:01 2007 -0700
+
+ Xlib/XCB: Avoid re-crashing after _XIOError.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 6b81cbbedfb521ce046b77ee3cc54e884a1dc0c5
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sat Jun 2 12:30:30 2007 -0700
+
+ Hold XCB's Xlib lock even when only the user lock (XLockDisplay) is held.
+
+ An Xlib client can query Display state, such as with NextRequest, while
+ it holds only the Xlib user lock (between XLockDisplay and
+ XUnlockDisplay), so XCB requests in other threads should be blocked when
+ the Xlib user lock is held.
+
+ We acquire the lock even when XInitThreads was not called, so that pure
+ XCB code can use multiple threads even in an otherwise single-threaded
+ Xlib application.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 95523387d619af5b400748898d722e080b5ce1a6
+Author: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Sat Jun 2 11:57:39 2007 -0700
+
+ Allow re-entrant Xlib calls from _XIOError.
+
+ Some libraries try to clean up X resources from atexit handlers, _fini,
+ or C++ destructors. To make these work, the Display lock should be
+ downgraded to a user lock (as in XLockDisplay) before calling exit(3).
+ This blocks Xlib calls from threads other than the one calling exit(3)
+ while still allowing the exit handlers to call Xlib.
+
+ This assumes that the thread calling exit will call any atexit handlers.
+ If this does not hold, then an alternate solution would involve
+ registering an atexit handler to take over the lock, which would only
+ assume that the same thread calls all the atexit handlers.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 91b02b8064f4e0bcc56019f0722914850008a597
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Thu May 17 19:07:34 2007 +0200
+
+ More constification.
+
+commit a4f3841940158351f9424c3f59b305cce877177d
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Thu May 17 00:29:43 2007 +0200
+
+ Constified composite text charset table.
+
+commit 0581c0aa6039e6b2abb9f7b0a4f9904d8e01f00e
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed May 16 23:19:22 2007 +0200
+
+ Have the compiler fill in hexTable so we don't have to do it at runtime.
+
+commit 0e8d9ca47dab0d069e305d5784d05f2ade04f0a8
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed May 16 19:36:23 2007 +0200
+
+ More constification.
+
+commit 6d2bed8f04942b4de086a519ac693e729c9fdeea
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed May 16 19:18:20 2007 +0200
+
+ Constify and clean up token table.
+
+commit 6c508eab5df5d517f7e4cbe6087308cd53a564b2
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed May 16 18:24:42 2007 +0200
+
+ Constified more tables.
+
+commit e699c4231c205ef00d687b6412308d031b99806b
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed May 16 18:01:23 2007 +0200
+
+ Constified error list.
+
+commit c76d30253f1483ac8200ad5c032a818907e65030
+Author: Jan Willem Stumpel <[EMAIL PROTECTED]>
+Date: Fri May 4 12:00:49 2007 -0700
+
+ Update el_GR.UTF-8/Compose.pre to match changes in xkeyboard-config cvs
+
+ Cf:
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=10851
+ https://bugs.freedesktop.org/show_bug.cgi?id=10824
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=386385
+
+ The greek keyboard definition was changed to replace dead_horn and
+ dead_ogonek with U0313 COMBINING COMMA ABOVE (aka Psili) and U0314
+ COMBINING REVERSED COMMA ABOVE (aka Dasia).
+
+ This patch modifies the Greek Compose.pre to match.
+
+ It is generated by the script Jan Willem Stumpel <[EMAIL PROTECTED]>
+ posted to [EMAIL PROTECTED]:
+
+ #!/usr/bin/perl
+ while (<>) {
+ print $_;
+ if (/dead_horn/) {
+ s/dead_horn/U0313/;
+ print $_;
+ }
+ elsif (/dead_ogonek/) {
+ s/dead_ogonek/U0314/;
+ print $_;
+ }
+ }
+
+commit a48386ce6b5f8fd2d9dc11a966c9bf5da59f3831
+Author: Magnus Kessler <[EMAIL PROTECTED]>
+Date: Tue May 1 15:20:08 2007 +0200
+
+ Switched function definitions from K&R to ANSI style.
+
+commit 605d357074d556a05a3fba2e85cbea36a3204248
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Tue May 1 14:47:03 2007 +0200
+
+ Tweaked configure output about the man pages suffix.
+
+commit 9824b40d2af4ca2376512c1be7743da0d5065900
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Apr 28 00:42:18 2007 -0700
+
+ Fix typo in nroff macro in XkbAddGeomOverlayKey.man
+
+commit f93849dcc68bd5042ea0884e5190dc7c35b31d68
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Apr 28 00:30:55 2007 -0700
+
+ Protect C comments and #defines in XKB man pages from being mangled by cpp
+
+commit f2f27d4763c7665e422fab10b96b4cf5ad6c0a6f
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Apr 28 00:14:50 2007 -0700
+
+ Add Makefile to process/install XKB man pages
+
+commit d9954c6f6f3a8c406b946acd0d034ff83c656156
+Author: Dennis Arellano <[EMAIL PROTECTED]>
+Date: Thu Aug 19 00:00:00 1999 -0700
+
+ Add man pages for XKB API's
+
+ Man pages originally written for X11R6.4 integration to Solaris 7 11/99
+ Sun bug id 4258344: Add new XKB API manpages for 6.4 upgrade
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258344>
+
+ (Volunteer needed to convert prototypes in man pages to ANSI C style...)
+
+commit f640a49b5e2ebf29f9d655df544c63bf826f619a
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Fri Apr 20 18:39:59 2007 +0200
+
+ Markup tweak for XOpenIM.
+
+commit e972b0bb255af4f3258217852542faf5afa60b28
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Fri Apr 20 18:35:09 2007 +0200
+
+ Bug #9695: Fixed a few argument types in the XOpenIM manpage.
+
+commit b4e2276f329fa42397cb8609cfcd34ebafd3d96b
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Fri Apr 20 18:28:52 2007 +0200
+
+ Bug #9697: Fixed documentation of XVisualInfo struct.
+
+ The "depth" member was said to be unsigned int, but it's signed.
+
+commit 4068f3dae01c630f825002673b1d3a047ad61863
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Fri Apr 20 16:41:21 2007 +0200
+
+ Bug #9696: refer to XDefineCursor() instead of XDefineCusor().
+
+commit 603c2f88d4e57ce1a3c16e8b6246866e6edd8fa8
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sat Apr 7 14:42:55 2007 +0200
+
+ Use unistd.h to get getresuid() and friends.
+
+ This works since we now have _GNU_SOURCE defined.
+
+commit 0300f295bbd3a0c7c46baac8e0a27aeaf53c9d9b
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sat Apr 7 14:27:12 2007 +0200
+
+ Bug #10562: Define _GNU_SOURCE on glibc systems.
+
+commit a225a0be48770beb689d5ac5da97073634f7deab
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Fri Apr 6 12:46:25 2007 +0200
+
+ For nls/*.pre, allow people to comment lines by starting them with '##'.
+
+ This fixes a bunch of cpp warnings from nls/en_US.UTF-8/Compose.pre.
+ Fixing that file would have been a larger diff, and using ## may be
+ nicer to use anyway.
+
+commit 1c75a9479011e5f1ad01c950628d0ef5a302d8b6
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Fri Apr 6 11:59:31 2007 +0200
+
+ Bug #10475: Fixed lots of char*/const char* mixups.
+
+ I didn't fix all of them, as that would require touching
+ public headers.
+
+commit 680dd50193b5b3fcabdd3f1fcbd6a889d5a95c54
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Thu Apr 5 11:53:18 2007 +0200
+
+ Fix 64bit issues with reallocation.
+
+commit 4d38aeaca42d0bdfe34a833a142ee4d895de03bf
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed Apr 4 18:41:18 2007 +0200
+
+ Fixed a few warnings.
+
+commit 7dc7ef398b6ad90ccd1680ed9cd1cfdd47312f5a
+Author: Matthieu Herrb <[EMAIL PROTECTED](none)>
+Date: Tue Apr 3 15:39:52 2007 +0200
+
+ Multiple integer overflows in the XGetPixel() and XInitImage functions
+
+ CVE-2007-1667
+
+commit 0284b144340a455a4b5b5011d81ac5a610372291
+Author: David Baron <[EMAIL PROTECTED]>
+Date: Fri Mar 30 17:07:46 2007 +0200
+
+ Bug #7703: Fixed XSetSizeHints() et al wrt use of uninitialized data.
+
+ Now only those fields of the respective hint struct are set that
+ are actually valid in the input data.
+ The changed functions are:
+ XSetSizeHints(), XSetWMHints() and XSetWMSizeHints().
+
+commit 0994faa0c76c45b106442db461b8a30a3e1c9395
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Thu Mar 29 17:31:25 2007 +0200
+
+ Fixed the change from the previous SendEvent commit.
+
+ Testing a different patch than the one you commit is bad, right?
+
+commit 398d75528a84f4b8414eb0e363cf53b1b16f6fdf
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed Mar 28 22:23:44 2007 +0200
+
+ Bug #10292: Fixed a memory leak related to XOpenDisplay() in the XCB code.
+
+commit ab0bcd07957cecc8e7c0e75d5160a625e91264fe
+Author: David Baron <[EMAIL PROTECTED]>
+Date: Wed Mar 28 22:21:40 2007 +0200
+
+ Bug #7713: Initialize all of the event's fields before sending it.
+
+commit bc80f9fe3ccce40ee41246b97470c4f0519756ad
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Sun Mar 18 13:14:48 2007 +0100
+
+ Bug #9279: Fixed a file descriptor leak.
+
+commit c9e28e05ae01ce8a29bea09df759b6271865b44c
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Sat Dec 16 00:45:19 2006 +0200
+
+ include: don't distribute XlibConf.h
+
+ Since XlibConf.h is built by configure, don't distribute it.
+
+commit dd1705ced2cac6b4b6b21e79272fcf9bed4bf376
+Merge: 129bbb9... 769b985...
+Author: Jeremy C. Reed <[EMAIL PROTECTED]>
+Date: Thu Dec 14 14:23:20 2006 -0600
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 129bbb9f9114a571556fa3a24f15ba58a5cdb2de
+Author: Jeremy C. Reed <[EMAIL PROTECTED]>
+Date: Thu Dec 14 14:21:19 2006 -0600
+
+ For NetBSD, define the XTHREADLIB and XTHREAD_CFLAGS.
+
+commit 769b9854f7eb1d6d20dd0b4a1c1215ad8e1b77b6
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Dec 6 18:53:00 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+
+ Make ChangeLog hook as safe as possible.
+ (cherry picked from f5d6a3d24095c7ffed86705995d0874c885e7676 commit)
+
+commit 8a8185a649e93b90ffa820387ffdca831227f5a9
+Author: Josh Triplett <[EMAIL PROTECTED]>
+Date: Thu Nov 30 18:33:13 2006 -0800
+
+ Add autogen.sh to EXTRA_DIST.
+
commit efe817f95ef8d05e863c83147e903140bc860de4
Author: Jamey Sharp <[EMAIL PROTECTED]>
Date: Thu Nov 30 17:58:35 2006 -0800
diff --git a/debian/changelog b/debian/changelog
index 79a23e9..335742f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,11 @@ libx11 (2:1.1.2-1) UNRELEASED; urgency=low
+ file descriptor leak in modules/im/ximcp/imLcPrs.c:parseline() fixed,
patch 021_compose_fclose.diff dropped;
+ fix for CVE-2007-1667 included, patch 022_CVE-2007-1667.diff dropped.
+ * Add a watch file.
+ * Don't run dh_install with --list-missing in binary-indep, there are too
+ many false positives for it to be useful.
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 04 Jun 2007 11:01:57 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 05 Jun 2007 00:50:10 +0200
libx11 (2:1.1.1-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 228750e..724b490 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ binary-arch: build install
--exclude=usr/share/man/man3/XGetXCBConnection.3 \
--exclude=usr/share/man/man3/XSetEventQueueOwner.3
dh_install --sourcedir=debian/tmp -Nlibx11-dev -s
- dh_installchangelogs -s ChangeLog
+ dh_installchangelogs -s ChangeLog NEWS
dh_installman -s
dh_link -s
dh_strip -plibx11-6 --dbg-package=libx11-6-dbg
@@ -111,8 +111,8 @@ binary-indep: build install
dh_testroot
dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_install --sourcedir=debian/tmp $(dhinstallindepflags) --list-missing
+ dh_installchangelogs -i ChangeLog NEWS
+ dh_install --sourcedir=debian/tmp -i
dh_link -i
dh_installman -i
dh_compress -i
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..072d1cf
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/lib/ libX11-(.*)\.tar\.gz
commit e3720622ffa61085655dd53bbb04221a28599230
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jun 5 00:46:12 2007 +0200
Delete generated file.
diff --git a/include/X11/XlibConf.h b/include/X11/XlibConf.h
deleted file mode 100644
index 71083f4..0000000
--- a/include/X11/XlibConf.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* include/X11/XlibConf.h. Generated from XlibConf.h.in by configure. */
-/*
- * $Id: $
- *
- * Copyright © 2005 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * 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.
- */
-
-#ifndef _XLIBCONF_H_
-#define _XLIBCONF_H_
-/*
- * This header file exports defines necessary to correctly
- * use Xlibint.h both inside Xlib and by external libraries
- * such as extensions.
- */
-
-/* Threading support? */
-#define XTHREADS
-
-/* Use multi-threaded libc functions? */
-#define XUSE_MTSAFE_API
-
-#endif /* _XLIBCONF_H_ */
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
