Wait more before assuming Xserver is defunct (bug #378765 by Enrique Domínguez), this change also solves a problem I was suffering for ages where gdm had problems to restart on systems under heavy load. Also drop .la files (bug #362961 by Stéphane Pagnon).

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

3 files changed, 262 insertions, 15 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 1f137d495509..767c2a862c05 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.340 2011/06/26 06:28:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.341 2011/09/11 22:27:19 pacho Exp $
+
+*gdm-2.20.11-r1 (11 Sep 2011)
+
+  11 Sep 2011; Pacho Ramos <pacho@gentoo.org> +gdm-2.20.11-r1.ebuild:
+  Wait more before assuming Xserver is defunct (bug #378765 by Enrique
+  Domínguez), this change also solves a problem I was suffering for ages where
+  gdm had problems to restart on systems under heavy load. Also drop .la files
+  (bug #362961 by Stéphane Pagnon).
 
   26 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   files/gdm-2.32.0-fix-vt-problems.patch:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index bc7a2cb322a2..6537c794246e 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -21,25 +21,16 @@ DIST gdm-2.20.11.tar.bz2 4013059 RMD160 e400bb8a0b78a2e8b0da98edd2e0f3a7a0267f04
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
 DIST gdm-2.32.1.tar.bz2 2441685 RMD160 70526a3ddec3ff8a1313243641bf807a2218f3ae SHA1 75017d6acfc8e158e0df848629431021b25998a5 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
+EBUILD gdm-2.20.11-r1.ebuild 7208 RMD160 42a522b49bd8e765503801ea7cd71e29fbd0ba75 SHA1 27716226c9b079e70fcb81c52265f1026b7f2d33 SHA256 277d7d123f2e6821213be7b36240a96f55540fea33414b2426c2b0bf42269657
 EBUILD gdm-2.20.11.ebuild 6981 RMD160 d89e163666b53c173578abce9846fed4dde4d5f9 SHA1 5dff7be8ab624c3b15b5dfe6bfb14ae1afc6f0d7 SHA256 174e8685993d432e3cad052626a318f6b622a07954d873ac79c27db0d8ebe3f5
 EBUILD gdm-2.32.1-r1.ebuild 5596 RMD160 69277cc8730fe8c9b5157db0fb8175ee5828e427 SHA1 c71e7cddf7f3fb6701901415170ef73c9e3460d0 SHA256 98ba7249fea7956e4978528c65c183499aa29bac33a317ea8a2325ff6f3b1e6c
 EBUILD gdm-2.32.1.ebuild 5602 RMD160 921d0774cb460a577868e5c68d4b57e6d73c1368 SHA1 b62cedc7eb647f0dd7f493c059a54691d124f349 SHA256 c75ebeeaa77288325da04258e6d12ae4bd7ed4d3c3b8ebc87d4399802e0ce262
-MISC ChangeLog 47294 RMD160 a6a468249d7af23e52541082e755d25f60111fac SHA1 7b03a251d9685417eed041def2ba4a429c831e4c SHA256 e1562518034dcafde85b53309065484ec100c052825aacc116499cbbb784eaeb
+MISC ChangeLog 47660 RMD160 cd8045a2e72a33cb3da171709fdaaa7ebdde2342 SHA1 d0cd1558e28c00b49de97e3be2fec3c240ff1b02 SHA256 e423b07a3fc5663d0e07d844d5a6feb86f1aa6ae85f7cb74a8cc030cc622083b
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOBtGFAAoJEO/kOhxWD91kTG8P/A1vROYtFA8RVbkaaCIZH8Ya
-zQRVvrUldDh1jOqLoj8dS9MOOV61tAF8H/ursGzMbb36fQshJR3KBzGt92p8Hk1i
-QEF9QehNKbyZFwiX5BnkZghRdt3R/5JYm92Kv7rP2u7mV7e0X/o0VZ/fqMLU0HVz
-aWYMQMd5SQR/4JkMo2RV9C0aPYrTVguAHrFigHdEPKu8FwlpOFAJVhVT71lj1Rtf
-5IE2i1XIsnvmiIPZ8wwIOczzOG2NWZMO2BMF+saAttKecO64u3L6KrslRbdoKatM
-dEy5A+osjQk+kAryhViHfBZ4HsUHHE7KgQugeoXd6Kv2PMjCsv+k08gqLQ+6ojpJ
-PspRTjXhm2/2x9XKiJ6cS6t9782dDGmnVUSRGxzOdNQ/JWZlZQl/ydYKyVREKvCR
-Ik+WmsyMSilhDRrxfrm4rrmyW0+DydMUc27O+PlMNrRCJBy/3roRbHJA5WZbtUgU
-YVgUWfYliVcX63QeZ5KmhVWF3Ky4KMAp7YUvd7pdiIuZwB8LQluSRoZzbi7TPByM
-5Ecl2htZxUkCsbJahz5u6HUrTy6G7vFzV8RybmoWqWQkwW6sRvcQpokj+6bE1TZE
-4XJnc8qbYFg1txmSt9ck6h6UtoIlh4IGSvFU+jAD+fmrUAg1VPmBUdeV7xJI0rTF
-yf7i6Jr624cHMZ4XB0rk
-=rts0
+iEYEARECAAYFAk5tNc0ACgkQCaWpQKGI+9ThiwCfVBWxedmqvaN/SlOfHvnExFKB
+XUsAn14TZrR8BzQ8IlJiT7270bklrClg
+=2/qv
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
new file mode 100644
index 000000000000..c1c37a8c2606
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.1 2011/09/11 22:27:19 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_LIBC="elibc_glibc"
+IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2
+	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=x11-libs/gtk+-2.6:2
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-2:2.0
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/librsvg-1.1.1:2
+	>=dev-libs/libxml2-2.4.12:2
+	>=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 )
+	consolekit? (
+		sys-auth/consolekit
+		dev-libs/dbus-glib )
+	accessibility? ( x11-libs/libXevie )
+	afs? ( net-fs/openafs sys-libs/lwp )
+	dmx? ( x11-libs/libdmx )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
+	pam? ( virtual/pam )
+	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
+	remote? ( gnome-extra/zenity )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=x11-misc/xdg-utils-1.0.2-r3"
+DEPEND="${RDEPEND}
+	dmx? ( x11-proto/dmxproto )
+	xinerama? ( x11-proto/xineramaproto )
+	app-text/docbook-xml-dtd:4.1.2
+	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"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--with-prefetch
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-xdmcp=yes
+		--with-pam-prefix=/etc
+		SOUND_PROGRAM=/usr/bin/gdmplay
+		$(use_enable ipv6)
+		$(use_enable remote secureremote)
+		$(use_with accessibility xevie)
+		$(use_with consolekit console-kit)
+		$(use_with dmx)
+		$(use_with selinux)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with xinerama)"
+
+	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_prepare() {
+	gnome2_src_prepare
+
+	# 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"
+
+	# Fix parallel install, bug #217037
+	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
+
+	# Make custom session work, bug #216984
+	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
+
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
+
+	# Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or
+	# does not contain any relevant data and autologin enabled, bug #281442
+	epatch "${FILESDIR}/${PN}-2.20.10-desktop-session-dmrc-autologin.patch"
+
+	# Fix 24 hour combo box in gdmsetup, bug #301151
+	# patch imported from ubuntu mirrors
+	epatch "${FILESDIR}/${PN}-2.20.10-gdmsetup-24hr-combo.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}
+
+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
+
+	fowners root:gdm /var/gdm
+	fperms 1770 /var/gdm
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe "${gentoodir}/custom.desktop"
+
+	# add xinitrc.d scripts
+	exeinto /etc/X11/xinit/xinitrc.d
+	doexe "${FILESDIR}/49-keychain"
+	doexe "${FILESDIR}/50-ssh-agent"
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	# add a custom sound playing script (#248253)
+	dobin "${gentoodir}/gdmplay"
+
+	# avoid file collision, bug #213118
+	rm -f "${D}/usr/share/xsessions/gnome.desktop"
+
+	# We replace the pam stuff by our own
+	rm -rf "${D}/etc/pam.d"
+
+	if use pam ; then
+		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
+
+		dopamd "${gentoodir}"/pam.d/*
+		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
+	fi
+
+	# use graphical greeter local
+	sed -i -e "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		"${D}"/usr/share/gdm/defaults.conf || die
+
+	# list available users
+	sed -i -e "s:^#MinimalUID=.*:MinimalUID=1000:" "${D}"/usr/share/gdm/defaults.conf || die
+	sed -i -e "s:^#IncludeAll=.*:IncludeAll=true:" "${D}"/usr/share/gdm/defaults.conf || die
+
+	# Fix old X11R6 paths
+	sed -i -e "s:/usr/X11R6/bin:/usr/bin:" "${D}"/usr/share/gdm/defaults.conf || die
+
+	# Use Clearlooks as default theme, bug #268496
+	sed -i -e "s:#GtkTheme=Default:GtkTheme=Clearlooks:" "${D}"/usr/share/gdm/defaults.conf || die
+
+	# Wait more before assuming Xserver is defunct, bug #378765
+	sed -i -e "s:GdmXserverTimeout=10:GdmXserverTimeout=25:" "${D}"/usr/share/gdm/defaults.conf || die
+
+	# 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/conf.d/xdm"
+	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 use gnome-keyring; then
+		elog "For autologin to unlock your keyring, you need to set an empty"
+		elog "password on your keyring. Use app-crypt/seahorse for that."
+	fi
+
+	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
+}