upstream patches for bug #156367 and bug #181707, which should solve several user issues

Package-Manager: portage-2.1.3_rc2

6 files changed, 119 insertions, 5 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 944eacfe0424..c928e941c32e 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.73 2007/06/05 23:40:23 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.74 2007/06/15 21:50:52 cardoe Exp $
+
+*libX11-1.1.2-r1 (15 Jun 2007)
+
+  15 Jun 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/libX11-1.1.2-XGetMotionEvents-order-fix.patch,
+  +files/libX11-1.1.2-XimGetWindowEventmask-fix.patch,
+  +libX11-1.1.2-r1.ebuild:
+  upstream patches for bug #156367 and bug #181707, which should solve several
+  user issues
 
 *libX11-1.1.2 (05 Jun 2007)
 
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index c54ac95b2a01..437bcc8ec2b9 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.99.2-xcb_callback_fix.patch 744 RMD160 5ac5520006cbb0e366ef4e81a8a1347d6756cdec SHA1 f24bb68004265a91650cfaff47149be6e8046312 SHA256 f8e9b4b37442aa736abc485171aeb63603bd1c6788e94ebe8cefbb5a89f892b8
 MD5 a60d40f7777b5aa8a81695d9d826cdde files/1.0.99.2-xcb_callback_fix.patch 744
 RMD160 5ac5520006cbb0e366ef4e81a8a1347d6756cdec files/1.0.99.2-xcb_callback_fix.patch 744
@@ -10,6 +13,14 @@ AUX libX11-1.0.1-setuid.diff 420 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c
 MD5 4b14554b64e4a8b1ec3c2b85cb5199b6 files/libX11-1.0.1-setuid.diff 420
 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c files/libX11-1.0.1-setuid.diff 420
 SHA256 449fea81081687314061e465ce6586ad0f41d8dd5b0370dc0ab1ef318407a903 files/libX11-1.0.1-setuid.diff 420
+AUX libX11-1.1.2-XGetMotionEvents-order-fix.patch 405 RMD160 811390446d70bacfec06cfe2b243ea5420bb23a3 SHA1 ffb6009f5365d902f2c2d63c210a4655cf7cf779 SHA256 65eb3ec5598d88e10b2cc5f79f5c5a0d77bc04140f02da749862587cf240ba9b
+MD5 7bfd6a4034d549b3d08d85876f51de7d files/libX11-1.1.2-XGetMotionEvents-order-fix.patch 405
+RMD160 811390446d70bacfec06cfe2b243ea5420bb23a3 files/libX11-1.1.2-XGetMotionEvents-order-fix.patch 405
+SHA256 65eb3ec5598d88e10b2cc5f79f5c5a0d77bc04140f02da749862587cf240ba9b files/libX11-1.1.2-XGetMotionEvents-order-fix.patch 405
+AUX libX11-1.1.2-XimGetWindowEventmask-fix.patch 1099 RMD160 c1177dfd4cbfa470fc98ab9a8a3aeaa8548d1177 SHA1 5135d7772f0b755e508c735612104b8d32f4a519 SHA256 ac8ecbf83fe6af7085b4fd9335c03fbaf3e73791f17a1b74631ce43eb5b1d878
+MD5 ccb6a1b664a0798d06691253346df0d9 files/libX11-1.1.2-XimGetWindowEventmask-fix.patch 1099
+RMD160 c1177dfd4cbfa470fc98ab9a8a3aeaa8548d1177 files/libX11-1.1.2-XimGetWindowEventmask-fix.patch 1099
+SHA256 ac8ecbf83fe6af7085b4fd9335c03fbaf3e73791f17a1b74631ce43eb5b1d878 files/libX11-1.1.2-XimGetWindowEventmask-fix.patch 1099
 AUX xorg-libX11-1.1.1-xinitimage.diff 2683 RMD160 d649c60d66c14ff0315f56bd58b9122e8646f895 SHA1 a0f904115ad9dc441bebcf2f8267f9751322b727 SHA256 2286e63908e3ea6e4eff0455b147d72fe66dd8e1b8cbc21c3dfc0c1fdfc49e68
 MD5 d52da02163cd401b99b6e3a08d7ff068 files/xorg-libX11-1.1.1-xinitimage.diff 2683
 RMD160 d649c60d66c14ff0315f56bd58b9122e8646f895 files/xorg-libX11-1.1.1-xinitimage.diff 2683
@@ -29,14 +40,18 @@ EBUILD libX11-1.1.1-r1.ebuild 954 RMD160 e9286aad6847c49659b15da054d3f3837614c0b
 MD5 b12fdb1ba3134f50d502a73ae31bc9c9 libX11-1.1.1-r1.ebuild 954
 RMD160 e9286aad6847c49659b15da054d3f3837614c0b3 libX11-1.1.1-r1.ebuild 954
 SHA256 aaf5be8c5f4b9f887fec6b9232cae20544bf65ff9c56263af3336feae1672b93 libX11-1.1.1-r1.ebuild 954
+EBUILD libX11-1.1.2-r1.ebuild 1034 RMD160 0c73310d76dd34d7ac0eb92106d082ce9e7cadd0 SHA1 d572797889ede874b2fc998101446579ba12fcac SHA256 ea0645af46a20204dc04981f766ffccb9421e9a5fa514e3a628225b5221eae27
+MD5 ba6cd1125dc91219082ebd178a8e7903 libX11-1.1.2-r1.ebuild 1034
+RMD160 0c73310d76dd34d7ac0eb92106d082ce9e7cadd0 libX11-1.1.2-r1.ebuild 1034
+SHA256 ea0645af46a20204dc04981f766ffccb9421e9a5fa514e3a628225b5221eae27 libX11-1.1.2-r1.ebuild 1034
 EBUILD libX11-1.1.2.ebuild 911 RMD160 28afd3f396a18e24ba37817ff7ed4dfd4f2ea29b SHA1 c89d8f0635c5ef83015afd5a3cea551000428524 SHA256 4068a0aba8c28e804d2738c1f7e3fbf9fac4806efcac4d3044a9648246acf512
 MD5 8a40b3c7d8207edb336f66c25eb0f5a2 libX11-1.1.2.ebuild 911
 RMD160 28afd3f396a18e24ba37817ff7ed4dfd4f2ea29b libX11-1.1.2.ebuild 911
 SHA256 4068a0aba8c28e804d2738c1f7e3fbf9fac4806efcac4d3044a9648246acf512 libX11-1.1.2.ebuild 911
-MISC ChangeLog 10935 RMD160 4c788b67e87185560bbfeaad76d01145db8f4e2d SHA1 9832a034595dfc36064aa1f6e2b84a97e904ce84 SHA256 b2d9b2201ee44c417daf212bc1a6561b6d767e672c9cd3ed78dc530d185d02fb
-MD5 42093f291d4fea8a84c5c1c62e133e88 ChangeLog 10935
-RMD160 4c788b67e87185560bbfeaad76d01145db8f4e2d ChangeLog 10935
-SHA256 b2d9b2201ee44c417daf212bc1a6561b6d767e672c9cd3ed78dc530d185d02fb ChangeLog 10935
+MISC ChangeLog 11242 RMD160 1f5d00ecf54f729de9b761f279f630ae1471fd89 SHA1 a0cf9421e5e5a60fc3693b566a8656d8ed8a0747 SHA256 3a8faaaf16c7b48521ef42972429bf3f21f42dd41f0ac8d458a42bd3b16442c6
+MD5 eb7f50ecf327894752e4501ea8fc5b73 ChangeLog 11242
+RMD160 1f5d00ecf54f729de9b761f279f630ae1471fd89 ChangeLog 11242
+SHA256 3a8faaaf16c7b48521ef42972429bf3f21f42dd41f0ac8d458a42bd3b16442c6 ChangeLog 11242
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -53,3 +68,13 @@ SHA256 6c878f66e2414c792ad843566368dc2f088cd534c0789572df5a4fdd65c883f5 files/di
 MD5 ab9c8153767c8fb1f05c5858a9a8f7e0 files/digest-libX11-1.1.2 244
 RMD160 c6d038bcf97902b0de0c2e92f4fb6073cfb0b9f3 files/digest-libX11-1.1.2 244
 SHA256 93fb5ad156795665ca5cf3506cb05c2e4cf8903acdfcdd3235aaeefe34363858 files/digest-libX11-1.1.2 244
+MD5 ab9c8153767c8fb1f05c5858a9a8f7e0 files/digest-libX11-1.1.2-r1 244
+RMD160 c6d038bcf97902b0de0c2e92f4fb6073cfb0b9f3 files/digest-libX11-1.1.2-r1 244
+SHA256 93fb5ad156795665ca5cf3506cb05c2e4cf8903acdfcdd3235aaeefe34363858 files/digest-libX11-1.1.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGcwnKoeSe8B0zEfwRAl7sAJ97NGfcQ9kBzJeznlc2Hph+mbd0kgCcCVGw
+4Ab57ggTQfig6ayWD5pK3fQ=
+=yK4c
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libX11/files/digest-libX11-1.1.2-r1 b/x11-libs/libX11/files/digest-libX11-1.1.2-r1
new file mode 100644
index 000000000000..c5e04ff282c9
--- /dev/null
+++ b/x11-libs/libX11/files/digest-libX11-1.1.2-r1
@@ -0,0 +1,3 @@
+MD5 710bf38a9477a5a1b235bc94f1d0593c libX11-1.1.2.tar.bz2 1523644
+RMD160 c722e1eaa04a3d753660496d4e527b695c68db38 libX11-1.1.2.tar.bz2 1523644
+SHA256 b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e libX11-1.1.2.tar.bz2 1523644
diff --git a/x11-libs/libX11/files/libX11-1.1.2-XGetMotionEvents-order-fix.patch b/x11-libs/libX11/files/libX11-1.1.2-XGetMotionEvents-order-fix.patch
new file mode 100644
index 000000000000..75e886384f17
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.2-XGetMotionEvents-order-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/GetMoEv.c b/src/GetMoEv.c
+index 2aa6c1a..dac1bfc 100644
+--- a/src/GetMoEv.c
++++ b/src/GetMoEv.c
+@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group.
+ 
+ XTimeCoord *XGetMotionEvents(
+     register Display *dpy,
++    Window w,
+     Time start, 
+     Time stop,
+-    Window w,
+     int *nEvents)  /* RETURN */
+ {       
+     xGetMotionEventsReply rep;
diff --git a/x11-libs/libX11/files/libX11-1.1.2-XimGetWindowEventmask-fix.patch b/x11-libs/libX11/files/libX11-1.1.2-XimGetWindowEventmask-fix.patch
new file mode 100644
index 000000000000..fbd51e7a6bb3
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.2-XimGetWindowEventmask-fix.patch
@@ -0,0 +1,28 @@
+From: Jamey Sharp <jamey@minilop.net>
+Date: Sun, 10 Jun 2007 23:19:59 +0000 (-0700)
+Subject: Fix locking in _XimGetWindowEventmask.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=commitdiff;h=c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
+
+Fix locking in _XimGetWindowEventmask.
+
+Now that XFilterEvent drops the Display lock before invoking callback
+functions, _XimGetWindowEventmask is called without the lock held. So
+when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
+that does not lock the Display, Xlib/XCB would assert:
+
+xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
+
+Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?
+---
+
+--- a/modules/im/ximcp/imDefLkup.c
++++ b/modules/im/ximcp/imDefLkup.c
+@@ -466,7 +466,7 @@ _XimGetWindowEventmask(
+     Xim			im = (Xim )ic->core.im;
+     XWindowAttributes	atr;
+ 
+-    if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
++    if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
+ 	return 0;
+     return (EVENTMASK)atr.your_event_mask;
+ }
diff --git a/x11-libs/libX11/libX11-1.1.2-r1.ebuild b/x11-libs/libX11/libX11-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..96a65bde6d1e
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.1.2-r1.ebuild,v 1.1 2007/06/15 21:50:52 cardoe Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 xcb"
+RDEPEND=">=x11-libs/xtrans-1.0.1
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-proto/kbproto
+	>=x11-proto/xproto-7.0.6
+	xcb? ( >=x11-libs/libxcb-1.0 )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto
+	>=x11-misc/util-macros-0.99.0_p20051007"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)
+	$(use_with xcb)"
+# xorg really doesn't like xlocale disabled.
+# $(use_enable nls xlocale)
+
+PATCHES="${FILESDIR}/libX11-1.1.2-XGetMotionEvents-order-fix.patch
+	${FILESDIR}/libX11-1.1.2-XimGetWindowEventmask-fix.patch"