Bump to 2.20.2

- Fix bugs that were causing XDMCP to not work properly.  (Robert
  Nelson and Brian Cameron)

- Fix so that XDMCP configuration options are read from the
  configuration file.  (Andrew Ziem)

- Fix bug with gdmXnestchooser where it wasn't starting Xephyr with
  the correct arguments.  (Andrew Ziem)

- Fix so that GDM allows setting of LC_TYPE without setting LANG.
  (Sjoerd Simons and Takao Fujiwara)

- Icon imporvements.  (Luca Ferretti)

- Fix leaks.  (Andrew Ziem)

Package-Manager: portage-2.1.4_rc3

5 files changed, 267 insertions, 5 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index ff7e5f0a154f..b96ce947f3e3 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.253 2007/11/29 05:59:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.254 2007/11/29 16:46:42 dang Exp $
+
+*gdm-2.20.2 (29 Nov 2007)
+
+  29 Nov 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gdm-2.20.2-gksu.patch, +gdm-2.20.2.ebuild:
+  Bump to 2.20.2
+  - Fix bugs that were causing XDMCP to not work properly.  (Robert
+    Nelson and Brian Cameron)
+  
+  - Fix so that XDMCP configuration options are read from the 
+    configuration file.  (Andrew Ziem)
+  
+  - Fix bug with gdmXnestchooser where it wasn't starting Xephyr with
+    the correct arguments.  (Andrew Ziem)
+  
+  - Fix so that GDM allows setting of LC_TYPE without setting LANG.
+    (Sjoerd Simons and Takao Fujiwara)
+  
+  - Icon imporvements.  (Luca Ferretti)
+  
+  - Fix leaks.  (Andrew Ziem)
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> gdm-2.20.1.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 29fdaad03fea..575b798b57fe 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 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
@@ -18,11 +21,16 @@ AUX gdm-2.20.0-gksu.patch 545 RMD160 f70c443c94e6a2b8e5360fdb85e5fc571ea3dd8c SH
 MD5 6996432b989bdab7fdb23b942a5a1b70 files/gdm-2.20.0-gksu.patch 545
 RMD160 f70c443c94e6a2b8e5360fdb85e5fc571ea3dd8c files/gdm-2.20.0-gksu.patch 545
 SHA256 887e827900049eea610952099e8d50ebf07a493534dfda4662cb14ecc6ca68b6 files/gdm-2.20.0-gksu.patch 545
+AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d
+MD5 98150b89f870b7f16088016ac127d26c files/gdm-2.20.2-gksu.patch 544
+RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac files/gdm-2.20.2-gksu.patch 544
+SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d files/gdm-2.20.2-gksu.patch 544
 DIST gdm-2.16.4.tar.bz2 3139838 RMD160 afccb19cb0e56af9a464fa538de4f59191705142 SHA1 61c9c2f5a29c99aaa85d2b76164540b949b2656b SHA256 0aa32e3b145ce5c6c8d42c7a8bcaa09582737e89de252fa6bda0c55f3af10616
 DIST gdm-2.16.7.tar.bz2 3152229 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 SHA1 493ed37bfd7ee1619d814401bc1ec73c4be7a802 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
 DIST gdm-2.20.0.tar.bz2 3728770 RMD160 972edab6f09b2a0fa1440d42f09a1e688abce280 SHA1 73f7840180645b6a3da0f3c3ac0518c2b4aef1d6 SHA256 8ae2393685d965b3aa48a06a92cb8c19c1df605f3bb0ee12373c2fba49aba2f7
 DIST gdm-2.20.1.tar.bz2 3774217 RMD160 edf3b12d948bb06e53e017d94610ec85680eb364 SHA1 3d3e41ef1d3f808598f28d57166facee47e2addc SHA256 b916867853c0e4ef5b8e76a58baa28ff666fd3da741438c595b5f23d031501d7
+DIST gdm-2.20.2.tar.bz2 3892711 RMD160 19d3bf99853391685a1d16b848c1d27a94502395 SHA1 4e2ad85df9ef61fa304c9a28cf7416a4121db12a SHA256 5e0b3b66b8a9d84ddbe22f03f02a9ce05bdcf77e72973e0fdf44eac6e12a6d04
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.16.4.ebuild 4854 RMD160 ee85a25a41a7aa559a1bd2fb6458388512e0143b SHA1 1f9ad82278560636a4eaba48ebc7d504f4214e59 SHA256 13c13980ff2ac10bced6452b29c623531ea4bd7608a401cd9b11e2bc4e43e7f5
@@ -49,10 +57,14 @@ EBUILD gdm-2.20.1.ebuild 5484 RMD160 f75f6cb62cb2c2519a36541cf4eb5322518e2386 SH
 MD5 64b84f7c4b828f10c6c2eb530c3cb838 gdm-2.20.1.ebuild 5484
 RMD160 f75f6cb62cb2c2519a36541cf4eb5322518e2386 gdm-2.20.1.ebuild 5484
 SHA256 b7cab1bcdaa8177c7d97637e63bf9a705e93bb273b7d438c4e9f0f9bfdd88085 gdm-2.20.1.ebuild 5484
-MISC ChangeLog 33591 RMD160 b2d7213352ea734070bc269a6c90b81674966daa SHA1 97fcd818c91db0de19c7e0e23fd7e7863f7a4718 SHA256 4bc13cda58cad464059928cb4fdc499f9f5bc73e1ddce65ba7908ab084fdaa21
-MD5 ddb94a09457da308c2446cf3bd867196 ChangeLog 33591
-RMD160 b2d7213352ea734070bc269a6c90b81674966daa ChangeLog 33591
-SHA256 4bc13cda58cad464059928cb4fdc499f9f5bc73e1ddce65ba7908ab084fdaa21 ChangeLog 33591
+EBUILD gdm-2.20.2.ebuild 5456 RMD160 62e6da4ac846aaed6115ec931db939bb6045490c SHA1 cf6b1767d734d2257ee1b2aea71290e530077eae SHA256 7d5a84a231c13eebe178fb4667255efa034479171337898f1fcb7fa694e7732b
+MD5 5834b0f5d2663690fd4cf50cd1e754fb gdm-2.20.2.ebuild 5456
+RMD160 62e6da4ac846aaed6115ec931db939bb6045490c gdm-2.20.2.ebuild 5456
+SHA256 7d5a84a231c13eebe178fb4667255efa034479171337898f1fcb7fa694e7732b gdm-2.20.2.ebuild 5456
+MISC ChangeLog 34244 RMD160 d3125c5cf7897a15157c636af0fe59dfd126f619 SHA1 1687100d6f63e942d94b9891aadbb84d10066da0 SHA256 91e1f11d117398fd32fd7e485f0b3d6bb8e466320800c31f3e56acc1027584c4
+MD5 5b7691b8c3ec954833d8d0a2dc30ef4c ChangeLog 34244
+RMD160 d3125c5cf7897a15157c636af0fe59dfd126f619 ChangeLog 34244
+SHA256 91e1f11d117398fd32fd7e485f0b3d6bb8e466320800c31f3e56acc1027584c4 ChangeLog 34244
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -75,3 +87,13 @@ SHA256 8e3bba7482e4f947fde3af4372737cb4000b2c468826a55d909d7584643a2d5a files/di
 MD5 9aed3cdb4a5c9ecc503bd184cc1a24af files/digest-gdm-2.20.1 768
 RMD160 802ac856bf3e068e8ce5872e1ed43cfd56307bf5 files/digest-gdm-2.20.1 768
 SHA256 b11c2358183228fc7e5c1b7af59ea530032bbf66f85f050c1963f767720c48d2 files/digest-gdm-2.20.1 768
+MD5 09a3dd27a37d0ad34bcd095926027d93 files/digest-gdm-2.20.2 768
+RMD160 03800ea59ec76c376f8f6e4df61079bcfe187b17 files/digest-gdm-2.20.2 768
+SHA256 4a6090528bea40c09ef78ffda027acf5694a21094933b85a1761ab52d66fa281 files/digest-gdm-2.20.2 768
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHTu0EomPajV0RnrERAhbYAJ4sgXZNxJb1Dnd8s+T1vY24HoKKggCfS6ES
+KEaxyGU35Fieqz+n1lH6Dkk=
+=yBv7
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.20.2 b/gnome-base/gdm/files/digest-gdm-2.20.2
new file mode 100644
index 000000000000..9f30204936a3
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.20.2
@@ -0,0 +1,9 @@
+MD5 65b5319561ce8464e35750f9c3d594fa gdm-2.20.2.tar.bz2 3892711
+RMD160 19d3bf99853391685a1d16b848c1d27a94502395 gdm-2.20.2.tar.bz2 3892711
+SHA256 5e0b3b66b8a9d84ddbe22f03f02a9ce05bdcf77e72973e0fdf44eac6e12a6d04 gdm-2.20.2.tar.bz2 3892711
+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 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
+RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
+SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch b/gnome-base/gdm/files/gdm-2.20.2-gksu.patch
new file mode 100644
index 000000000000..388917708047
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.2-gksu.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in gdm-2.20.2/gui/gdmsetup.desktop.in.in
+--- gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in	2007-11-26 18:11:04.000000000 -0500
++++ gdm-2.20.2/gui/gdmsetup.desktop.in.in	2007-11-29 11:40:38.000000000 -0500
+@@ -3,7 +3,7 @@ Encoding=UTF-8
+ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
+ TryExec=@sbindir@/gdmsetup
+-Exec=@sbindir@/gdmsetup
++Exec=gksu @sbindir@/gdmsetup
+ Icon=gdmsetup
+ StartupNotify=true
+ Terminal=false
diff --git a/gnome-base/gdm/gdm-2.20.2.ebuild b/gnome-base/gdm/gdm-2.20.2.ebuild
new file mode 100644
index 000000000000..95e0259ec60b
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.20.2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.2.ebuild,v 1.1 2007/11/29 16:46:42 dang Exp $
+
+inherit autotools eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_LIBC="elibc_glibc"
+IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
+
+SRC_URI="${SRC_URI}
+		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
+		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
+
+RDEPEND="dev-libs/dbus-glib
+		 >=dev-libs/glib-2.12
+		 >=x11-libs/gtk+-2.6
+		 >=x11-libs/pango-1.3
+		 >=gnome-base/libglade-2
+		 >=gnome-base/libgnomecanvas-2
+		 >=gnome-base/librsvg-1.1.1
+		 >=dev-libs/libxml2-2.4.12
+		 >=media-libs/libart_lgpl-2.3.11
+		 x11-libs/gksu
+		 x11-libs/libXi
+		 x11-libs/libXau
+		 x11-libs/libX11
+		 x11-libs/libXext
+		 x11-apps/sessreg
+		 x11-libs/libXdmcp
+		 xinerama? ( x11-libs/libXinerama )
+		 sys-auth/consolekit
+		 accessibility? ( x11-libs/libXevie )
+		 afs? ( net-fs/openafs sys-libs/lwp )
+		 dmx? ( x11-libs/libdmx )
+		 pam? ( virtual/pam )
+		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
+		 remote? ( gnome-extra/zenity )
+		 selinux? ( sys-libs/libselinux )
+		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+		dmx? ( x11-proto/dmxproto )
+		sys-devel/gettext
+		x11-proto/inputproto
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		>=app-text/scrollkeeper-0.1.4
+		>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="--with-prefetch=yes               \
+			--sysconfdir=/etc/X11             \
+			--localstatedir=/var              \
+			--with-xdmcp=yes                  \
+			--with-pam-prefix=/etc            \
+			--with-console-kit=yes            \
+			$(use_enable accessibility xevie) \
+			$(use_enable ipv6)                \
+			$(use_enable remote secureremote) \
+			$(use_with selinux)               \
+			$(use_with tcpd tcp-wrappers)     \
+			$(use_with xinerama)"
+
+	if use dmx ; then
+		G2CONF="${G2CONF} --with-dmx=yes"
+	else
+		G2CONF="${G2CONF} --with-dmx=no"
+	fi
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no"
+		if use elibc_glibc ; then
+			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
+		else
+			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
+		fi
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# remove unneeded linker directive for selinux (#41022)
+	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
+
+	# Add gksu to gdmsetup menu entry
+	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
+
+	# 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 -rf "${D}/etc/pam.d"
+
+	if use pam ; then
+		dopamd "${gentoodir}"/pam.d/*
+		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
+	fi
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		/usr/share/gdm/defaults.conf
+
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
+
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
+
+	# Move Gentoo theme in
+	if use branding ; then
+		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To make GDM start at boot, edit /etc/rc.conf"
+	elog "and then execute 'rc-update add xdm default'."
+
+	elog "GDM has changed the location of its configuration file.  Please"
+	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
+	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
+
+	elog "See README.install for more information about the change."
+
+	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
+		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
+	fi
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	# Do restart after gdm.conf move above
+	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
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+		elog "To remove GDM from startup please execute"
+		elog "'rc-update del xdm default'"
+	fi
+}