diff options
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 57 | ||||
| -rw-r--r-- | gnome-base/gdm/files/49-keychain | 2 | ||||
| -rw-r--r-- | gnome-base/gdm/files/50-ssh-agent | 2 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-2.26.1.ebuild | 199 | ||||
| -rw-r--r-- | gnome-base/gdm/metadata.xml | 10 |
5 files changed, 239 insertions, 31 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 89b6342dc683..3dc2ce0e942a 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,13 @@ # 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.294 2009/05/01 10:28:07 eva Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.295 2009/06/16 14:00:22 nirbheek Exp $ + +*gdm-2.26.1 (16 Jun 2009) + + 16 Jun 2009; Nirbheek Chauhan <nirbheek@gentoo.org> files/49-keychain, + files/50-ssh-agent, +gdm-2.26.1.ebuild, metadata.xml: + Version bump to 2.26.1, complete rewrite, major feature regressions, but + finally bug-free enough to be added to tree p.masked *gdm-2.20.10-r1 (01 May 2009) @@ -11,7 +18,7 @@ pambase to PDEPEND and replace built_with_use by USE-deps. Raise pambase dependency for proper consolekit handling. Clean up old revisions. - 28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9-r1.ebuild: + 28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9-r1.ebuild: arm/sh stable *gdm-2.20.10 (12 Apr 2009) @@ -26,7 +33,7 @@ 21 Mar 2009; Jeroen Roovers <jer@gentoo.org> gdm-2.20.9-r1.ebuild: Stable for HPPA (bug #244468). - 06 Mar 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9-r1.ebuild: + 06 Mar 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9-r1.ebuild: ia64/sparc stable wrt #244468 27 Feb 2009; Joseph Jezak <josejx@gentoo.org> gdm-2.20.9-r1.ebuild: @@ -43,11 +50,11 @@ *gdm-2.20.9-r1 (16 Feb 2009) - 16 Feb 2009; Rémi Cardona <remi@gentoo.org> +gdm-2.20.9-r1.ebuild: + 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: + 10 Jan 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9.ebuild: Re-add ~arm/~sh *gdm-2.20.9 (05 Jan 2009) @@ -69,7 +76,7 @@ 03 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> +gdm-2.20.8.ebuild: bump to 2.20.8, should fix bug #233092 and #210302. - 12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.7.ebuild: + 12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.7.ebuild: alpha/ia64/sparc stable wrt #229709 10 Aug 2008; Markus Meier <maekke@gentoo.org> gdm-2.20.7.ebuild: @@ -81,7 +88,7 @@ 28 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org> metadata.xml: Add local USE flags to metadata.xml - 26 Jul 2008; Olivier Crête <tester@gentoo.org> gdm-2.20.7.ebuild: + 26 Jul 2008; Olivier Crête <tester@gentoo.org> gdm-2.20.7.ebuild: Stable on amd64, bug #229709 *gdm-2.20.7 (03 Jul 2008) @@ -117,7 +124,7 @@ bump to 2.20.5, mostly translation updates. Also fix bug #216664 and bug #216984. - 24 Mar 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.4.ebuild: + 24 Mar 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.4.ebuild: Add ~ia64/~sparc 23 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.20.4.ebuild: @@ -137,7 +144,7 @@ 04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gdm-2.20.3.ebuild: Stable for HPPA (bug #208366). - 03 Feb 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.3.ebuild: + 03 Feb 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.3.ebuild: alpha/ia64/sparc stable wrt #208366 02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gdm-2.20.3.ebuild: @@ -197,10 +204,10 @@ 24 Nov 2007; Brent Baude <ranger@gentoo.org> gdm-2.20.1.ebuild: Marking gdm-2.20.1 ppc stable for bug 199740 - 22 Nov 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.20.1.ebuild: + 22 Nov 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.20.1.ebuild: alpha/ia64/sparc stable wrt #199740 - 21 Nov 2007; Dawid Węgliński <cla@gentoo.org> gdm-2.20.1.ebuild: + 21 Nov 2007; Dawid WÄgliÅski <cla@gentoo.org> gdm-2.20.1.ebuild: Stable on x86 (bug #199740) 20 Nov 2007; Markus Rothe <corsair@gentoo.org> gdm-2.18.4-r1.ebuild: @@ -212,13 +219,13 @@ 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> gdm-2.18.4-r1.ebuild: Stable on mips, per #199322. - 17 Nov 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.18.4-r1.ebuild: + 17 Nov 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.18.4-r1.ebuild: alpha/ia64/sparc stable wrt #199322 17 Nov 2007; nixnut <nixnut@gentoo.org> gdm-2.18.4-r1.ebuild: Stable on ppc wrt bug 199322 - 17 Nov 2007; Dawid Węgliński <cla@gentoo.org> gdm-2.18.4-r1.ebuild: + 17 Nov 2007; Dawid WÄgliÅski <cla@gentoo.org> gdm-2.18.4-r1.ebuild: Stable on x86 (bug #199322) 16 Nov 2007; Samuli Suominen <drac@gentoo.org> gdm-2.18.4-r1.ebuild: @@ -282,11 +289,11 @@ 10 Aug 2007; Christoph Mende <angelos@gentoo.org> gdm-2.18.4.ebuild: Stable on amd64 wrt bug #185823 - 09 Aug 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.16.7.ebuild, + 09 Aug 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.16.7.ebuild, gdm-2.18.4.ebuild: alpha/ia64 stable wrt security #187919 - 08 Aug 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.18.2.ebuild: + 08 Aug 2007; Raúl Porcel <armin76@gentoo.org> gdm-2.18.2.ebuild: alpha/ia64 stable wrt #185823 07 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> gdm-2.16.7.ebuild: @@ -388,7 +395,7 @@ -gdm-2.16.2.ebuild: Prune old versions - 21 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> gdm-2.14.11.ebuild, + 21 Dec 2006; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.14.11.ebuild, gdm-2.16.4.ebuild: Stable on Alpha + IA64. @@ -404,7 +411,7 @@ 18 Dec 2006; Jason Wever <weeve@gentoo.org> gdm-2.14.11.ebuild: Stable on SPARC wrt security bug #158072. - 17 Dec 2006; René Nussbaumer <killerfox@gentoo.org> gdm-2.16.4.ebuild: + 17 Dec 2006; René Nussbaumer <killerfox@gentoo.org> gdm-2.16.4.ebuild: Stable on hppa. See bug #156662. 17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> gdm-2.16.4.ebuild: @@ -467,7 +474,7 @@ -gdm-2.8.0.7.ebuild, -gdm-2.8.0.7-r1.ebuild, -gdm-2.8.0.8.ebuild: Clean up old - 20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> gdm-2.14.9-r1.ebuild: + 20 Oct 2006; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.14.9-r1.ebuild: Stable on Alpha. 13 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> +gdm-2.16.1.ebuild: @@ -804,7 +811,7 @@ 12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> gdm-2.6.0.9-r2.ebuild: stable onmips - 02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> gdm-2.6.0.9-r2.ebuild: + 02 Jul 2005; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.6.0.9-r2.ebuild: Stable on alpha. 25 Jun 2005; Guy Martin <gmsoft@gentoo.org> gdm-2.6.0.9-r2.ebuild: @@ -813,7 +820,7 @@ 13 Jun 2005; Markus Rothe <corsair@gentoo.org> gdm-2.6.0.9-r2.ebuild: Stable on ppc64 - 12 Jun 2005; Olivier Crête <tester@gentoo.org> gdm-2.6.0.9-r2.ebuild: + 12 Jun 2005; Olivier Crête <tester@gentoo.org> gdm-2.6.0.9-r2.ebuild: Stable on amd64 12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org> @@ -837,7 +844,7 @@ 29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> gdm-2.6.0.7.ebuild: Stable on sparc - 28 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gdm-2.6.0.7.ebuild: + 28 Apr 2005; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.6.0.7.ebuild: Stable on alpha + ia64. *gdm-2.6.0.9 (26 Apr 2005) @@ -869,7 +876,7 @@ 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance - 24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gdm-2.6.0.6.ebuild: + 24 Dec 2004; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.6.0.6.ebuild: Stable on alpha. 23 Dec 2004; Guy Martin <gmsoft@gentoo.org> gdm-2.6.0.6.ebuild: @@ -881,7 +888,7 @@ 19 Dec 2004; Mike Gardiner <obz@gentoo.org> gdm-2.6.0.6.ebuild: Keyworded x86 and ppc for GNOME 2.8.1 - 11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gdm-2.6.0.4-r1.ebuild: + 11 Dec 2004; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.6.0.4-r1.ebuild: Stable on alpha. *gdm-2.6.0.6 (25 Nov 2004) @@ -931,7 +938,7 @@ 13 Jul 2004; Tom Gall <tgall@gentoo.org> gdm-2.4.4.7-r1.ebuild: added ~ppc64, bug #54807 - 04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gdm-2.4.4.7-r1.ebuild: + 04 Jul 2004; Bryan Ãstergaard <kloeri@gentoo.org> gdm-2.4.4.7-r1.ebuild: Stable on alpha. 03 Jun 2004; Stephen P. Becker <geoman@gentoo.org> gdm-2.4.4.7-r1.ebuild: diff --git a/gnome-base/gdm/files/49-keychain b/gnome-base/gdm/files/49-keychain index bafc962f1b2a..77310b2a7461 100644 --- a/gnome-base/gdm/files/49-keychain +++ b/gnome-base/gdm/files/49-keychain @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # source keychain variables diff --git a/gnome-base/gdm/files/50-ssh-agent b/gnome-base/gdm/files/50-ssh-agent index 6bbdc47d84eb..10460c5bd44a 100644 --- a/gnome-base/gdm/files/50-ssh-agent +++ b/gnome-base/gdm/files/50-ssh-agent @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # add ssh-agent if found diff --git a/gnome-base/gdm/gdm-2.26.1.ebuild b/gnome-base/gdm/gdm-2.26.1.ebuild new file mode 100644 index 000000000000..20215f0d42cb --- /dev/null +++ b/gnome-base/gdm/gdm-2.26.1.ebuild @@ -0,0 +1,199 @@ +# 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.26.1.ebuild,v 1.1 2009/06/16 14:00:22 nirbheek Exp $ + +EAPI="2" + +inherit eutils pam gnome2 autotools + +DESCRIPTION="GNOME Display Manager" +HOMEPAGE="http://www.gnome.org/projects/gdm/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE_LIBC="elibc_glibc" +IUSE="accessibility +consolekit debug ipv6 gnome-keyring policykit selinux tcpd test xinerama +xklavier $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/${PN}-2.26-gentoo-patches.tar.bz2 + mirror://gentoo/${GDM_EXTRA}.tar.bz2" + +RDEPEND=">=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.15.4 + >=x11-libs/gtk+-2.10.0 + >=x11-libs/pango-1.3 + >=gnome-base/libglade-2 + >=gnome-base/gconf-2.6.1 + >=gnome-base/gnome-panel-2 + xklavier? ( >=x11-libs/libxklavier-3.5 ) + x11-libs/libXft + app-text/iso-codes + + x11-libs/gksu + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXext + x11-apps/sessreg + x11-libs/libXdmcp + virtual/pam + consolekit? ( + sys-auth/consolekit + >=sys-apps/hal-0.5.12_rc1-r1[consolekit] ) + + accessibility? ( x11-libs/libXevie ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) + policykit? ( + >=sys-auth/policykit-0.8 + >=gnome-extra/policykit-gnome-0.8 ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) + + !gnome-extra/fast-user-switch-applet" +DEPEND="${RDEPEND} + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) + sys-devel/gettext + x11-proto/inputproto + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2" +PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-schemas-install + --localstatedir=/var + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-pam-prefix=/etc + SOUND_PROGRAM=/usr/bin/gdmplay + $(use_with accessibility xevie) + $(use_enable debug) + $(use_enable ipv6) + $(use_enable xklavier libxklavier) + $(use_enable policykit polkit) + $(use_with consolekit console-kit) + $(use_with selinux) + $(use_with tcpd tcp-wrappers) + $(use_with xinerama)" + + enewgroup gdm + enewuser gdm -1 -1 /var/lib/gdm gdm +} + +src_prepare() { + gnome2_src_prepare + + # remove unneeded linker directive for selinux (#41022) + epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch" + + # Make it daemonize so that the boot process can continue (#236701) + epatch "${WORKDIR}/${PN}-2.26.1-fix-daemonize-regression.patch" + + # Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339) + epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch" + + # Make custom session work, bug #. + epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch" + + # ssh-agent handling must be done at xinitrc.d + epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch" + + # Fix libxklavier automagic support + epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch" + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed 2 failed" + + eautoreconf +} + +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" || die "doexe 1 failed" + + # add xinitrc.d scripts + exeinto /etc/X11/xinit/xinitrc.d + doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" + doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm || die "doenvd failed" + + # 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" + + use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* + + dopamd "${gentoodir}"/pam.d/* + dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" +} + +pkg_postinst() { + gnome2_pkg_postinst + + ewarn + ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" + ewarn "visit us on #gentoo-desktop if you have problems." + ewarn + + elog "To make GDM start at boot, edit /etc/conf.d/xdm" + elog "and then execute 'rc-update add xdm default'." + elog "If you already have GDM running, you will need to restart it." + + 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 +} + +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 +} diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml index af6e392ac462..3ff57ea787b1 100644 --- a/gnome-base/gdm/metadata.xml +++ b/gnome-base/gdm/metadata.xml @@ -3,9 +3,11 @@ <pkgmetadata> <herd>gnome</herd> <use> - <flag name='dmx'>Enables Distributed Multihead X (DMX) support</flag> - <flag name='remote'>Enables support for secure remote connections</flag> - <flag name='consolekit'>Allow proper handling of removable media according - to who is actually present on the machine.</flag> + <flag name="dmx">Enables Distributed Multihead X (DMX) support</flag> + <flag name="remote">Enables support for secure remote connections</flag> + <flag name="consolekit">Allow proper handling of removable media according + to who is actually present on the machine.</flag> + <flag name="xklavier">Use <pkg>x11-libs/libxklavier</pkg> for keyboard + management</flag> </use> </pkgmetadata> |