diff options
Diffstat (limited to 'gnome-base/gdm')
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-2.18.0-gdm-dmx-intllibs.patch | 10 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-2.20.0-gksu.patch | 12 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-2.18.4-r1.ebuild | 194 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-2.20.6.ebuild (renamed from gnome-base/gdm/gdm-2.20.4.ebuild) | 31 |
5 files changed, 32 insertions, 224 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 89d5340a9c46..f4e01e717812 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gdm # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.271 2008/04/24 17:59:24 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.272 2008/05/15 22:11:39 eva Exp $ + +*gdm-2.20.6 (15 May 2008) + + 15 May 2008; Gilles Dartiguelongue <eva@gentoo.org> + -files/gdm-2.18.0-gdm-dmx-intllibs.patch, -files/gdm-2.20.0-gksu.patch, + -gdm-2.18.4-r1.ebuild, -gdm-2.20.4.ebuild, +gdm-2.20.6.ebuild: + bump to 2.20.6. Bug fix release. Clean up old revisions. 24 Apr 2008; Markus Rothe <corsair@gentoo.org> gdm-2.20.5.ebuild: Added ~ppc64; bug #218794 diff --git a/gnome-base/gdm/files/gdm-2.18.0-gdm-dmx-intllibs.patch b/gnome-base/gdm/files/gdm-2.18.0-gdm-dmx-intllibs.patch deleted file mode 100644 index b375dad84caa..000000000000 --- a/gnome-base/gdm/files/gdm-2.18.0-gdm-dmx-intllibs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gdm-2.18.0/utils/Makefile.am 2006-01-15 16:26:35.000000000 -0500 -+++ gdm-2.18.0/utils/Makefile.am 2006-01-31 15:51:20.000000000 -0500 -@@ -57,6 +57,7 @@ - gdm-dmx-reconnect-proxy.c - - gdm_dmx_reconnect_proxy_LDADD = \ -+ $(INTLLIBS) \ - $(GLIB_LIBS) \ - $(X_EXTRA_LIBS) \ - $(X_LIBS) \ diff --git a/gnome-base/gdm/files/gdm-2.20.0-gksu.patch b/gnome-base/gdm/files/gdm-2.20.0-gksu.patch deleted file mode 100644 index aa5ad30f6d1d..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.0-gksu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gdm-2.20.0.orig/gui/gdmsetup.desktop.in.in gdm-2.20.0/gui/gdmsetup.desktop.in.in ---- gdm-2.20.0.orig/gui/gdmsetup.desktop.in.in 2007-09-17 10:45:38.000000000 -0400 -+++ gdm-2.20.0/gui/gdmsetup.desktop.in.in 2007-10-02 10:25:39.000000000 -0400 -@@ -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=gdm-setup - StartupNotify=true - Terminal=false diff --git a/gnome-base/gdm/gdm-2.18.4-r1.ebuild b/gnome-base/gdm/gdm-2.18.4-r1.ebuild deleted file mode 100644 index 9ed37bb0ee21..000000000000 --- a/gnome-base/gdm/gdm-2.18.4-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.4-r1.ebuild,v 1.13 2008/04/20 01:35:58 vapier 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 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="accessibility branding ipv6 pam selinux tcpd xinerama elibc_glibc" - -# 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 )" - -# glib dep is because of bug #193061 -RDEPEND="pam? ( - virtual/pam - sys-auth/consolekit - ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - >=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 - >=dev-libs/dbus-glib-0.71 - accessibility? ( x11-libs/libXevie ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - x11-libs/gksu - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXi - x11-libs/libXext - xinerama? ( x11-libs/libXinerama ) - x11-libs/libdmx - x11-libs/libXau - x11-apps/sessreg" -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/dmxproto - sys-devel/gettext - app-admin/eselect - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35 - >=app-text/gnome-doc-utils-0.3.2 - >=app-text/scrollkeeper-0.1.4" - -DOCS="AUTHORS ChangeLog NEWS README TODO" -MAKEOPTS="${MAKEOPTS} -j1" - -pkg_setup() { - G2CONF="--sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xdmcp \ - --with-pam-prefix=/etc \ - $(use_enable accessibility xevie) \ - $(use_enable ipv6) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam \ - --with-console-kit=yes" - else - G2CONF="${G2CONF} --enable-console-helper=no \ - --with-console-kit=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 - - # Fix missing intllib - epatch "${FILESDIR}"/${PN}-2.18.0-gdm-dmx-intllibs.patch - - # Add gksu to gdmsetup menu entry - epatch "${FILESDIR}"/${PN}-2.20.0-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 - - 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:" \ - /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 - 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 - elog "See README.install for more information about the change." - elog - - 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 -} diff --git a/gnome-base/gdm/gdm-2.20.4.ebuild b/gnome-base/gdm/gdm-2.20.6.ebuild index 2603a077e2bb..94ea1bb2e03d 100644 --- a/gnome-base/gdm/gdm-2.20.4.ebuild +++ b/gnome-base/gdm/gdm-2.20.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.4.ebuild,v 1.6 2008/04/12 13:52:32 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.6.ebuild,v 1.1 2008/05/15 22:11:39 eva Exp $ inherit autotools eutils pam gnome2 @@ -9,13 +9,13 @@ HOMEPAGE="http://www.gnome.org/projects/gdm/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE_LIBC="elibc_glibc" -IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC" +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.8-gentoo-files-r2" +GDM_EXTRA="${PN}-2.20.5-gentoo-files" SRC_URI="${SRC_URI} mirror://gentoo/${GDM_EXTRA}.tar.bz2 @@ -42,6 +42,7 @@ RDEPEND="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? ( virtual/pam >=sys-auth/pambase-20080318 @@ -82,8 +83,18 @@ pkg_setup() { 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 @@ -123,8 +134,8 @@ src_install() { keepdir /var/log/gdm keepdir /var/gdm - chown root:gdm "${D}/var/gdm" - chmod 1770 "${D}/var/gdm" + fowners root:gdm /var/gdm + fperms 1770 /var/gdm # use our own session script rm -f "${D}/etc/X11/gdm/Xsession" @@ -142,7 +153,8 @@ src_install() { rm -rf "${D}/etc/pam.d" if use pam ; then - sed -i "s:system-auth:system-local-login:g" "${gentoodir}"/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" fi @@ -176,6 +188,11 @@ pkg_postinst() { 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" |