new release

10 files changed, 428 insertions, 4 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index fe1c0d019c40..72c705179e1c 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.68 2004/08/05 22:07:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.69 2004/08/08 13:08:04 foser Exp $
+
+*gdm-2.6.0.3 (08 Aug 2004)
+
+  08 Aug 2004; foser <foser@gentoo.org> gdm-2.6.0.3.ebuild :
+  New release (#51374)
+  Add pango-1.4.1 to fix language selection issues (#53868)
+  Fix gdm restart logic to actually work
+  Fix location of logfiles (#53526 - patch by langthang@gentoo.org)
 
   05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gdm-2.4.4.7-r1.ebuild:
   Stable on sparc
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 95525522786e..30b9bc164e74 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,17 +1,21 @@
-MD5 548ae17ba34f428ab17d4ec932dc6468 ChangeLog 9313
+MD5 4498bcb57d3f99c3db895559c79299d7 gdm-2.6.0.3.ebuild 3327
+MD5 bf4c39edd0c28adfccb8247fe0b068d7 gdm-2.4.4.7-r1.ebuild 3427
 MD5 248c2099049de9d485c4e44f23609832 gdm-2.2.5.4-r5.ebuild 4439
 MD5 14251e14623b8f8f877339b786ea72db gdm-2.4.1.7-r1.ebuild 5296
-MD5 bf4c39edd0c28adfccb8247fe0b068d7 gdm-2.4.4.7-r1.ebuild 3427
+MD5 548ae17ba34f428ab17d4ec932dc6468 ChangeLog 9313
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7-r1 134
 MD5 25720fd12f8eee788fc5169824a0fe7e files/digest-gdm-2.4.4.7-r1 205
-MD5 b2d71444a82a418126728e6301dd3389 files/gdm-2.4.1.7-gtk-2.4.patch 5730
+MD5 6d2d226ffb2ab29992376b5e2e4abe9f files/digest-gdm-2.6.0.3 205
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
+MD5 b2d71444a82a418126728e6301dd3389 files/gdm-2.4.1.7-gtk-2.4.patch 5730
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.4.1/gnomerc 235
 MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.4.4/Xsession 6198
 MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.4.4/custom.desktop 301
+MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0/Xsession 6198
+MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.6.0/custom.desktop 301
 MD5 d0cb338160e3be8790524af8071cc4df files/2.2.5/pam.d/gdm 380
 MD5 89cc8ab9525284af6babcb9c86122443 files/2.2.5/pam.d/gdmconfig 288
 MD5 d0cb338160e3be8790524af8071cc4df files/2.4.1/pam.d/gdm 380
@@ -19,6 +23,10 @@ MD5 89cc8ab9525284af6babcb9c86122443 files/2.4.1/pam.d/gdmconfig 288
 MD5 2edddb54af0c3c979b9ef73ba52deb4a files/2.4.4/pam.d/gdm 425
 MD5 6c45b586e2cf16cf89ab544197b12bae files/2.4.4/pam.d/gdm-autologin 406
 MD5 89cc8ab9525284af6babcb9c86122443 files/2.4.4/pam.d/gdmconfig 288
+MD5 2edddb54af0c3c979b9ef73ba52deb4a files/2.6.0/pam.d/gdm 425
+MD5 6c45b586e2cf16cf89ab544197b12bae files/2.6.0/pam.d/gdm-autologin 406
+MD5 89cc8ab9525284af6babcb9c86122443 files/2.6.0/pam.d/gdmconfig 288
 MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.4.1/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.4.4/security/console.apps/gdmconfig 66
+MD5 114395565e31f41b44d31d731f1478b0 files/2.6.0/security/console.apps/gdmconfig 66
diff --git a/gnome-base/gdm/files/2.6.0/Xsession b/gnome-base/gdm/files/2.6.0/Xsession
new file mode 100644
index 000000000000..4930bacc1c7a
--- /dev/null
+++ b/gnome-base/gdm/files/2.6.0/Xsession
@@ -0,0 +1,229 @@
+#!/bin/sh
+#
+# This is SORT OF LIKE an X session, but not quite.  You get a command as the
+# first argument (it could be multiple words, so run it with "eval").  As a
+# special case, the command can be:
+#  failsafe - Run an xterm only
+#  default - Run the appropriate Xclients startup (see the code below)
+#  custom - Run ~/.xsession and if that's not available run 'default'
+#
+# (Note that other arguments could also follow, but only the command one is
+# right now relevant and supported)
+#
+# The output is ALREADY redirected to .xsession-errors in GDM.  This way
+# .xsession-errors actually gets more output such as if the PreSession script
+# is failing.  This also prevents DoS attacks if some app in the users session
+# can be prodded to dump lots of stuff on the stdout/stderr.  We wish to be
+# robust don't we?  In case you wish to use an existing script for other DM's,
+# you can just not redirect when GDMSESSION is set.  GDMSESSION will always
+# be set from gdm.
+#
+# Also note that this is not run as a login shell, this is just executed.
+# This is why we source the profile files below.
+#
+# based on:
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+# this will go into the .xsession-errors along with all other echo's
+# good for debugging where things went wrong
+echo "$0: Beginning session setup..."
+
+# First read /etc/profile and .profile
+test -f /etc/profile && . /etc/profile
+test -f "$HOME/.profile" && . "$HOME/.profile"
+# Second read /etc/xprofile and .xprofile for X specific setup
+test -f /etc/xprofile && . /etc/xprofile
+test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
+# Third read .bash_profile for keychain to work correctly
+test -f "$HOME/.bash_profile" && . "$HOME/.bash_profile"
+
+# Translation stuff
+if [ -x "/usr/libexec/gdmtranslate" ] ; then
+  gdmtranslate="/usr/libexec/gdmtranslate"
+else
+  gdmtranslate=
+fi
+
+# Note that this should only go to zenity dialogs which always expect utf8
+gettextfunc () {
+  if [ "x$gdmtranslate" != "x" ] ; then
+    "$gdmtranslate" --utf8 "$1"
+  else
+    echo "$1"
+  fi
+}
+
+zenity=`which zenity 2>/dev/null`
+
+command="$1"
+
+if [ -z "$command" ] ; then
+  command=failsafe
+fi
+
+if [ x"$command" = xfailsafe ] ; then
+  if [ -n "$zenity" ] ; then
+    "$zenity" --info --text `gettextfunc "This is the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`
+  else
+    echo "$0: Starting the failsafe xterm session."
+  fi
+  exec xterm -geometry 80x24+0+0
+fi
+
+# Note: ~/.xsession-errors is now done in the daemon so that it
+# works for ALL sessions (except ones named 'Failsafe')
+
+# clean up after xbanner
+freetemp=`which freetemp 2>/dev/null`
+if [ -n "$freetemp" ] ; then
+	"$freetemp"
+fi
+
+userresources="$HOME/.Xresources"
+usermodmap="$HOME/.Xmodmap"
+userxkbmap="$HOME/.Xkbmap"
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# Normalize languages, some places/distros screw us up in /etc/profile,
+# so in case the user did select a language
+if [ -n "$GDM_LANG" ]; then
+  LANG="$GDM_LANG"
+  export LANG
+
+  if [ -n "$LC_ALL" ]; then
+    if [ "$LC_ALL" != "$LANG" ]; then
+      LC_ALL="$LANG"
+    fi
+  else
+    unset LC_ALL
+  fi
+
+  if [ -n "$LANGUAGE" ]; then
+    if [ "$LANGUAGE" != "$LANG" ]; then
+      LANGUAGE="$LANG"
+    fi
+  else
+    unset LANGUAGE
+  fi
+
+  if [ -n "$LINGUAS" ]; then
+    if [ "$LINGUAS" != "$LANG" ]; then
+      LINGUAS="$LANG"
+    fi
+  else
+    unset LINGUAS
+  fi
+fi
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+if [ "x$command" = "xcustom" ] ; then
+  if [ -x "$HOME/.xsession" ]; then
+    command="$HOME/.xsession"
+  else
+    echo "$0: Cannot find ~/.xsession will try the default session"
+    command="default"
+  fi
+fi
+
+if [ "x$command" = "xdefault" ] ; then
+  if [ -x "$HOME/.Xclients" ]; then
+    command="$HOME/.Xclients"
+  elif [ -x /etc/X11/xinit/Xclients ]; then
+    command="/etc/X11/xinit/Xclients"
+  elif [ -x /etc/X11/Xclients ]; then
+    command="/etc/X11/Xclients"
+  else
+    echo "$0: Cannot find Xclients"
+    # FIXME: kind of an evil failsafe
+    command="xsm"
+  fi
+fi
+
+# add ssh-agent if found
+sshagent="`which ssh-agent 2>/dev/null`"
+if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+    command="$sshagent -- $command"
+elif [ -z "$sshagent" ] ; then
+    echo "$0: ssh-agent not found!"
+fi
+
+echo "$0: Setup done, will execute: $command"
+
+eval exec $command
+
+echo "$0: Executing $command failed, will run xterm"
+
+if [ -n "$zenity" ] ; then
+	"$zenity" --info --text `gettextfunc "I could not start your session and so I have started the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`
+fi
+
+exec xterm -geometry 80x24+0+0
diff --git a/gnome-base/gdm/files/2.6.0/custom.desktop b/gnome-base/gdm/files/2.6.0/custom.desktop
new file mode 100644
index 000000000000..ea737608cd31
--- /dev/null
+++ b/gnome-base/gdm/files/2.6.0/custom.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+# The names/descriptions should really be better
+Name=Custom Session
+Comment=This starts a custom session
+Exec=custom
+# The "custom" Exec is a very special one and is handled specially in
+# the Xsession script and just runs "~/.xsession" directly
+Icon=
+Type=Application
diff --git a/gnome-base/gdm/files/2.6.0/pam.d/gdm b/gnome-base/gdm/files/2.6.0/pam.d/gdm
new file mode 100644
index 000000000000..e9dd91f07be9
--- /dev/null
+++ b/gnome-base/gdm/files/2.6.0/pam.d/gdm
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth       required	/lib/security/pam_env.so
+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.6.0/pam.d/gdm-autologin b/gnome-base/gdm/files/2.6.0/pam.d/gdm-autologin
new file mode 100644
index 000000000000..750db4773635
--- /dev/null
+++ b/gnome-base/gdm/files/2.6.0/pam.d/gdm-autologin
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth       required	/lib/security/pam_env.so
+auth       required	/lib/security/pam_nologin.so
+auth       required	/lib/security/pam_permit.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.6.0/pam.d/gdmconfig b/gnome-base/gdm/files/2.6.0/pam.d/gdmconfig
new file mode 100644
index 000000000000..44b01cfc759f
--- /dev/null
+++ b/gnome-base/gdm/files/2.6.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/2.6.0/security/console.apps/gdmconfig b/gnome-base/gdm/files/2.6.0/security/console.apps/gdmconfig
new file mode 100644
index 000000000000..5fc459648a9a
--- /dev/null
+++ b/gnome-base/gdm/files/2.6.0/security/console.apps/gdmconfig
@@ -0,0 +1,5 @@
+USER=root
+PROGRAM=/usr/bin/gdmconfig
+SESSION=false
+FALLBACK=true
+
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.3 b/gnome-base/gdm/files/digest-gdm-2.6.0.3
new file mode 100644
index 000000000000..c00acce8ed0b
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.3
@@ -0,0 +1,3 @@
+MD5 2eb8c0fb4289d78fdae686aee3cfbd5c gdm-2.6.0.3.tar.bz2 3079606
+MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
+MD5 e0dcf60fc342ed1862f0fff26da984b2 gentoo-gdm-theme-r1.tar.bz2 54186
diff --git a/gnome-base/gdm/gdm-2.6.0.3.ebuild b/gnome-base/gdm/gdm-2.6.0.3.ebuild
new file mode 100644
index 000000000000..d200365db96f
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.6.0.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.3.ebuild,v 1.1 2004/08/08 13:08:04 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.jirka.org/gdm.html"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+IUSE="tcpd xinerama selinux"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme.tar.bz2
+	mirror://gentoo/gentoo-gdm-theme-r1.tar.bz2"
+MY_V="`echo ${PV} |cut -b -5`"
+
+RDEPEND=">=sys-libs/pam-0.72
+	>=x11-libs/pango-1.4.1
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/libglade-2
+	>=gnome-base/librsvg-2
+	>=media-libs/libart_lgpl-2.3.11
+	>=dev-libs/libxml2-2.4.12
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	>=app-text/scrollkeeper-0.3.11
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+G2CONF="${G2CONF} \
+	--sysconfdir=/etc/X11 \
+	--localstatedir=/var \
+	--with-pam-prefix=/etc \
+	--with-xdmcp \
+	`use_with tcpd tcp-wrappers` \
+	`use_with xinerama` \
+	`use_with selinux`"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
+
+}
+
+src_install() {
+
+	gnome2_src_install \
+		PAM_PREFIX=${D}/etc \
+		sysconfdir=${D}/etc/X11 \
+		localstatedir=${D}/var
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/bin/gdm
+	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
+	dosym /usr/bin/gdm /usr/bin/gdm-binary
+
+	# log, etc.
+	dodir /var/log/gdm
+	dodir /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 ${FILESDIR}/${MY_V}/Xsession
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe ${FILESDIR}/${MY_V}/custom.desktop
+
+	# We replace the pam stuff by our own
+	rm -f ${D}/etc/pam.d/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
+	doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
+
+	# pam security
+	dodir /etc/security/console.apps
+	insinto /etc/security/console.apps
+	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
+	# use Gentoo theme
+	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-cow  ${D}/usr/share/gdm/themes
+	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	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
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+
+}