gnome-base/gdm: fix custom sessions (see bug #216984, work done by Gilles, I'm just committing)

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 240 insertions, 2 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 49c242b524bd..15f7accdcd10 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.284 2009/01/10 12:25:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.285 2009/02/16 14:09:08 remi Exp $
+
+*gdm-2.20.9-r1 (16 Feb 2009)
+
+  16 Feb 2009; Rémi Cardona <remi@gentoo.org> +gdm-2.20.9-r1.ebuild:
+  fix custom sessions (see bug #216984, work done by Gilles, I'm just
+  committing)
 
   10 Jan 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9.ebuild:
   Re-add ~arm/~sh
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a83df87a7bf9..3338d6e8a5ff 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -6,6 +6,7 @@ DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb
 DIST gdm-2.20.5-gentoo-files.tar.bz2 3214 RMD160 a075aa94fc3f6f2947bddf46f008979d62cc94d3 SHA1 9654caf36a91a83ffb5d4e53078a70e8c29a0b61 SHA256 47716f35eb1c6875e9c8e42120ff5f65da806aa06f15a48b082a6f5e5a94da83
 DIST gdm-2.20.7.tar.bz2 3978969 RMD160 1b9321a81aa5984e76715fec9ce7e01f161b8bcb SHA1 349a5a2e60a3e2e229afe99e1342f75e321e53e9 SHA256 84a71eae8a52c89e3044afa69424b8a7e79210024334eb7c23f25bdfa16ca825
 DIST gdm-2.20.8.tar.bz2 3932232 RMD160 c7ddaa03ee698541cea21ca27ebb99b1cdf258aa SHA1 f806b171d0eea6b62238655b6670434f019214ae SHA256 cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894
+DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
 DIST gdm-2.20.9-gentoo-files.tar.bz2 3472 RMD160 b69f79bee41e73321e39554eed2f086d1e767510 SHA1 1ac3766205ef185acfc1be6329a6fcb944dfe35c SHA256 01c51c85e6b8236e785db84c083fda17035f15c13a2c75a9bd6b473139d9f45a
 DIST gdm-2.20.9.tar.bz2 4034232 RMD160 923ec2c14eb153cc93c2291220b0f50f147dcd32 SHA1 b826a14f1f7bbb16d0f4c32c659eb499fefaf956 SHA256 c5c9a3b818f84656cf087da9312106b9aa5cc9d44fa8b4f45bd04799651bb5cd
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
@@ -13,6 +14,7 @@ DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae06
 EBUILD gdm-2.20.3.ebuild 5524 RMD160 00e95bcda06fd71d8cdf5792e9b9844589f55ca8 SHA1 5b499d45a07c065fd0681131fb9d7099ae820a08 SHA256 fdea28f1995f7559e9d8017a13e27450b33122235d63b955835413defb378b23
 EBUILD gdm-2.20.7.ebuild 6178 RMD160 e911bf4cc1dd74231a855a54524fd6368d0383f1 SHA1 06cd537541b0a47832cff1afb689ef1f4e7063a0 SHA256 a7d986cdc9365ee170deba46eb018fc7ce07c655d77e8e979629d17880ef6346
 EBUILD gdm-2.20.8.ebuild 6183 RMD160 08a7d477af0d830605c3367615a5ca6cecfcffff SHA1 fa02c4b9b75946cd986fcbb775b49312756320d1 SHA256 c526c51b73842baecd8f28b0ceb9a64ccbad25d7e9870cb8697dfd5cfd6823ad
+EBUILD gdm-2.20.9-r1.ebuild 6370 RMD160 e6ee526ba6ad01f9138f1d82031677697c8a671e SHA1 cf73054ee57458e6001775ae6074ef49ddf92b76 SHA256 ebbb28f71c4aeeea44551bc1a845875129bb22c11651bf991160b18872fffd65
 EBUILD gdm-2.20.9.ebuild 6367 RMD160 1b7a062624f481e9bb4f596ab014092d8b7b7796 SHA1 0c75b8d7830978dadaadedf726f5600d915b5e7a SHA256 38b54d42824e27f375ccc9965ff896e2726e14812e62d3e5af294e66a21c63eb
-MISC ChangeLog 38398 RMD160 73369fc7df9d91137ac806684783ebe7126e0126 SHA1 2d3e5b69d2669862003598ad902f2e047cb86397 SHA256 04341d2a3ce7037c951617cf798f720e103a4ed6b23583b173d035c220a7916f
+MISC ChangeLog 38580 RMD160 bc54193a14df2854127fb931c83e5cf5c4a4a2b9 SHA1 fc7731a8fd34c8978f6d22c200edc773e44d303a SHA256 3f666dc00507ee78dea141f3193b6999c1137850c858faf83755410189b2c93e
 MISC metadata.xml 316 RMD160 dd83f53b0fed42e9f805b80b04b3282b9845b31a SHA1 c9f36ef8bdecb74248a488aff5830b7b90b31ad6 SHA256 5a3f796b987e8e41016027fa87ca834f30449050b71b95e6ea91e6e37e4daa98
diff --git a/gnome-base/gdm/gdm-2.20.9-r1.ebuild b/gnome-base/gdm/gdm-2.20.9-r1.ebuild
new file mode 100644
index 000000000000..3f2371b6f1fa
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.20.9-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.9-r1.ebuild,v 1.1 2009/02/16 14:09:08 remi Exp $
+
+inherit 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_LIBC="elibc_glibc"
+IUSE="accessibility afs branding 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/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 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
+	pam? (
+		virtual/pam
+		>=sys-auth/pambase-20080318 )
+	!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 )
+	xinerama? ( x11-proto/xineramaproto )
+	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="${G2CONF}
+		--with-prefetch
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-xdmcp=yes
+		--with-pam-prefix=/etc
+		--with-console-kit=yes
+		SOUND_PROGRAM=/usr/bin/gdmplay
+		$(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 gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
+		eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
+		eerror "for USE=\"gnome-keyring\" to have any effect on this package."
+	fi
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+
+		if use gnome-keyring && ! built_with_use sys-auth/pambase gnome-keyring; then
+			eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
+			eerror "unlocking at login time. It will not work properly otherwise."
+		fi
+	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"
+
+	# Fix parallel install, bug #217037
+	epatch "${FILESDIR}/${P}-parallel-make.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
+
+	fowners root:gdm /var/gdm
+	fperms 1770 /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"
+
+	# 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
+	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/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
+}