fix security bug 114234

(Portage version: 2.1_pre4-r1)

6 files changed, 136 insertions, 11 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 437682be2cb4..2229338e153f 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.35 2006/01/05 21:48:53 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.36 2006/02/18 10:28:10 blubb Exp $
+
+*emul-linux-x86-xlibs-2.2.2-r1 (17 Feb 2006)
+*emul-linux-x86-xlibs-2.2.2 (17 Feb 2006)
+
+  17 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  +emul-linux-x86-xlibs-2.2.2.ebuild, +emul-linux-x86-xlibs-2.2.2-r1.ebuild:
+  version bump regarding security bug 114234 (comment 38)
 
   05 Jan 2006; Herbie Hopkins <herbs@gentoo.org>
   -emul-linux-x86-xlibs-2.1.ebuild, -emul-linux-x86-xlibs-2.1-r1.ebuild,
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 1d3a54b42c06..c811c764a4d4 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,16 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 54ae21cbb9e18c3dffa2f9a17f065a3a ChangeLog 6558
+RMD160 6400f1f2978e515b0c594c0c29cda0952f0d591b ChangeLog 6558
+SHA256 e042709b1485a657b7b67b0bfb177ba697d046f161da0b02393a19e83e0e0a28 ChangeLog 6558
 MD5 32dea13787b6b38f21de776c9839c7a8 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1139
+RMD160 a0364efdcdf47c0f927d786c41f70d8eba16eb68 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1139
+SHA256 bff5d319a9d31b716a0f7c4f386dc7e3631d6bcd2f51dd002d7c2af2a28f5544 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1139
 MD5 294951a6f3b9c28c616756d00052516e emul-linux-x86-xlibs-2.2.1.ebuild 1128
+RMD160 5e0897af4e48b159bd6f41feb10178a8e321f967 emul-linux-x86-xlibs-2.2.1.ebuild 1128
+SHA256 db31c1ef43c16709f5458366a1929779d5a2b4d3f0054ba2a1637eb819dd715c emul-linux-x86-xlibs-2.2.1.ebuild 1128
+MD5 32dea13787b6b38f21de776c9839c7a8 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1139
+RMD160 a0364efdcdf47c0f927d786c41f70d8eba16eb68 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1139
+SHA256 bff5d319a9d31b716a0f7c4f386dc7e3631d6bcd2f51dd002d7c2af2a28f5544 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1139
+MD5 294951a6f3b9c28c616756d00052516e emul-linux-x86-xlibs-2.2.2.ebuild 1128
+RMD160 5e0897af4e48b159bd6f41feb10178a8e321f967 emul-linux-x86-xlibs-2.2.2.ebuild 1128
+SHA256 db31c1ef43c16709f5458366a1929779d5a2b4d3f0054ba2a1637eb819dd715c emul-linux-x86-xlibs-2.2.2.ebuild 1128
 MD5 0393dcaadf58787ed27c9f9207de7cea files/digest-emul-linux-x86-xlibs-2.2.1 80
+RMD160 fe174a9e47494af7ba385808a1856581c47ffb80 files/digest-emul-linux-x86-xlibs-2.2.1 80
+SHA256 f41e9fcd6e563236cd21d5068e36285accc2d9d34e7bbc62660410e47d0f4e4f files/digest-emul-linux-x86-xlibs-2.2.1 80
 MD5 0393dcaadf58787ed27c9f9207de7cea files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
+RMD160 fe174a9e47494af7ba385808a1856581c47ffb80 files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
+SHA256 f41e9fcd6e563236cd21d5068e36285accc2d9d34e7bbc62660410e47d0f4e4f files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
+MD5 db234ca6317b37de497f2d1433116e6c files/digest-emul-linux-x86-xlibs-2.2.2 286
+RMD160 45c0a9982e1d94b4a07b1e66193705e118d8fb41 files/digest-emul-linux-x86-xlibs-2.2.2 286
+SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/digest-emul-linux-x86-xlibs-2.2.2 286
+MD5 db234ca6317b37de497f2d1433116e6c files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
+RMD160 45c0a9982e1d94b4a07b1e66193705e118d8fb41 files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
+SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvZRR2G5bA0cA/ScRAjPqAJ9OTG8Ua5RWB/dADUWn36ovJEotOgCeK/4E
-mPhYM82O4B8QFsLMoOgSUCY=
-=Hsbt
------END PGP SIGNATURE-----
+RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
+SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..230bd1b5d52a
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2-r1.ebuild,v 1.1 2006/02/18 10:28:10 blubb Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+DEPEND=""
+
+RDEPEND="opengl? ( app-admin/eselect-opengl )
+	 virtual/libc
+	 >=app-emulation/emul-linux-x86-baselibs-2.0"
+
+S=${WORKDIR}
+
+pkg_preinst() {
+	# Check for bad symlink before installing, bug 84441.
+	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
+		rm -f /emul/linux/x86/usr/lib/X11
+	fi
+}
+
+src_install() {
+	cp -RPvf ${WORKDIR}/* ${D}/
+
+	local libdir="lib32"
+	if has_multilib_profile; then
+		libdir=$(get_abi_LIBDIR x86)
+	fi
+
+	dodir /usr/${libdir}/opengl
+	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
+}
+
+pkg_postinst() {
+	#update GL symlinks
+	if use opengl ; then
+		/usr/bin/eselect opengl set --use-old
+	fi
+}
+
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2.ebuild
new file mode 100644
index 000000000000..920bb5ed3714
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.2.ebuild,v 1.1 2006/02/18 10:28:10 blubb Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE="opengl"
+
+DEPEND=""
+
+RDEPEND="opengl? ( x11-base/opengl-update )
+	 virtual/libc
+	 >=app-emulation/emul-linux-x86-baselibs-2.0"
+
+S=${WORKDIR}
+
+pkg_preinst() {
+	# Check for bad symlink before installing, bug 84441.
+	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
+		rm -f /emul/linux/x86/usr/lib/X11
+	fi
+}
+
+src_install() {
+	cp -RPvf ${WORKDIR}/* ${D}/
+
+	local libdir="lib32"
+	if has_multilib_profile; then
+		libdir=$(get_abi_LIBDIR x86)
+	fi
+
+	dodir /usr/${libdir}/opengl
+	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
+}
+
+pkg_postinst() {
+	#update GL symlinks
+	if use opengl ; then
+		/usr/bin/opengl-update --use-old
+	fi
+}
+
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.2
new file mode 100644
index 000000000000..8275bf16ac66
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.2
@@ -0,0 +1,3 @@
+MD5 0529713e9d805b765c603025e8758eb0 emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717
+RMD160 c6b67da6ed6042c34c67703bac2d3088da11dd55 emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717
+SHA256 477327f1d13aebba57a06406e3fc08b7f1d44d49d6e28b9316de3c933ff15c4d emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.2-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.2-r1
new file mode 100644
index 000000000000..8275bf16ac66
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.2-r1
@@ -0,0 +1,3 @@
+MD5 0529713e9d805b765c603025e8758eb0 emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717
+RMD160 c6b67da6ed6042c34c67703bac2d3088da11dd55 emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717
+SHA256 477327f1d13aebba57a06406e3fc08b7f1d44d49d6e28b9316de3c933ff15c4d emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717