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

Package-Manager: portage-2.1_pre6-r3

5 files changed, 43 insertions, 50 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/Manifest b/x11-base/xorg-x11/Manifest
index 59a028404d58..65b57bce879a 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,18 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e44eba129524e9f23771a0802755a1d1 ChangeLog 115813
-RMD160 540ad159c49138f88bdd3af9308408ee4ebccf70 ChangeLog 115813
-SHA256 6b643941b967ab4595df7e8f21ae97468743d5dc69b2a06e5b164fbdb7f5702f ChangeLog 115813
+MD5 43140094a41609d6c9fab4c6efaf5630 ChangeLog 116061
+RMD160 60f6114c7db0dd5399f9d2de33a65dff47bbb610 ChangeLog 116061
+SHA256 5387494dc7a6fd2eac89eb6f226fed5b3a4d02c3635ae9df5c03547a1ba635b6 ChangeLog 116061
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
 SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
 MD5 d62de174f95a61691209aac0a2ff39a6 files/digest-xorg-x11-6.8.2-r6 1834
 RMD160 78eb6ba124ec564a437ac0f8bbea5917495e5596 files/digest-xorg-x11-6.8.2-r6 1834
 SHA256 36f92eea9fd6b4345001fc67164120bcd885267f5ad1dbe81547ffe7230f2f28 files/digest-xorg-x11-6.8.2-r6 1834
-MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518
-RMD160 e58d7b79cb6f6dcf7912be78037a6222920b62ca files/digest-xorg-x11-6.8.99.15-r4 518
-SHA256 bdf7bc683158bf46d696a2388ae076444fc3c65516ac9019863c4a140e1ec07c files/digest-xorg-x11-6.8.99.15-r4 518
+MD5 c3e8a36e06412232a60c8ea285357ece files/digest-xorg-x11-6.9.0 1831
+RMD160 ab84a1d96a2f006310190681c711f8951c46db3c files/digest-xorg-x11-6.9.0 1831
+SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/digest-xorg-x11-6.9.0 1831
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.0-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.0-r1 0
@@ -25,16 +22,9 @@ SHA256 f7320b781367e5f20e600e8f66b6d6f3252123e425a2d17aa6d14ab4792adf50 xorg-x11
 MD5 d54d6498d0e3c468e8d41de1213c2cdd xorg-x11-6.8.2-r6.ebuild 55184
 RMD160 3f164471d6a66b10f2aac3df85d4e6410f73955d xorg-x11-6.8.2-r6.ebuild 55184
 SHA256 8a424c4ea63bf20cf04aab7c79825c6f838205c01fc44da3e245f342833498d9 xorg-x11-6.8.2-r6.ebuild 55184
-MD5 fd0a1f5519f3c1704de9c3744b7670ec xorg-x11-6.8.99.15-r4.ebuild 54157
-RMD160 aa87ce403b2398d82061197321a41f3c26cffc22 xorg-x11-6.8.99.15-r4.ebuild 54157
-SHA256 a776983eb4bd04de304af15a6bfb3a68ee558d48a164a26fd8aaadbb47d4be93 xorg-x11-6.8.99.15-r4.ebuild 54157
+MD5 5dbbc23a3cb4a4c1f11fc85e63310bf2 xorg-x11-6.9.0.ebuild 53410
+RMD160 f3de09a4e72137aa89e9df9029495ce05efcbb0e xorg-x11-6.9.0.ebuild 53410
+SHA256 e60de8f0476aaffef4d44416595b815d2001e933b8d8857a30f58c792bca41cb xorg-x11-6.9.0.ebuild 53410
 MD5 2a6aeb939740182c4077a0a37ef74835 xorg-x11-7.0-r1.ebuild 17365
 RMD160 dd56b266c00f357371e51eece9aaeff6ab72d05b xorg-x11-7.0-r1.ebuild 17365
 SHA256 a5326838a3cb004c179ebfeecea9c408c2793b33dc191ebc8d2ecc9b5abf73eb xorg-x11-7.0-r1.ebuild 17365
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEBmkX2+ySkm8kpY0RArrMAJ93HmgWS8yc7RqWY27lg16G8tb/QACgok1d
-xLEIV/XNlKyY/RFgiiHoLjc=
-=8oaL
------END PGP SIGNATURE-----
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