New ebuilds containing the fix for bug #129151. Pruning old ebuilds.

(Portage version: 2.1_pre7-r5)

10 files changed, 273 insertions, 203 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 0f69328535fc..51337ca1fa0b 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.145 2006/03/17 23:43:37 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.146 2006/04/11 18:35:52 leonardop Exp $
+
+*gdm-2.14.1 (11 Apr 2006)
+
+  11 Apr 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +gdm-2.14.1.ebuild, +files/gdm-2.14.1-gdmthemetester.in:
+  New upstream release, already includes the fix for bug #129151.
+
+*gdm-2.8.0.7-r1 (11 Apr 2006)
+
+  11 Apr 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gdm-2.8-CVE-2006-1057.patch, +gdm-2.8.0.7-r1.ebuild:
+  Added patch for a local problem with ~/.ICEauthority checks (bug #129151).
 
   17 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   gdm-2.2.5.4-r5.ebuild, gdm-2.8.0.3.ebuild:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 1937de80b0fa..c16f2e2e631d 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -16,21 +16,21 @@ SHA256 2e9220bca60435531ebffae347da9f6e9cf41ee106d7f2a40e05a41f9d3bce21 files/2.
 MD5 3ad7ede91d808101a4f5c51d7d0a5bbb files/digest-gdm-2.14.0 768
 RMD160 2c9f0619ff12d25d4e8a82bb1322a46b7f4c1c07 files/digest-gdm-2.14.0 768
 SHA256 6840a2e1db18614f0b5335363062b72bfb0374b0f84df8ddafb37ca2bb427c06 files/digest-gdm-2.14.0 768
+MD5 0c1ace3988b26cffd059b235c3ba333f files/digest-gdm-2.14.1 768
+RMD160 88cf9d9fb8e8d8f1712ddca3cf7d7249d222b391 files/digest-gdm-2.14.1 768
+SHA256 f7b2145f55f4ad990c22d5eb9b1c91c396ac893d2f9d89da855401470b98559d files/digest-gdm-2.14.1 768
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 RMD160 4ae7b8b36123291e6ab3c7160376957ca8d58290 files/digest-gdm-2.2.5.4-r5 65
 SHA256 fd825e8a018be0bcd60e4a4e90a464a6a3983a8fbb8d4ced69488a0f8ea0e25e files/digest-gdm-2.2.5.4-r5 65
-MD5 15b02bfeac7e3c2ee0c333fe6ab1c8c7 files/digest-gdm-2.8.0.1-r1 771
-RMD160 561a0a6f05aae8b235d119ad3a8500fc4ee412a9 files/digest-gdm-2.8.0.1-r1 771
-SHA256 32c008c095e04af53ad3c1d66a92efb3bdbda19bd92d069537b0d1719d2b817c files/digest-gdm-2.8.0.1-r1 771
 MD5 631aa8e1ae777c2031e595f784b5deb5 files/digest-gdm-2.8.0.3 771
 RMD160 5365ae086ede6c9bbaf5ebad06bb7e15168c8ce6 files/digest-gdm-2.8.0.3 771
 SHA256 de9fed69598aea7227f7bc0c9dc8f5765d4dc673dab744418ebebb04ba5edbe1 files/digest-gdm-2.8.0.3 771
-MD5 6b6d0be7add58349e04329e1e4af41b9 files/digest-gdm-2.8.0.5 211
-RMD160 80b3afda58b8263a46c7b4cf982dbeadb998e926 files/digest-gdm-2.8.0.5 211
-SHA256 10d26e0fc13a111c78dc4eaa1567b4acb464006a9fe743ce149fc551c5040a78 files/digest-gdm-2.8.0.5 211
 MD5 360c677b5cc080f0ae7fad2f0caea4b1 files/digest-gdm-2.8.0.7 771
 RMD160 7c6b74240916a25a9670a8aed9f757f8c88cb660 files/digest-gdm-2.8.0.7 771
 SHA256 8cf0ae021fd73ccacaf2f3d24725d4af6f06532c1d4296aaff4fa4ad341fd8b8 files/digest-gdm-2.8.0.7 771
+MD5 f10f9b7fa2578d0e6d2a06b9cce77205 files/digest-gdm-2.8.0.7-r1 771
+RMD160 e3bd3f6f245dbe15046dad75054872bf14650f5f files/digest-gdm-2.8.0.7-r1 771
+SHA256 7475dd25d42bc78f3412406b9cf6624ce73515339c3af9f61bc975ba0573f6cf files/digest-gdm-2.8.0.7-r1 771
 MD5 4fd1e85595162e54a954871024b2858f files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b files/gdm-2.13.0.1-selinux-remove-attr.patch 908
@@ -43,21 +43,24 @@ SHA256 d90f0004ccb88efb00498fcec0a1839cb1a167e5a30d1369dc234a1d7c8068f6 files/gd
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
 RMD160 0246f4b259af4e3af5561fdc9a5248607e120d63 files/gdm-2.4.4-selinux_remove_attr.patch 826
 SHA256 60abfa3ecfe8f21459162543e026debafe07d7cef527b56e25fc5065517dd487 files/gdm-2.4.4-selinux_remove_attr.patch 826
+MD5 427dde842f39e8008ac1bb9afed23a00 files/gdm-2.8-CVE-2006-1057.patch 3670
+RMD160 a8cdac77abe6b7c00b242d834daf872d50dfedc0 files/gdm-2.8-CVE-2006-1057.patch 3670
+SHA256 4574e37308e1186f50d601daae7fdc0cf1fc108ede4e2138b1c3d21504cdbadb files/gdm-2.8-CVE-2006-1057.patch 3670
 MD5 58c9b5786d2e475a036681177590691b gdm-2.14.0.ebuild 4274
 RMD160 9c5f37ceac2ff8f7c27dbfb4bf767a7894cb8448 gdm-2.14.0.ebuild 4274
 SHA256 cbe7a5f7e352f3dceed3330e1bd9bae449e34ad56ffc376773fed550e9fbf815 gdm-2.14.0.ebuild 4274
+MD5 921c7fcb9b65c64a91113e26a7135b35 gdm-2.14.1.ebuild 4247
+RMD160 30e3454feb63f4073975ed5894d310206c6dac8a gdm-2.14.1.ebuild 4247
+SHA256 3f762cc0c48f15dc2886cd174d9707703216b6a57ff2b05ae91c28f297a22527 gdm-2.14.1.ebuild 4247
 MD5 06ae905e1c548b97c7c4d22a35c2d77c gdm-2.2.5.4-r5.ebuild 4688
 RMD160 1431c820a70c2945368ae968733c77704c13a0c8 gdm-2.2.5.4-r5.ebuild 4688
 SHA256 98fa6a5f5582bdd302563fc59445fac4ea87957ed6a9efad1e41ec7aa627cfd9 gdm-2.2.5.4-r5.ebuild 4688
-MD5 29bcf41847bd426969896a31ee11294a gdm-2.8.0.1-r1.ebuild 3706
-RMD160 4a436b88a00d59e495c5dbbbcb34fb270f8a1a96 gdm-2.8.0.1-r1.ebuild 3706
-SHA256 855e08e283c3b8210fa6bb75f05b8080e59346f8e008714631fbc2d7a7eefd85 gdm-2.8.0.1-r1.ebuild 3706
 MD5 57c0a6f28f964d41ed6595024438b7aa gdm-2.8.0.3.ebuild 3924
 RMD160 cfa05dba8f90eb03884aa9dd7dee93360f90bf83 gdm-2.8.0.3.ebuild 3924
 SHA256 30609e26257d9f20cba6ef3b0fd6d3518167203ca74350226d23e280d724ad70 gdm-2.8.0.3.ebuild 3924
-MD5 53241a71e9a8463c65ed6d1503f3ff00 gdm-2.8.0.5.ebuild 3957
-RMD160 152814493f14255687d9a3452210076ba000cb05 gdm-2.8.0.5.ebuild 3957
-SHA256 c958831d9b056e9b79954c6aa1abe8e8681ca79ca66169e78ca2dfc8951e2c93 gdm-2.8.0.5.ebuild 3957
+MD5 ebb3e775f15cbfaa82dbc7c9e66e00bb gdm-2.8.0.7-r1.ebuild 3992
+RMD160 540f07a95eb760b7375bae6e36a8bdb46e7427a1 gdm-2.8.0.7-r1.ebuild 3992
+SHA256 9a5d726a482b4067e0b02c458ad0c45ca704e7012cc1efb6e928702cb87f40d3 gdm-2.8.0.7-r1.ebuild 3992
 MD5 cbd0f292e5cfc3271386b503391f03a8 gdm-2.8.0.7.ebuild 3885
 RMD160 b7fbff600e1eec106c40373f573b213e50b4b15e gdm-2.8.0.7.ebuild 3885
 SHA256 0e2c53d442c5f8259f3f6d2348f67f171f5c0bda207c02dc4bc08379ea8dad7d gdm-2.8.0.7.ebuild 3885
diff --git a/gnome-base/gdm/files/digest-gdm-2.14.0 b/gnome-base/gdm/files/digest-gdm-2.14.1
index 427c668d95d9..cbfc10e910ba 100644
--- a/gnome-base/gdm/files/digest-gdm-2.14.0
+++ b/gnome-base/gdm/files/digest-gdm-2.14.1
@@ -1,6 +1,6 @@
-MD5 1f82485c4e8cd8ca2f1523a91a624eff gdm-2.14.0.tar.bz2 2997013
-RMD160 1a152d4d2dde11f70be24e6dade98721c3d7c5a1 gdm-2.14.0.tar.bz2 2997013
-SHA256 32a88d7583cbd59beba2c6c8b3f4a6b52a55acd4a3b03c5a32e15fa8e38edfbe gdm-2.14.0.tar.bz2 2997013
+MD5 5bafb764f36d7caf5d2217de0b6ceba5 gdm-2.14.1.tar.bz2 3029446
+RMD160 aafcd0082e148c9a3611ddd3a0d81f5589995a41 gdm-2.14.1.tar.bz2 3029446
+SHA256 8c1c538ed99bc0195097b8f1db7fa2393c73d63613f372a30e28eebd3273229d gdm-2.14.1.tar.bz2 3029446
 MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
diff --git a/gnome-base/gdm/files/digest-gdm-2.8.0.5 b/gnome-base/gdm/files/digest-gdm-2.8.0.5
deleted file mode 100644
index 40df785108e4..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.8.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 2944ba9c2a2bf7032ac81dc24eecf32d gdm-2.8.0.5.tar.bz2 2758902
-MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/files/digest-gdm-2.8.0.1-r1 b/gnome-base/gdm/files/digest-gdm-2.8.0.7-r1
index a4d7feefa3dc..4b39ae6bb805 100644
--- a/gnome-base/gdm/files/digest-gdm-2.8.0.1-r1
+++ b/gnome-base/gdm/files/digest-gdm-2.8.0.7-r1
@@ -1,9 +1,9 @@
 MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 b3925c68b828fbb63994eba577c4b4fd gdm-2.8.0.1.tar.bz2 3522871
-RMD160 af697627b42ff1478ffcaba61a15949f7512a23b gdm-2.8.0.1.tar.bz2 3522871
-SHA256 52887da520c43dc790100e23d33840e04154cdc16dfe341a1d9211baa0661655 gdm-2.8.0.1.tar.bz2 3522871
+MD5 566a1e3d656b6b536414f287ead2db7e gdm-2.8.0.7.tar.bz2 2777760
+RMD160 1c75d83e1a0f94ec1b927491a0409ea86e12a51f gdm-2.8.0.7.tar.bz2 2777760
+SHA256 bd83a23cad86de545f57a7c38cb9b7fa52aedc5bd2f8103f1cc7a35b0bfc6a10 gdm-2.8.0.7.tar.bz2 2777760
 MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
 RMD160 58088fe8a8141938a3efb9352020b14731d6ac56 gentoo-gdm-theme-r2.tar.bz2 418934
 SHA256 29927ac5a0d265703150ffee4eaa4399eace73792365eacfd4174b36c4a9909e gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/files/gdm-2.14.1-gdmthemetester.in b/gnome-base/gdm/files/gdm-2.14.1-gdmthemetester.in
new file mode 100644
index 000000000000..139e1e014615
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.14.1-gdmthemetester.in
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+gdmwhich () {
+  COMMAND="$1"
+  OUTPUT=
+  IFS=:
+  for dir in $PATH
+  do
+    if test -x "$dir/$COMMAND" ; then
+      if test "x$OUTPUT" = "x" ; then
+        OUTPUT="$dir/$COMMAND"
+      fi
+    fi
+  done
+  IFS=$OLD_IFS
+  echo "$OUTPUT"
+}
+
+echo
+echo "GDM Theme Tester"
+echo
+echo "Be sure to test all the environments:"
+echo " console, console-timed, flexi, remote-flexi, xdmcp"
+echo "Also be sure to test using caps lock"
+echo
+
+XNEST=`gdmwhich Xnest`
+GDMXNEST=`gdmwhich gdmXnest`
+GDMGREETER="@libexecdir@/gdmgreeter"
+
+if [ x$XNEST = x ]; then
+	echo "ERROR: Xnest not found"
+        echo ""
+	exit 1
+fi
+
+if [ x$GDMXNEST = x ]; then
+	echo "ERROR: gdmXnest not found"
+        echo ""
+	exit 1
+fi
+
+if [ x$GDMGREETER = x ]; then
+	echo "ERROR: gdmgreeter not found"
+        echo ""
+	exit 1
+fi
+
+USAGE="
+Usage: $0 <environment> <theme>
+<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
+<theme> is either the path of the theme or the name of an installed theme
+
+If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
+you can test the greeter at that resolution
+"
+if [ "$#" != 2 ]; then
+	echo "$USAGE"
+	exit 1
+fi
+
+GDM_THEME="$2"
+DOING_GDM_DEVELOPMENT=yes
+GDM_PARENT_DISPLAY="$DISPLAY"
+export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY
+
+case $1 in
+console)
+	GDM_IS_LOCAL=yes
+	export GDM_IS_LOCAL
+	;;
+console-timed)
+	GDM_IS_LOCAL=yes
+	GDM_FAKE_TIMED=yes
+	export GDM_IS_LOCAL GDM_FAKE_TIMED
+	;;
+flexi)
+	GDM_IS_LOCAL=yes
+	GDM_FLEXI_SERVER=yes
+	export GDM_IS_LOCAL GDM_FLEXI_SERVER
+	;;
+remote-flexi)
+	GDM_FLEXI_SERVER=yes
+	export GDM_FLEXI_SERVER
+	;;
+xdmcp)
+	;;
+*)
+	echo "$USAGE"
+	exit 1
+	;;
+esac
+
+if [ "x$XNESTSIZE" = x ] ; then
+  eval `gdmXnest -b`
+else
+  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
+fi
+export DISPLAY
+
+if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
+	echo "ERROR: Can't start the Xnest server"
+	exit 1
+fi
+
+# This may not be necessary
+sleep 1
+
+@libexecdir@/gdmgreeter
diff --git a/gnome-base/gdm/files/gdm-2.8-CVE-2006-1057.patch b/gnome-base/gdm/files/gdm-2.8-CVE-2006-1057.patch
new file mode 100644
index 000000000000..a8e6b0dc1809
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.8-CVE-2006-1057.patch
@@ -0,0 +1,96 @@
+diff -NurdB gdm-2.8.0.7/daemon/slave.c gdm-2.8.0.7-patched/daemon/slave.c
+--- gdm-2.8.0.7/daemon/slave.c	2005-10-27 21:24:04.000000000 -0500
++++ gdm-2.8.0.7-patched/daemon/slave.c	2006-04-11 12:01:23.000000000 -0500
+@@ -3740,41 +3740,59 @@
+ 				  "Aborting."),
+ 				"session_child_run", login);
+ 
+-	/* setup egid to the correct group,
+-	 * not to leave the egid around.  It's
+-	 * ok to gdm_fail here */
+-	NEVER_FAILS_setegid (pwent->pw_gid);
+-
+-	VE_IGNORE_EINTR (chdir (home_dir));
++	VE_IGNORE_EINTR (g_chdir (home_dir));
+ 	if G_UNLIKELY (errno != 0) {
+-		VE_IGNORE_EINTR (chdir ("/"));
++		VE_IGNORE_EINTR (g_chdir ("/"));
+ 	} else if (pwent->pw_uid != 0) {
+-		if (seteuid (pwent->pw_uid) == 0 &&
+-		    access (".ICEauthority", F_OK) == 0) {
+-			/* sanitize .ICEauthority to be of the correct
+-			 * permissions, if it exists */
+-			struct stat s;
+-			if (stat (home_dir, &s) == 0 &&
+-			    s.st_uid == pwent->pw_uid &&
+-			    stat (".ICEauthority", &s) &&
+-			    S_ISREG (s.st_mode) &&
+-			    (s.st_uid != pwent->pw_uid ||
+-			     s.st_gid != pwent->pw_gid ||
+-			     (s.st_mode & (S_IRWXG|S_IRWXO)))) {
+-				/* This may not work on NFS, but oh well, there
+-				 * this is beyond our help, but it's unlikely
+-				 * that it got screwed up when NFS was used
+-				 * in the first place */
+-				seteuid (0);
+-				/* only if we own the current directory */
+-				chown (".ICEauthority",
+-				       pwent->pw_uid,
+-				       pwent->pw_gid);
+-				chmod (".ICEauthority", S_IRUSR | S_IWUSR);
+-			}
+-		}
+-		seteuid (0);
+-	}
++                /* sanitize .ICEauthority to be of the correct
++                 * permissions, if it exists */
++                struct stat s0, s1, s2;
++                gint        s0_ret, s1_ret, s2_ret;
++                gint        iceauth_fd;
++ 
++                iceauth_fd = open (".ICEauthority", O_RDONLY);
++ 
++                s0_ret = stat (home_dir, &s0);
++                s1_ret = lstat (".ICEauthority", &s1);
++                s2_ret = fstat (iceauth_fd, &s2);
++ 
++                if (iceauth_fd >= 0 &&
++                    s0_ret == 0 &&
++                    s0.st_uid == pwent->pw_uid &&
++                    s1_ret == 0 &&
++                    s2_ret == 0 &&
++                    S_ISREG (s1.st_mode) &&
++                    s1.st_ino == s2.st_ino &&
++                    s1.st_dev == s2.st_dev &&
++                    s1.st_uid == s2.st_uid &&
++                    s1.st_gid == s2.st_gid &&
++                    s1.st_mode == s2.st_mode &&
++                    (s1.st_uid != pwent->pw_uid ||
++                     s1.st_gid != pwent->pw_gid ||
++                     (s1.st_mode & (S_IRWXG|S_IRWXO)) ||
++                     !(s1.st_mode & S_IRWXU))) {
++                        /* This may not work on NFS, but oh well, there
++                         * this is beyond our help, but it's unlikely
++                         * that it got screwed up when NFS was used
++                         * in the first place */
++                        seteuid (0);
++                        /* only if we own the current directory */
++                        fchown (iceauth_fd,
++                                pwent->pw_uid,
++                                pwent->pw_gid);
++                        fchmod (iceauth_fd, S_IRUSR | S_IWUSR);
++                }
++ 
++                if (iceauth_fd >= 0)
++                        close (iceauth_fd);
++ 
++                seteuid (0);
++        }
++
++        /* setup egid to the correct group,
++         * not to leave the egid around.  It's
++         * ok to gdm_fail here */
++        NEVER_FAILS_setegid (pwent->pw_gid);
+ 
+ #ifdef HAVE_LOGINCAP
+ 	if (setusercontext (NULL, pwent, pwent->pw_uid,
diff --git a/gnome-base/gdm/gdm-2.14.0.ebuild b/gnome-base/gdm/gdm-2.14.1.ebuild
index 75f2c282596f..7dac7e084a41 100644
--- a/gnome-base/gdm/gdm-2.14.0.ebuild
+++ b/gnome-base/gdm/gdm-2.14.1.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/gnome-base/gdm/gdm-2.14.0.ebuild,v 1.1 2006/03/17 23:43:37 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.14.1.ebuild,v 1.1 2006/04/11 18:35:52 leonardop Exp $
 
 inherit eutils pam gnome2
 
@@ -33,30 +33,24 @@ RDEPEND="pam? ( virtual/pam )
 	>=media-libs/libart_lgpl-2.3.11
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	||	(
-			(
-				x11-libs/libX11
-				x11-libs/libXdmcp
-				x11-libs/libXi
-				x11-libs/libXext
-				x11-libs/libXinerama
-				x11-libs/libdmx
-				x11-libs/libXau
-				x11-apps/sessreg
-				accessibility? ( x11-libs/libXevie )
-			)
-			virtual/x11
-		)
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXdmcp
+			x11-libs/libXi
+			x11-libs/libXext
+			x11-libs/libXinerama
+			x11-libs/libdmx
+			x11-libs/libXau
+			x11-apps/sessreg
+			accessibility? ( x11-libs/libXevie ) )
+		virtual/x11 )
 	sys-devel/gettext"
 
 DEPEND="${RDEPEND}
-	||	(
-			(
-				x11-proto/inputproto
-				x11-proto/dmxproto
-			)
-			virtual/x11
-		)
+	|| ( (
+			x11-proto/inputproto
+			x11-proto/dmxproto )
+		virtual/x11 )
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.28
 	>=app-text/scrollkeeper-0.1.4"
@@ -65,6 +59,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
 MAKEOPTS="${MAKEOPTS} -j1"
 
+
 pkg_setup() {
 	G2CONF="--sysconfdir=/etc/X11         \
 		--localstatedir=/var              \
@@ -89,13 +84,16 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
+	epatch "${FILESDIR}"/${PN}-2.13.0.1-selinux-remove-attr.patch
 
 	# Fix missing intllib
-	epatch ${FILESDIR}/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
+	epatch "${FILESDIR}"/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
+
+	# Missing file from the tarball
+	cp -f "${FILESDIR}"/${P}-gdmthemetester.in gui/greeter/gdmthemetester.in
 
 	gnome2_omf_fix docs/*/Makefile.in docs/Makefile.in
 }
diff --git a/gnome-base/gdm/gdm-2.8.0.1-r1.ebuild b/gnome-base/gdm/gdm-2.8.0.1-r1.ebuild
deleted file mode 100644
index d0893e677028..000000000000
--- a/gnome-base/gdm/gdm-2.8.0.1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.1-r1.ebuild,v 1.11 2006/03/15 00:50:19 allanonjl Exp $
-
-inherit eutils pam versionator gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://yippi.hypermall.com/gdm/index.shtml"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 pam selinux static tcpd xinerama"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-$(get_version_component_range 1-2)-gentoo-files-r2"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-RDEPEND="pam? ( virtual/pam )
-	!pam? ( sys-apps/shadow )
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.3
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-1.99.2
-	>=gnome-base/libgnome-1.96
-	>=gnome-base/libgnomeui-1.96
-	>=gnome-base/libgnomecanvas-1.109
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.28
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README* TODO"
-
-
-pkg_setup() {
-	G2CONF="--sysconfdir=/etc/X11 --localstatedir=/var \
-		--with-xdmcp $(use_enable ipv6) $(use_with tcpd tcp-wrappers) \
-		$(use_with xinerama) $(use_with selinux) $(use_enable static) \
-		$(use_with pam pam-prefix /etc)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no \
-			--enable-authentication-scheme=shadow"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
-
-	autoconf || die "autoconf failed"
-}
-
-src_install() {
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-	local pam_prefix=""
-
-	use pam && pam_prefix="PAM_PREFIX=${D}/etc"
-
-	gnome2_src_install ${pam_prefix} sysconfdir=/etc/X11 \
-		localstatedir=/var
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f ${D}/usr/sbin/gdm
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-	chown root:gdm ${D}/var/gdm
-	chmod 1770 ${D}/var/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${gentoodir}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${gentoodir}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -f ${D}/etc/pam.d/gdm
-
-	dopamd ${gentoodir}/pam.d/*
-	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/etc/X11/gdm/gdm.conf
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-
-	einfo "To make GDM start at boot, edit /etc/rc.conf"
-	einfo "and then execute 'rc-update add xdm default'."
-
-}
-
-pkg_postrm() {
-
-	gnome2_pkg_postrm
-
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-
-}
diff --git a/gnome-base/gdm/gdm-2.8.0.5.ebuild b/gnome-base/gdm/gdm-2.8.0.7-r1.ebuild
index f3f0895fe77d..d6f337fa315e 100644
--- a/gnome-base/gdm/gdm-2.8.0.5.ebuild
+++ b/gnome-base/gdm/gdm-2.8.0.7-r1.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/gnome-base/gdm/gdm-2.8.0.5.ebuild,v 1.6 2006/01/09 22:57:28 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.7-r1.ebuild,v 1.1 2006/04/11 18:35:52 leonardop Exp $
 
 inherit eutils pam gnome2
 
@@ -33,14 +33,9 @@ RDEPEND="pam? ( virtual/pam )
 	>=media-libs/libart_lgpl-2.3.11
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	|| ( (
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libdmx
-	)
-	virtual/x11 )"
+	|| ( ( x11-libs/libdmx
+		x11-apps/sessreg )
+		virtual/x11 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -51,6 +46,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
 MAKEOPTS="${MAKEOPTS} -j1"
 
+
 pkg_setup() {
 	G2CONF="--sysconfdir=/etc/X11 \
 		--localstatedir=/var          \
@@ -83,6 +79,9 @@ src_unpack() {
 	# Fix locale string translation (Bug #100753)
 	epatch ${FILESDIR}/${PN}-2.13.0.4-esperanto.patch
 
+	# Fix for ~/.ICEauthority checks (bug #129151)
+	epatch ${FILESDIR}/${PN}-2.8-CVE-2006-1057.patch
+
 	gnome2_omf_fix docs/*/Makefile.in
 }
 
@@ -138,11 +137,9 @@ pkg_postinst() {
 	# Soft restart, assumes Gentoo defaults for file locations
 	FIFOFILE=/var/gdm/.gdmfifo
 	PIDFILE=/var/run/gdm.pid
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
+	if [ -w "${FIFOFILE}" ] && [ -f "${PIDFILE}" ] ; then
+		if kill -0 `cat ${PIDFILE}`; then
+			(echo;echo SOFT_RESTART) >> ${FIFOFILE}
 		fi
 	fi