Fix an overrun that was causing various issues on VT switch. This is already

fixed in 1.1.  (Matthias Dahl, bug #127608)
Package-Manager: portage-2.1

5 files changed, 252 insertions, 8 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 81ca889f386d..fe2c1c954bc4 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.123 2006/06/04 18:51:49 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.124 2006/06/11 18:48:39 joshuabaergen Exp $
+
+*xorg-server-1.0.2-r5 (11 Jun 2006)
+
+  11 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.0.2-fix-readKernelMapping-overrun.patch,
+  +xorg-server-1.0.2-r5.ebuild:
+  Fix an overrun that was causing various issues on VT switch.  This is already
+  fixed in 1.1.  (Matthias Dahl, bug #127608)
 
   04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-server-1.1.0.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e7a3ec54690c..bd2f2db53ff9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,6 +2,10 @@ AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801be
 MD5 177828cd6b8ab3ce98f95bf2363d2036 files/1.0.2-Xprint-xprintdir.patch 563
 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b files/1.0.2-Xprint-xprintdir.patch 563
 SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 files/1.0.2-Xprint-xprintdir.patch 563
+AUX 1.0.2-fix-readKernelMapping-overrun.patch 468 RMD160 6d1f528b14df15b1ff6b658ff611550c39014838 SHA1 67e69a37a74c7e47387769699c207f0a29bfd96d SHA256 28b0502d4e151813455a10a522488d1dddce8671492022433507ff61df277c12
+MD5 a8fb013a42270146a12186aeb0651071 files/1.0.2-fix-readKernelMapping-overrun.patch 468
+RMD160 6d1f528b14df15b1ff6b658ff611550c39014838 files/1.0.2-fix-readKernelMapping-overrun.patch 468
+SHA256 28b0502d4e151813455a10a522488d1dddce8671492022433507ff61df277c12 files/1.0.2-fix-readKernelMapping-overrun.patch 468
 AUX 1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d SHA1 838913c520e5fa4a62a06afb9882e9117458e181 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620
 MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
@@ -50,23 +54,27 @@ AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
 SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
-DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67
-DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
+DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA1 1e7e66ca37b0a08df754d060db03a1d5ccf7bc42 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67
+DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
-DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
+DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
 DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
 EBUILD xorg-server-1.0.2-r4.ebuild 6052 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa SHA1 6c17c4717364f28407e8163d232e1fe61c6d5b7b SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be
 MD5 27e2b115cca585af5c363bcbfed14e61 xorg-server-1.0.2-r4.ebuild 6052
 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa xorg-server-1.0.2-r4.ebuild 6052
 SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be xorg-server-1.0.2-r4.ebuild 6052
+EBUILD xorg-server-1.0.2-r5.ebuild 6111 RMD160 7fca485e56158fe1963c9d9fcbd1be6cdfdaa31d SHA1 e61278b55f934fa27aab51ada94a3fd3eb5a585a SHA256 25aa08c324c14972d183eac81791849222be6d8536445c7eec4efaf53307a9ad
+MD5 af4853722d3b94562e537df206d70c75 xorg-server-1.0.2-r5.ebuild 6111
+RMD160 7fca485e56158fe1963c9d9fcbd1be6cdfdaa31d xorg-server-1.0.2-r5.ebuild 6111
+SHA256 25aa08c324c14972d183eac81791849222be6d8536445c7eec4efaf53307a9ad xorg-server-1.0.2-r5.ebuild 6111
 EBUILD xorg-server-1.1.0.ebuild 22919 RMD160 5db1adb5651dcb13ed81140be11996565a6ae248 SHA1 3daa71393f914219f50c0fc24f1a2f376567792d SHA256 3d9fb8af81deeb20fce0465b43a046159c02938c75f572ec42d725935c0e003c
 MD5 008e008ed19b4a395fdedabc70fc6083 xorg-server-1.1.0.ebuild 22919
 RMD160 5db1adb5651dcb13ed81140be11996565a6ae248 xorg-server-1.1.0.ebuild 22919
 SHA256 3d9fb8af81deeb20fce0465b43a046159c02938c75f572ec42d725935c0e003c xorg-server-1.1.0.ebuild 22919
-MISC ChangeLog 26513 RMD160 831fcc0c2aec31edb72caeb88b447c39dd10e4fc SHA1 99e207cd6b1fa4a3ce37ab3c5de42cfbe1c83c01 SHA256 d2cc5eae6ed73a9560402e28616034f677919ad7cb85c86e039a3c72d46539c6
-MD5 656c5f163ad8cd07060b1f3ba82c4e4c ChangeLog 26513
-RMD160 831fcc0c2aec31edb72caeb88b447c39dd10e4fc ChangeLog 26513
-SHA256 d2cc5eae6ed73a9560402e28616034f677919ad7cb85c86e039a3c72d46539c6 ChangeLog 26513
+MISC ChangeLog 26818 RMD160 3f089d605cbded7c1c711865fe401280423af3d2 SHA1 1edf82cb4a45b23150535fa4c914e7f3853e33aa SHA256 2e0a026748ff227d49a6de5066dc802a8e29311783bc807f77f3a6e7093af768
+MD5 ebb9eca1a77d1413879754de6b0c2a01 ChangeLog 26818
+RMD160 3f089d605cbded7c1c711865fe401280423af3d2 ChangeLog 26818
+SHA256 2e0a026748ff227d49a6de5066dc802a8e29311783bc807f77f3a6e7093af768 ChangeLog 26818
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -74,6 +82,9 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r4 771
 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r4 771
 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r4 771
+MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r5 771
+RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r5 771
+SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r5 771
 MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0 500
 RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0 500
 SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0 500
diff --git a/x11-base/xorg-server/files/1.0.2-fix-readKernelMapping-overrun.patch b/x11-base/xorg-server/files/1.0.2-fix-readKernelMapping-overrun.patch
new file mode 100644
index 000000000000..c279b8f9daea
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.2-fix-readKernelMapping-overrun.patch
@@ -0,0 +1,11 @@
+--- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c~	2005-07-03 11:51:16.000000000 +0100
++++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 17:37:10.000000000 +0100
+@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
+ /*
+  * Maps the AT keycodes to Linux keycodes
+  */
+-static unsigned char at2lnx[NUM_KEYCODES] =
++static unsigned char at2lnx[] =
+ {
+ 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
+ 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r5 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r5
new file mode 100644
index 000000000000..b2e8218ffcfa
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r5
@@ -0,0 +1,9 @@
+MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388
+RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388
+SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388
+MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
+RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
+SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
+MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486
+RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486
+SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild
new file mode 100644
index 000000000000..db8c9c7e9fb9
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r5.ebuild,v 1.1 2006/06/11 18:48:39 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit flag-o-matic x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.4.2"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+PATCHES="${FILESDIR}/${P}-Sbus.patch
+	${FILESDIR}/CVE-2006-1526-xrender-mitri.patch
+	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
+	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
+	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
+	${FILESDIR}/${P}-64bit-fix-for-glx.patch
+	${FILESDIR}/${P}-Xprt-build.patch
+	${FILESDIR}/${P}-xprint-init.patch
+	${FILESDIR}/${PV}-Xprint-xprintdir.patch
+	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
+	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
+	${DISTDIR}/${PV}-overlay-window.patch.bz2
+	${FILESDIR}/${PV}-fix-readKernelMapping-overrun.patch"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2"
+DESCRIPTION="X.Org X servers"
+# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
+RESTRICT="stricter"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dri ipv6 minimal xprint"
+RDEPEND="x11-libs/libXfont
+	x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXi
+	media-libs/freetype
+	media-libs/mesa
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-misc/xbitmaps
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/iceauth
+	x11-apps/rgb
+	x11-apps/xauth
+	x11-apps/xinit
+	app-admin/eselect-opengl
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	!minimal? ( x11-libs/libdmx
+		x11-libs/libXtst
+		x11-libs/libXres )
+	>=x11-libs/libxkbui-1.0.2
+	x11-libs/liblbxutil"
+	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
+	# Xaw is dmx- and xorgcfg-dependent
+	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# liblbxutil is lbx- dependent
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	>=x11-proto/fixesproto-4
+	x11-proto/damageproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86rushproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86bigfontproto
+	>=x11-proto/compositeproto-0.3
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/videoproto
+	x11-proto/scrnsaverproto
+	x11-proto/evieext
+	x11-proto/trapproto
+	>=x11-proto/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	>=x11-proto/kbproto-1.0-r1
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	>=x11-proto/glproto-1.4.1_pre20051013
+	!minimal? ( x11-proto/dmxproto )
+	dri? ( x11-proto/xf86driproto
+		>=x11-libs/libdrm-2 )
+	xprint? ( x11-proto/printproto
+		x11-apps/mkfontdir
+		x11-apps/mkfontscale )"
+LICENSE="${LICENSE} MIT"
+
+pkg_setup() {
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+
+	# --enable-xorg needed because darwin defaults off
+	# --enable-install-setuid needed because sparcs default off
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable !minimal dmx)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable dri)
+		$(use_enable xprint)
+		--with-mesa-source=${WORKDIR}/${MESA_P}
+		--enable-xorg
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Nothing else provides new enough glxtokens.h
+	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	use xprint && xprint_src_install
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
+			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+#		eselect opengl set --use-old ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+}
+
+xprint_src_install() {
+	# RH-style init script, we provide a wrapper
+	exeinto /usr/$(get_libdir)/misc
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
+	# Install the wrapper
+	newinitd ${FILESDIR}/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins ${S}/Xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
+		92xprint-xpserverlist.sh
+	# Patch profile scripts
+	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
+		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
+		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
+	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
+	dodoc ${D}/etc/profile.d/xprint*
+	rm -f ${D}/etc/profile.d/xprint*
+}