(#125803) Fix local root vulnerability present in 6.8.99.x and newer. This does NOT affect 6.8.2.

(Portage version: 2.1_pre6-r3)

4 files changed, 34 insertions, 31 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index c99166b464ce..a5d96eeac409 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.523 2006/02/17 20:37:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.524 2006/03/20 18:01:33 spyderous Exp $
+
+*xorg-x11-6.9.0 (20 Mar 2006)
+
+  20 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.99.15-r4.ebuild, +xorg-x11-6.9.0.ebuild:
+  (#125803) Fix local root vulnerability present in 6.8.99.x and newer. This
+  does NOT affect 6.8.2.
 
   17 Feb 2006; Markus Rothe <corsair@gentoo.org> xorg-x11-7.0-r1.ebuild:
   Added ~ppc64
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.15-r4 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.15-r4
deleted file mode 100644
index 17b2f71ec94e..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.15-r4
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
-MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
-MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 087850f509a70708466d0f2d91a02f01 xorg-x11-6.8.99.15-files-0.1.1.tar.bz2 9930
-MD5 4f907a8afee56618a47fd5c2981e5cfd xorg-x11-6.8.99.15-patches-0.1.6.tar.bz2 120323
-MD5 b5062ac32c0bbccf8c653ed7cac7ffcc xorg-x11-6.8.99.15.tar.bz2 45362239
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.9.0 b/x11-base/xorg-x11/files/digest-xorg-x11-6.9.0
new file mode 100644
index 000000000000..c861623df332
--- /dev/null
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.9.0
@@ -0,0 +1,21 @@
+MD5 52ad69832db5c36c7041f90625ed4598 X11R6.9.0-src.tar.bz2 46220125
+RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 X11R6.9.0-src.tar.bz2 46220125
+SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c X11R6.9.0-src.tar.bz2 46220125
+MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
+RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da eurofonts-X11.tar.bz2 8811
+SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 eurofonts-X11.tar.bz2 8811
+MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
+RMD160 861e7048f0ec5136c898976b092b96da8772d70c gemini-koi8-u.tar.bz2 439173
+SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 gemini-koi8-u.tar.bz2 439173
+MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
+RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 xfsft-encodings-0.1.tar.bz2 11892
+SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 xfsft-encodings-0.1.tar.bz2 11892
+MD5 087850f509a70708466d0f2d91a02f01 xorg-x11-6.9.0-files-0.1.tar.bz2 9930
+RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc xorg-x11-6.9.0-files-0.1.tar.bz2 9930
+SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755 xorg-x11-6.9.0-files-0.1.tar.bz2 9930
+MD5 e3e382e5f2fb849224550963fa4bd0ee xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332
+RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332
+SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3 xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
index d16edc5aadc3..f75a204ae43d 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild,v 1.7 2006/01/25 09:29:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild,v 1.1 2006/03/20 18:01:33 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -36,8 +36,8 @@ IUSE="3dfx bitmap-fonts cjk debug doc font-server insecure-drivers ipv6 minimal
 	nls nocxx opengl pam sdk static truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
-FILES_VER="0.1.1"
-PATCH_VER="0.1.6"
+FILES_VER="0.1"
+PATCH_VER="0.1.1"
 XCUR_VER="0.3.1"
 XFSFT_ENC_VER="0.1"
 
@@ -60,17 +60,7 @@ SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
 	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
 	${GENTOO_FILES}
 	${X_PATCHES}
-	http://xorg.freedesktop.org/snapshots/${P}.tar.bz2"
-#	http://xorg.freedesktop.org/X11R${PV}/src-single/X11R${PV}-src.tar.bz2"
-#	http://xorg.freedesktop.org/X11R${PV}/src/X11R${PV}-src1.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src2.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src3.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src4.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src5.tar.gz
-#	doc? (
-#		http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src6.tar.gz
-#		http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src7.tar.gz
-#	)"
+	http://xorg.freedesktop.org/releases/X11R${PV}/src-single/X11R${PV}-src.tar.bz2"
 
 LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
@@ -443,17 +433,9 @@ setup_multilib() {
 unpack_all() {
 	# Unpack source and patches
 	ebegin "Unpacking ${PV} source"
-		unpack ${P}.tar.bz2 > /dev/null
-#		unpack X11R${PV}-src.tar.bz2 > /dev/null
-#		unpack X11R${PV}-src{1,2,3,4,5}.tar.gz > /dev/null
+		unpack X11R${PV}-src.tar.bz2 > /dev/null
 	eend 0
 
-#	if use doc; then
-#		ebegin "Unpacking documentation"
-#			unpack X11R${PV}-src{6,7}.tar.gz > /dev/null
-#		eend 0
-#	fi
-
 	ebegin "Unpacking Gentoo files and patches"
 		unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null
 		unpack ${P}-patches-${PATCH_VER}.tar.bz2 > /dev/null