From 08aa47328d240864646945d924fb569af7a773d5 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Wed, 25 Dec 2002 18:59:46 +0000 Subject: fix user environmetn --- gnome-base/gdm/ChangeLog | 10 +- gnome-base/gdm/files/2.2.4/gnomerc | 14 -- gnome-base/gdm/files/2.2.4/pam.d/gdm | 10 - .../files/2.2.4/security/console.apps/gdmconfig | 5 - gnome-base/gdm/files/digest-gdm-2.4.0.11 | 1 - gnome-base/gdm/files/digest-gdm-2.4.0.12 | 1 - gnome-base/gdm/files/digest-gdm-2.4.0.12-r1 | 2 - gnome-base/gdm/files/digest-gdm-2.4.0.12-r2 | 2 + gnome-base/gdm/gdm-2.2.5.4-r5.ebuild | 12 +- gnome-base/gdm/gdm-2.4.0.11.ebuild | 193 ------------------ gnome-base/gdm/gdm-2.4.0.12-r1.ebuild | 216 --------------------- gnome-base/gdm/gdm-2.4.0.12-r2.ebuild | 210 ++++++++++++++++++++ gnome-base/gdm/gdm-2.4.0.12.ebuild | 206 -------------------- 13 files changed, 228 insertions(+), 654 deletions(-) delete mode 100644 gnome-base/gdm/files/2.2.4/gnomerc delete mode 100644 gnome-base/gdm/files/2.2.4/pam.d/gdm delete mode 100644 gnome-base/gdm/files/2.2.4/security/console.apps/gdmconfig delete mode 100644 gnome-base/gdm/files/digest-gdm-2.4.0.11 delete mode 100644 gnome-base/gdm/files/digest-gdm-2.4.0.12 delete mode 100644 gnome-base/gdm/files/digest-gdm-2.4.0.12-r1 create mode 100644 gnome-base/gdm/files/digest-gdm-2.4.0.12-r2 delete mode 100644 gnome-base/gdm/gdm-2.4.0.11.ebuild delete mode 100644 gnome-base/gdm/gdm-2.4.0.12-r1.ebuild create mode 100644 gnome-base/gdm/gdm-2.4.0.12-r2.ebuild delete mode 100644 gnome-base/gdm/gdm-2.4.0.12.ebuild (limited to 'gnome-base/gdm') diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 0f1ce039c8e8..1843ba72d952 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gdm # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.24 2002/12/13 10:56:53 blizzy Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.25 2002/12/25 18:59:46 azarah Exp $ + +*gdm-2.4.0.12-r2 (25 Dec 2002) + + 25 Martin Schlemmer gdm-2.4.0.12-r2.ebuild : + Change /etc/X11/gdm/PreSession/Default's shell to '/bin/bash --login' to + set the users environment properly. This will mostly only work for bash + and sh users :( 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords @@ -13,7 +20,6 @@ 28 Nov 2002; Spider : gdm-2.4.0.12.ebuild : add the latest version, get the SRC_URI fixed - *gdm-2.4.0.11-r1 (07 Nov 2002) 11 Nov 2002; L. Boshell : Actually apply the patch, since there was an extra `dry-run' flag. diff --git a/gnome-base/gdm/files/2.2.4/gnomerc b/gnome-base/gdm/files/2.2.4/gnomerc deleted file mode 100644 index 7113e23aca25..000000000000 --- a/gnome-base/gdm/files/2.2.4/gnomerc +++ /dev/null @@ -1,14 +0,0 @@ -startssh= -sshagent=/usr/bin/ssh-agent -gnomesession=/usr/bin/gnome-session - -if [ -x $sshagent -a -z "$SSH_AUTH_SOCK" ]; then - startssh=yes -fi - -if [ -n "$startssh" ]; then - exec $sshagent -- $gnomesession -else - exec $gnomesession -fi - diff --git a/gnome-base/gdm/files/2.2.4/pam.d/gdm b/gnome-base/gdm/files/2.2.4/pam.d/gdm deleted file mode 100644 index f21b495f641f..000000000000 --- a/gnome-base/gdm/files/2.2.4/pam.d/gdm +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_pwdb.so shadow nullok -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_pwdb.so -account required /lib/security/pam_permit.so -password required /lib/security/pam_cracklib.so -password required /lib/security/pam_pwdb.so shadow nullok use_authtok -session required /lib/security/pam_pwdb.so -session optional /lib/security/pam_console.so -session optional /lib/security/pam_xauth.so diff --git a/gnome-base/gdm/files/2.2.4/security/console.apps/gdmconfig b/gnome-base/gdm/files/2.2.4/security/console.apps/gdmconfig deleted file mode 100644 index 5fc459648a9a..000000000000 --- a/gnome-base/gdm/files/2.2.4/security/console.apps/gdmconfig +++ /dev/null @@ -1,5 +0,0 @@ -USER=root -PROGRAM=/usr/bin/gdmconfig -SESSION=false -FALLBACK=true - diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.11 b/gnome-base/gdm/files/digest-gdm-2.4.0.11 deleted file mode 100644 index 8d5df0429306..000000000000 --- a/gnome-base/gdm/files/digest-gdm-2.4.0.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 55c685e086f444c148bbe5269ab9acdb gdm-2.4.0.11.tar.bz2 1658780 diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.12 b/gnome-base/gdm/files/digest-gdm-2.4.0.12 deleted file mode 100644 index ddca000ea29c..000000000000 --- a/gnome-base/gdm/files/digest-gdm-2.4.0.12 +++ /dev/null @@ -1 +0,0 @@ -MD5 8aa6e503d4f74de8df32dee28df9a0de gdm-2.4.0.12.tar.bz2 1708764 diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.12-r1 b/gnome-base/gdm/files/digest-gdm-2.4.0.12-r1 deleted file mode 100644 index 59d653878d8e..000000000000 --- a/gnome-base/gdm/files/digest-gdm-2.4.0.12-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aa6e503d4f74de8df32dee28df9a0de gdm-2.4.0.12.tar.bz2 1708764 -MD5 5b729216045fc49f42b6353c5ca1d4f2 gentoo-gdm-theme.tar.bz2 772144 diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.12-r2 b/gnome-base/gdm/files/digest-gdm-2.4.0.12-r2 new file mode 100644 index 000000000000..59d653878d8e --- /dev/null +++ b/gnome-base/gdm/files/digest-gdm-2.4.0.12-r2 @@ -0,0 +1,2 @@ +MD5 8aa6e503d4f74de8df32dee28df9a0de gdm-2.4.0.12.tar.bz2 1708764 +MD5 5b729216045fc49f42b6353c5ca1d4f2 gentoo-gdm-theme.tar.bz2 772144 diff --git a/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild b/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild index 9883a1aa7ba4..4f258f3f25be 100644 --- a/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild +++ b/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild,v 1.14 2002/12/09 04:22:37 manson Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild,v 1.15 2002/12/25 18:59:46 azarah Exp $ DESCRIPTION="GNOME Display Manager" HOMEPAGE="http://www.gnome.org/" @@ -110,15 +110,19 @@ src_install() { cd ${S} - #support for new session stuff + # Support for new session stuff rm -rf ${D}/etc/X11/gdm/Sessions dosym ../Sessions /etc/X11/gdm/Sessions - + + # Make sure the users environment are set properly + # (bash users only though :( ) + dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default + dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO } pkg_preinst() { - #support for new session stuff + # Support for new session stuff if [ -d /etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] then mv -f /etc/X11/gdm/Sessions /etc/X11/gdm/Sessions.old diff --git a/gnome-base/gdm/gdm-2.4.0.11.ebuild b/gnome-base/gdm/gdm-2.4.0.11.ebuild deleted file mode 100644 index c57d8d96b849..000000000000 --- a/gnome-base/gdm/gdm-2.4.0.11.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.11.ebuild,v 1.9 2002/12/15 10:44:19 bjb Exp $ - -DESCRIPTION="GNOME2 Display Manager" -HOMEPAGE="http://www.gnome.org/" -SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2" - -SLOT="0" -KEYWORDS="x86 ppc sparc alpha" -LICENSE="GPL-2" -IUSE="nls" - -MY_V="`echo ${PV} |cut -b -5`" - -RDEPEND=">=sys-libs/pam-0.72 - >=sys-apps/tcp-wrappers-7.6 - >=app-text/scrollkeeper-0.3.11 - >=gnome-base/libglade-2.0.1 - >=gnome-base/librsvg-2.0.1 - >=dev-libs/libxml2-2.4.24 - >=gnome-base/libgnome-2.0.4 - >=gnome-base/libgnomeui-2.0.5 - >=gnome-base/libgnomecanvas-2.0.4 - >=gnome-base/ORBit2-2.4.1" - -DEPEND="${RDEPEND} - >=x11-base/xfree-4.2.0-r3" - -src_unpack() { - unpack ${A} - - cd ${S}/daemon - cp gdm.h gdm.h.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - gdm.h.orig > gdm.h - rm -f gdm.h.orig - - cd ${S}/config - cp gdm.conf.in gdm.conf.in.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - gdm.conf.in.orig > gdm.conf.in - rm -f gdm.conf.in.orig -} - -src_compile() { - local myconf="" - use nls || myconf="${myconf} --disable-nls" - - ./configure --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var/lib \ - --with-pam-prefix=/etc \ - ${myconf} || die - - emake || die -} - -src_install() { - cd omf-install - cp Makefile Makefile.old - sed -e "s:scrollkeeper-update.*::g" \ - Makefile.old > Makefile - rm Makefile.old - cd ${S} - - make prefix=${D}/usr \ - sysconfdir=${D}/etc/X11 \ - localstatedir=${D}/var/lib \ - PAM_PREFIX=${D}/etc \ - install || die - - # We need to move gdm-binary to gdm, else our xdm script - # have problems stopping gdm (bug #5598) - rm -f ${D}/usr/bin/gdm - mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm - - rm -f ${D}/etc/pam.d/gdm - - # log - dodir /var/lib/gdm - chown gdm:gdm ${D}/var/lib/gdm - chmod 0750 ${D}/var/lib/gdm - - # pam startup - dodir /etc/pam.d - insinto /etc/pam.d - doins ${FILESDIR}/${MY_V}/pam.d/gdm - doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig - - # pam security - dodir /etc/security/console.apps - insinto /etc/security/console.apps - doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig - - # gnomerc - dodir /etc/X11/gdm - exeinto /etc/X11/gdm - doexe ${FILESDIR}/${MY_V}/gnomerc - - cd ${D}/etc/X11/gdm - for i in Init/Default PostSession/Default PreSession/Default gdm.conf - do - cp ${i} ${i}.orig - sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \ - ${i}.orig > ${i} - rm ${i}.orig - done - - cd ${D}/etc/X11/gdm - cp gdm.conf gdm.conf.orig - - sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \ - -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \ - -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \ - -e "s:TitleBar=true:TitleBar=false:g" \ - -e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \ - gdm.conf.orig > gdm.conf - - rm gdm.conf.orig - - cd ${S} - - #support for new session stuff - rm -rf ${D}/etc/X11/gdm/Sessions - dosym ../Sessions /etc/X11/gdm/Sessions - - dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO -} - -pkg_preinst() { - #support for new session stuff - if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] - then - mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old - fi -} - -pkg_postinst() { - echo ">>> Updating Scrollkeeper database..." - scrollkeeper-update >/dev/null 2>&1 - - # Attempt to restart GDM softly by use of the fifo. Wont work on older - # then 2.2.3.1 versions but should work nicely on later upgrades. - # FIXME: this is just way too complex - FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`" - if [ -z "${FIFOFILE}" ] - then - FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo - else - FIFOFILE=${FIFOFILE}/.gdmfifo - fi - PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`" - if [ -z "${PIDFILE}" ] - then - PIDFILE=${ROOT}/var/run/gdm.pid - fi - if [ -w ${FIFOFILE} ] - then - if [ -f ${PIDFILE} ] - then - if kill -0 `cat ${PIDFILE}` - then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi - - # unmerge nukes sometimes - if [ ! -d ${ROOT}/var/lib/gdm ] - then - mkdir -p ${ROOT}/var/lib/gdm - chown gdm.gdm ${ROOT}/var/lib/gdm - chmod 0750 ${ROOT}/var/lib/gdm - fi - touch ${ROOT}/var/lib/gdm/.keep - - echo "" - einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)" - einfo "and then execute 'rc-update add xdm default'." - einfo "" - einfo "Note that you need xfree-4.1.0-r4 or later." -} - -pkg_postrm() { - echo ">>> Updating Scrollkeeper database..." - scrollkeeper-update >/dev/null 2>&1 - - echo "" - einfo "To remove GDM from startup please execute" - einfo "'rc-update del xdm default'" -} diff --git a/gnome-base/gdm/gdm-2.4.0.12-r1.ebuild b/gnome-base/gdm/gdm-2.4.0.12-r1.ebuild deleted file mode 100644 index bb3b2c98c311..000000000000 --- a/gnome-base/gdm/gdm-2.4.0.12-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.12-r1.ebuild,v 1.3 2002/12/15 10:44:19 bjb Exp $ - -inherit gnome.org - -DESCRIPTION="GNOME2 Display Manager" -HOMEPAGE="http://www.gnome.org/" - -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha" -LICENSE="GPL-2" -IUSE="nls" -SRC_URI="${SRC_URI} - http://cvs.gentoo.org/~foser/gentoo-gdm-theme.tar.bz2" -MY_V="`echo ${PV} |cut -b -5`" - -RDEPEND=">=sys-libs/pam-0.72 - >=sys-apps/tcp-wrappers-7.6 - >=app-text/scrollkeeper-0.3.11 - >=gnome-base/libglade-2.0.1 - >=gnome-base/librsvg-2.0.1 - >=dev-libs/libxml2-2.4.24 - >=gnome-base/libgnome-2.0.4 - >=gnome-base/libgnomeui-2.0.5 - >=gnome-base/libgnomecanvas-2.0.4 - >=gnome-base/ORBit2-2.4.1" - -DEPEND="${RDEPEND} - >=x11-base/xfree-4.2.0-r3" - -pkg_setup() { - # This is not a very good way to do this, but - # it saves users the effort of remerging xfree.. - # See bug #10190 - cd /etc/X11 - if patch -p0 --dry-run < ${FILESDIR}/${PN}-startDM.sh.patch &> /dev/null - then - einfo "Fixing startDM.sh..." - patch -p0 < ${FILESDIR}/${PN}-startDM.sh.patch > /dev/null || die - fi -} - -src_unpack() { - unpack ${A} - - cd ${S}/daemon - cp gdm.h gdm.h.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - gdm.h.orig > gdm.h - rm -f gdm.h.orig - - cd ${S}/config - cp gdm.conf.in gdm.conf.in.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - -e "s:=circles:=gentoo-emergence:" \ - -e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \ - gdm.conf.in.orig > gdm.conf.in - - rm -f gdm.conf.in.orig - - # Make the config use the Gentoo theme - -} - -src_compile() { - local myconf="" - use nls || myconf="${myconf} --disable-nls" - - ./configure --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var/lib \ - --with-pam-prefix=/etc \ - ${myconf} || die - - emake || die -} - -src_install() { - cd omf-install - cp Makefile Makefile.old - sed -e "s:scrollkeeper-update.*::g" \ - Makefile.old > Makefile - rm Makefile.old - cd ${S} - - make prefix=${D}/usr \ - sysconfdir=${D}/etc/X11 \ - localstatedir=${D}/var/lib \ - PAM_PREFIX=${D}/etc \ - install || die - - # We need to move gdm-binary to gdm, else our xdm script - # have problems stopping gdm (bug #5598) - rm -f ${D}/usr/bin/gdm - mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm - - rm -f ${D}/etc/pam.d/gdm - - # log - dodir /var/lib/gdm - chown gdm:gdm ${D}/var/lib/gdm - chmod 0750 ${D}/var/lib/gdm - - # pam startup - dodir /etc/pam.d - insinto /etc/pam.d - doins ${FILESDIR}/${MY_V}/pam.d/gdm - doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig - - # pam security - dodir /etc/security/console.apps - insinto /etc/security/console.apps - doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig - - # gnomerc - dodir /etc/X11/gdm - exeinto /etc/X11/gdm - doexe ${FILESDIR}/${MY_V}/gnomerc - - cd ${D}/etc/X11/gdm - for i in Init/Default PostSession/Default PreSession/Default gdm.conf - do - cp ${i} ${i}.orig - sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \ - ${i}.orig > ${i} - rm ${i}.orig - done - - cd ${D}/etc/X11/gdm - cp gdm.conf gdm.conf.orig - - sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \ - -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \ - -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \ - -e "s:TitleBar=true:TitleBar=false:g" \ - -e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \ - gdm.conf.orig > gdm.conf - - rm gdm.conf.orig - - cd ${S} - - #support for new session stuff - rm -rf ${D}/etc/X11/gdm/Sessions - dosym ../Sessions /etc/X11/gdm/Sessions - - # move Gentoo theme in - mv ${WORKDIR}/gentoo-emergence ${D}/usr/share/gdm/themes - - dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO -} - -pkg_preinst() { - #support for new session stuff - if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] - then - mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old - fi -} - -pkg_postinst() { - echo ">>> Updating Scrollkeeper database..." - scrollkeeper-update >/dev/null 2>&1 - - # Attempt to restart GDM softly by use of the fifo. Wont work on older - # then 2.2.3.1 versions but should work nicely on later upgrades. - # FIXME: this is just way too complex - FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`" - if [ -z "${FIFOFILE}" ] - then - FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo - else - FIFOFILE=${FIFOFILE}/.gdmfifo - fi - PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`" - if [ -z "${PIDFILE}" ] - then - PIDFILE=${ROOT}/var/run/gdm.pid - fi - if [ -w ${FIFOFILE} ] - then - if [ -f ${PIDFILE} ] - then - if kill -0 `cat ${PIDFILE}` - then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi - - # unmerge nukes sometimes - if [ ! -d ${ROOT}/var/lib/gdm ] - then - mkdir -p ${ROOT}/var/lib/gdm - chown gdm.gdm ${ROOT}/var/lib/gdm - chmod 0750 ${ROOT}/var/lib/gdm - fi - touch ${ROOT}/var/lib/gdm/.keep - - echo "" - einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)" - einfo "and then execute 'rc-update add xdm default'." - einfo "" - einfo "Note that you need xfree-4.1.0-r4 or later." -} - -pkg_postrm() { - echo ">>> Updating Scrollkeeper database..." - scrollkeeper-update >/dev/null 2>&1 - - echo "" - einfo "To remove GDM from startup please execute" - einfo "'rc-update del xdm default'" -} diff --git a/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild b/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild new file mode 100644 index 000000000000..0fce30b5cdd2 --- /dev/null +++ b/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild,v 1.1 2002/12/25 18:59:46 azarah Exp $ + +inherit eutils gnome.org + +DESCRIPTION="GNOME2 Display Manager" +HOMEPAGE="http://www.gnome.org/" + +SLOT="0" +KEYWORDS="x86 ppc sparc alpha" +LICENSE="GPL-2" +IUSE="nls" +SRC_URI="${SRC_URI} + http://cvs.gentoo.org/~foser/gentoo-gdm-theme.tar.bz2" +MY_V="`echo ${PV} |cut -b -5`" + +RDEPEND=">=sys-libs/pam-0.72 + >=sys-apps/tcp-wrappers-7.6 + >=app-text/scrollkeeper-0.3.11 + >=gnome-base/libglade-2.0.1 + >=gnome-base/librsvg-2.0.1 + >=dev-libs/libxml2-2.4.24 + >=gnome-base/libgnome-2.0.4 + >=gnome-base/libgnomeui-2.0.5 + >=gnome-base/libgnomecanvas-2.0.4 + >=gnome-base/ORBit2-2.4.1" + +DEPEND="${RDEPEND} + >=x11-base/xfree-4.2.0-r3" + + +src_unpack() { + unpack ${A} + + cd ${S}/daemon + cp gdm.h gdm.h.orig + sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ + gdm.h.orig > gdm.h + rm -f gdm.h.orig + + cd ${S}/config + cp gdm.conf.in gdm.conf.in.orig + sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ + -e "s:=circles:=gentoo-emergence:" \ + -e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \ + gdm.conf.in.orig > gdm.conf.in + + rm -f gdm.conf.in.orig + + # Make the config use the Gentoo theme + +} + +src_compile() { + local myconf="" + use nls || myconf="${myconf} --disable-nls" + + ./configure --host=${CHOST} \ + --prefix=/usr \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var/lib \ + --with-pam-prefix=/etc \ + ${myconf} || die + + emake || die +} + +src_install() { + cd omf-install + cp Makefile Makefile.old + sed -e "s:scrollkeeper-update.*::g" \ + Makefile.old > Makefile + rm Makefile.old + cd ${S} + + make prefix=${D}/usr \ + sysconfdir=${D}/etc/X11 \ + localstatedir=${D}/var/lib \ + PAM_PREFIX=${D}/etc \ + install || die + + # We need to move gdm-binary to gdm, else our xdm script + # have problems stopping gdm (bug #5598) + rm -f ${D}/usr/bin/gdm + mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm + + rm -f ${D}/etc/pam.d/gdm + + # log + dodir /var/lib/gdm + chown gdm:gdm ${D}/var/lib/gdm + chmod 0750 ${D}/var/lib/gdm + + # pam startup + dodir /etc/pam.d + insinto /etc/pam.d + doins ${FILESDIR}/${MY_V}/pam.d/gdm + doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig + + # pam security + dodir /etc/security/console.apps + insinto /etc/security/console.apps + doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig + + # gnomerc + dodir /etc/X11/gdm + exeinto /etc/X11/gdm + doexe ${FILESDIR}/${MY_V}/gnomerc + + cd ${D}/etc/X11/gdm + for i in Init/Default PostSession/Default PreSession/Default gdm.conf + do + cp ${i} ${i}.orig + sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \ + ${i}.orig > ${i} + rm ${i}.orig + done + + cd ${D}/etc/X11/gdm + cp gdm.conf gdm.conf.orig + + sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \ + -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \ + -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \ + -e "s:TitleBar=true:TitleBar=false:g" \ + -e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \ + gdm.conf.orig > gdm.conf + + rm gdm.conf.orig + + cd ${S} + + # Support for new session stuff + rm -rf ${D}/etc/X11/gdm/Sessions + dosym ../Sessions /etc/X11/gdm/Sessions + + # Make sure the users environment are set properly + # (bash users only though :( ) + dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default + + # Move Gentoo theme in + mv ${WORKDIR}/gentoo-emergence ${D}/usr/share/gdm/themes + + dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO +} + +pkg_preinst() { + #support for new session stuff + if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] + then + mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old + fi +} + +pkg_postinst() { + echo ">>> Updating Scrollkeeper database..." + scrollkeeper-update >/dev/null 2>&1 + + # Attempt to restart GDM softly by use of the fifo. Wont work on older + # then 2.2.3.1 versions but should work nicely on later upgrades. + # FIXME: this is just way too complex + FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`" + if [ -z "${FIFOFILE}" ] + then + FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo + else + FIFOFILE=${FIFOFILE}/.gdmfifo + fi + PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`" + if [ -z "${PIDFILE}" ] + then + PIDFILE=${ROOT}/var/run/gdm.pid + fi + if [ -w ${FIFOFILE} ] + then + if [ -f ${PIDFILE} ] + then + if kill -0 `cat ${PIDFILE}` + then + (echo;echo SOFT_RESTART) >> ${FIFOFILE} + fi + fi + fi + + # Unmerge nukes sometimes + if [ ! -d ${ROOT}/var/lib/gdm ] + then + mkdir -p ${ROOT}/var/lib/gdm + chown gdm.gdm ${ROOT}/var/lib/gdm + chmod 0750 ${ROOT}/var/lib/gdm + fi + touch ${ROOT}/var/lib/gdm/.keep + + echo "" + einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)" + einfo "and then execute 'rc-update add xdm default'." + einfo "" + einfo "Note that you need xfree-4.1.0-r4 or later." +} + +pkg_postrm() { + echo ">>> Updating Scrollkeeper database..." + scrollkeeper-update >/dev/null 2>&1 + + echo "" + einfo "To remove GDM from startup please execute" + einfo "'rc-update del xdm default'" +} + diff --git a/gnome-base/gdm/gdm-2.4.0.12.ebuild b/gnome-base/gdm/gdm-2.4.0.12.ebuild deleted file mode 100644 index 4fbd60386713..000000000000 --- a/gnome-base/gdm/gdm-2.4.0.12.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.12.ebuild,v 1.5 2002/12/15 12:35:24 bjb Exp $ - - -inherit gnome.org -DESCRIPTION="GNOME2 Display Manager" -HOMEPAGE="http://www.gnome.org/" - -SLOT="0" -KEYWORDS="x86 ~ppc ~sparc alpha" -LICENSE="GPL-2" -IUSE="nls" - -MY_V="`echo ${PV} |cut -b -5`" - -RDEPEND=">=sys-libs/pam-0.72 - >=sys-apps/tcp-wrappers-7.6 - >=app-text/scrollkeeper-0.3.11 - >=gnome-base/libglade-2.0.1 - >=gnome-base/librsvg-2.0.1 - >=dev-libs/libxml2-2.4.24 - >=gnome-base/libgnome-2.0.4 - >=gnome-base/libgnomeui-2.0.5 - >=gnome-base/libgnomecanvas-2.0.4 - >=gnome-base/ORBit2-2.4.1" - -DEPEND="${RDEPEND} - >=x11-base/xfree-4.2.0-r3" - -pkg_setup() { - # This is not a very good way to do this, but - # it saves users the effort of remerging xfree.. - # See bug #10190 - cd /etc/X11 - if patch -p0 --dry-run < ${FILESDIR}/${PN}-startDM.sh.patch &> /dev/null - then - einfo "Fixing startDM.sh..." - patch -p0 < ${FILESDIR}/${PN}-startDM.sh.patch > /dev/null || die - fi -} - -src_unpack() { - unpack ${A} - - cd ${S}/daemon - cp gdm.h gdm.h.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - gdm.h.orig > gdm.h - rm -f gdm.h.orig - - cd ${S}/config - cp gdm.conf.in gdm.conf.in.orig - sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ - gdm.conf.in.orig > gdm.conf.in - rm -f gdm.conf.in.orig -} - -src_compile() { - local myconf="" - use nls || myconf="${myconf} --disable-nls" - - ./configure --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var/lib \ - --with-pam-prefix=/etc \ - ${myconf} || die - - emake || die -} - -src_install() { - cd omf-install - cp Makefile Makefile.old - sed -e "s:scrollkeeper-update.*::g" \ - Makefile.old > Makefile - rm Makefile.old - cd ${S} - - make prefix=${D}/usr \ - sysconfdir=${D}/etc/X11 \ - localstatedir=${D}/var/lib \ - PAM_PREFIX=${D}/etc \ - install || die - - # We need to move gdm-binary to gdm, else our xdm script - # have problems stopping gdm (bug #5598) - rm -f ${D}/usr/bin/gdm - mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm - - rm -f ${D}/etc/pam.d/gdm - - # log - dodir /var/lib/gdm - chown gdm:gdm ${D}/var/lib/gdm - chmod 0750 ${D}/var/lib/gdm - - # pam startup - dodir /etc/pam.d - insinto /etc/pam.d - doins ${FILESDIR}/${MY_V}/pam.d/gdm - doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig - - # pam security - dodir /etc/security/console.apps - insinto /etc/security/console.apps - doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig - - # gnomerc - dodir /etc/X11/gdm - exeinto /etc/X11/gdm - doexe ${FILESDIR}/${MY_V}/gnomerc - - cd ${D}/etc/X11/gdm - for i in Init/Default PostSession/Default PreSession/Default gdm.conf - do - cp ${i} ${i}.orig - sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \ - ${i}.orig > ${i} - rm ${i}.orig - done - - cd ${D}/etc/X11/gdm - cp gdm.conf gdm.conf.orig - - sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \ - -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \ - -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \ - -e "s:TitleBar=true:TitleBar=false:g" \ - -e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \ - gdm.conf.orig > gdm.conf - - rm gdm.conf.orig - - cd ${S} - - #support for new session stuff - rm -rf ${D}/etc/X11/gdm/Sessions - dosym ../Sessions /etc/X11/gdm/Sessions - - dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO -} - -pkg_preinst() { - #support for new session stuff - if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] - then - mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old - fi -} - -pkg_postinst() { - echo ">>> Updating Scrollkeeper database..." - scrollkeeper-update >/dev/null 2>&1 - - # Attempt to restart GDM softly by use of the fifo. Wont work on older - # then 2.2.3.1 versions but should work nicely on later upgrades. - # FIXME: this is just way too complex - FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`" - if [ -z "${FIFOFILE}" ] - then - FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo - else - FIFOFILE=${FIFOFILE}/.gdmfifo - fi - PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`" - if [ -z "${PIDFILE}" ] - then - PIDFILE=${ROOT}/var/run/gdm.pid - fi - if [ -w ${FIFOFILE} ] - then - if [ -f ${PIDFILE} ] - then - if kill -0 `cat ${PIDFILE}` - then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi - - # unmerge nukes sometimes - if [ ! -d ${ROOT}/var/lib/gdm ] - then - mkdir -p ${ROOT}/var/lib/gdm - chown gdm.gdm ${ROOT}/var/lib/gdm - chmod 0750 ${ROOT}/var/lib/gdm - fi - touch ${ROOT}/var/lib/gdm/.keep - - echo "" - einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)" - einfo "and then execute 'rc-update add xdm default'." - einfo "" - einfo "Note that you need xfree-4.1.0-r4 or later." -} - -pkg_postrm() { - echo ">>> Updating Scrollkeeper database..." - scrollkeeper-update >/dev/null 2>&1 - - echo "" - einfo "To remove GDM from startup please execute" - einfo "'rc-update del xdm default'" -} -- cgit v1.2.3-65-gdbad