bug #10190
authorMartin Schlemmer <azarah@gentoo.org>
Thu, 7 Nov 2002 09:11:09 +0000 (09:11 +0000)
committerMartin Schlemmer <azarah@gentoo.org>
Thu, 7 Nov 2002 09:11:09 +0000 (09:11 +0000)
gnome-base/gdm/ChangeLog
gnome-base/gdm/files/digest-gdm-2.4.0.11-r1 [new file with mode: 0644]
gnome-base/gdm/files/gdm-startDM.sh.patch [new file with mode: 0644]
gnome-base/gdm/gdm-2.4.0.11-r1.ebuild [new file with mode: 0644]

index f41420ded6e456c0d4eb414c52853de9042484bd..3b863c07f13bbd892a8d66a8af6336b6c91c3378 100644 (file)
@@ -1,8 +1,12 @@
 # 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.18 2002/09/06 03:30:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.19 2002/11/07 09:11:09 azarah Exp $
 
 
+*gdm-2.4.0.11-r1 (07 Nov 2002)
+  07 Nov 2002; Martin Schlemmer <azarah@gentoo.org> gdm-2.4.0.11-r1.ebuild :
+  Fix /etc/X11/startDM.sh to source /etc/profile to fix bug #10190.  
+
 *gdm-2.4.0.11 (06 Sep 2002)
   06 Sep 2002; Spider <spider@gentoo.org> gdm-2.4.0.11.ebuild :
   new version
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.11-r1 b/gnome-base/gdm/files/digest-gdm-2.4.0.11-r1
new file mode 100644 (file)
index 0000000..8d5df04
--- /dev/null
@@ -0,0 +1 @@
+MD5 55c685e086f444c148bbe5269ab9acdb gdm-2.4.0.11.tar.bz2 1658780
diff --git a/gnome-base/gdm/files/gdm-startDM.sh.patch b/gnome-base/gdm/files/gdm-startDM.sh.patch
new file mode 100644 (file)
index 0000000..f851eec
--- /dev/null
@@ -0,0 +1,12 @@
+--- startDM.sh.orig    2002-11-07 10:34:16.000000000 +0200
++++ startDM.sh 2002-11-07 10:37:38.000000000 +0200
+@@ -6,6 +6,9 @@
+ 
+ source /etc/init.d/functions.sh
+ 
++# We need to source /etc/profile for stuff like $LANG to work
++# bug #10190.
++source /etc/profile
+ 
+ if [ -e ${svcdir}/options/xdm/service ]
+ then
diff --git a/gnome-base/gdm/gdm-2.4.0.11-r1.ebuild b/gnome-base/gdm/gdm-2.4.0.11-r1.ebuild
new file mode 100644 (file)
index 0000000..b7c047e
--- /dev/null
@@ -0,0 +1,207 @@
+# 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-r1.ebuild,v 1.1 2002/11/07 09:11:09 azarah Exp $
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.gnome.org/"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
+MY_V="`echo ${PV} |cut -b -5`"
+S=${WORKDIR}/${P}
+SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+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 --dry-run < ${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
+       mkdir -p ${D}/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'"
+}
+