new stable version

6 files changed, 223 insertions, 1 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 6031b51c86b8..da96df06e3a1 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,7 +1,11 @@
 # 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.8 2002/06/05 16:59:35 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.9 2002/06/08 14:19:06 spider Exp $
 
+*gdm-2.4.0.0 (8 Jun 2002)
+  8 Jun 2002; Spider <spider@gentoo.org> gdm-2.4.0.0.ebuild :
+  New stable version!
+  
 *gdm-2.3.90.6 (5 June 2002)
   5 June 2002; Gabriele Giorgetti <stroke@gentoo.org> gdm-2.3.90.6.ebuild :
   New version.
diff --git a/gnome-base/gdm/files/2.4.0/gnomerc b/gnome-base/gdm/files/2.4.0/gnomerc
new file mode 100644
index 000000000000..7113e23aca25
--- /dev/null
+++ b/gnome-base/gdm/files/2.4.0/gnomerc
@@ -0,0 +1,14 @@
+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.4.0/pam.d/gdm b/gnome-base/gdm/files/2.4.0/pam.d/gdm
new file mode 100644
index 000000000000..1d2e081625f1
--- /dev/null
+++ b/gnome-base/gdm/files/2.4.0/pam.d/gdm
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth       required	/lib/security/pam_stack.so service=system-auth
+auth       required	/lib/security/pam_nologin.so
+account    required	/lib/security/pam_stack.so service=system-auth
+password   required	/lib/security/pam_stack.so service=system-auth
+session    required	/lib/security/pam_stack.so service=system-auth
+session    optional     /lib/security/pam_console.so
diff --git a/gnome-base/gdm/files/2.4.0/pam.d/gdmconfig b/gnome-base/gdm/files/2.4.0/pam.d/gdmconfig
new file mode 100644
index 000000000000..44b01cfc759f
--- /dev/null
+++ b/gnome-base/gdm/files/2.4.0/pam.d/gdmconfig
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       sufficient   /lib/security/pam_rootok.so
+auth       required     /lib/security/pam_stack.so service=system-auth
+session    required     /lib/security/pam_permit.so
+session    optional     /lib/security/pam_xauth.so
+account    required     /lib/security/pam_permit.so
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.0 b/gnome-base/gdm/files/digest-gdm-2.4.0.0
new file mode 100644
index 000000000000..02ed1a0dfa51
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.4.0.0
@@ -0,0 +1 @@
+MD5 e8426be580e068e48420cf7bf1f96d1a gdm-2.4.0.0.tar.bz2 1546607
diff --git a/gnome-base/gdm/gdm-2.4.0.0.ebuild b/gnome-base/gdm/gdm-2.4.0.0.ebuild
new file mode 100644
index 000000000000..d3bb9d287356
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.4.0.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.0.ebuild,v 1.1 2002/06/08 14:19:07 spider Exp $
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.gnome.org/"
+
+MY_V="`echo ${PV} |cut -b -5`"
+S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEBUG="yes"
+RESTRICT="nostrip"
+# force debug information
+CFLAGS="${CFLAGS} -g"
+CXXFLAGS="${CXXFLAGS} -g"
+
+
+
+RDEPEND=">=sys-libs/pam-0.72
+	>=sys-apps/tcp-wrappers-7.6
+	>=app-text/scrollkeeper-0.1.4
+	>=gnome-base/libglade-2.0.0
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.0.0
+	>=gnome-base/libgnomecanvas-2.0.0"
+
+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 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 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
+
+	rm -f "${D}/etc/pam.d/gdm"
+
+	# log
+	mkdir -p "${D}/var/lib/gdm"
+	chown gdm:gdm "${D}/var/lib/gdm"
+	chmod 750 "${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 /etc/X11/gdm/Sessions ] ; then
+		mv -f /etc/X11/gdm/Sessions /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=`grep '^ServAuthDir=' /etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`
+	if test x$FIFOFILE = x ; then
+		FIFOFILE=%{localstatedir}/gdm/.gdmfifo
+	else
+		FIFOFILE="$FIFOFILE"/.gdmfifo
+	fi
+	PIDFILE=`grep '^PidFile=' /etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`
+	if test x$PIDFILE = x ; then
+		PIDFILE=/var/run/gdm.pid
+	fi
+	if test -w $FIFOFILE ; then
+		if test -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
+	echo "***********************************************************************"
+	echo "* To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic) *"
+	echo "* and then execute 'rc-update add xdm default'.                       *"
+	echo "*                                                                     *"
+	echo "* NOTE:  you need xfree-4.1.0-r4 or later ...                         *"
+	echo "***********************************************************************"
+	echo
+}
+
+pkg_postrm() {
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update >/dev/null 2>&1
+
+	echo
+	echo "**********************************************"
+	echo "* To remove GDM from startup please execute  *"
+	echo "* 'rc-update del xdm default'                *"
+	echo "**********************************************"
+	echo
+}
+