Update to 2.2.0. Many bugfixes, some smaller ui changes.

9 files changed, 109 insertions, 119 deletions

diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 52f448b51b0..3c0b89711bd 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/20 02:42:14 mjl Exp $
 
---- config/Makefile.in.orig	Thu Sep 30 01:15:45 1999
-+++ config/Makefile.in	Tue Nov  9 23:30:28 1999
-@@ -243,6 +243,10 @@
- 	    -e 's,\@sysconfdir\@,$(sysconfdir),g' \
- 	    -e 's,\@localedir\@,$(localedir),g' \
- 	    -e 's,\@authdir\@,$(authdir),g' \
-+	    -e 's,\@GDMOWN\@,$(GDMOWN),g' \
-+	    -e 's,\@GDMGRP\@,$(GDMGRP),g' \
-+	    -e 's,\@X11BASE\@,$(X11BASE),g' \
-+	    -e 's,\@LOCALBASE\@,$(LOCALBASE),g' \
- 	    < $(srcdir)/gdm.conf.in > gdm.conf.tmp; \
- 	mv -f gdm.conf.tmp gdm.conf
- 
-@@ -300,7 +304,7 @@
- 	fi
- 	if test '!' -d $(authdir); then \
- 		$(mkinstalldirs) $(authdir); \
--		chown gdm.gdm $(authdir); \
-+		chown $(GDMOWN):$(GDMGRP) $(authdir); \
- 		chmod 750 $(authdir); \
- 	fi
+--- configure.orig	Tue Mar 13 01:23:59 2001
++++ configure	Tue Mar 20 02:51:23 2001
+@@ -4781,7 +4781,7 @@
  
+ have_pam=no
+ VRFY="verify-crypt"
+-for ac_hdr in security/pam_appl.h
++for ac_hdr in 
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -5204,6 +5204,10 @@
+  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+ $ac_vpsub
+ $extrasub
++s%@GDMOWN@%$GDMOWN%g
++s%@GDMGRP@%$GDMGRP%g
++s%@X11BASE@%$X11BASE%g
++s%@LOCALBASE@%$LOCALBASE%g
+ s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
index de11b12044a..0fc6f81ceef 100644
--- a/x11/gdm/patches/patch-ab
+++ b/x11/gdm/patches/patch-ab
@@ -1,49 +1,51 @@
-$NetBSD: patch-ab,v 1.2 1999/11/15 00:07:02 tron Exp $
+$NetBSD: patch-ab,v 1.3 2001/03/20 02:42:14 mjl Exp $
 
---- config/gdm.conf.in.orig	Tue Sep  7 06:37:16 1999
-+++ config/gdm.conf.in	Mon Nov 15 00:57:03 1999
-@@ -1,20 +1,20 @@
+--- config/gdm.conf.in.orig	Tue Mar 20 02:18:54 2001
++++ config/gdm.conf.in	Tue Mar 20 02:22:19 2001
+@@ -1,21 +1,21 @@
  [daemon]
- Chooser=@bindir@/gdmchooser --disable-sound --disable-crash-dialog
--DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
+ AutomaticLogin=
+ Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
+-DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
 +DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
- DisplayInitDir=@sysconfdir@/gdm/Init
- Greeter=@bindir@/gdmlogin --disable-sound --disable-crash-dialog
+ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
+ Greeter=@EXPANDED_BINDIR@/gdmlogin --disable-sound --disable-crash-dialog
 -Group=gdm
 +Group=@GDMGRP@
  HaltCommand=/sbin/shutdown -h now
- KillInitClients=1
- LogDir=@authdir@
+ KillInitClients=true
+ LogDir=@EXPANDED_AUTHDIR@
 -PidFile=/var/run/gdm.pid
 +PidFile=/var/run/xdm.pid
- PostSessionScriptDir=@sysconfdir@/gdm/PostSession/
- PreSessionScriptDir=@sysconfdir@/gdm/PreSession/
+ PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
+ PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
  RebootCommand=/sbin/shutdown -r now
--RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
+-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
 +RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
- ServAuthDir=@authdir@
- SessionDir=@sysconfdir@/gdm/Sessions/
+ ServAuthDir=@EXPANDED_AUTHDIR@
+ SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
 -User=gdm
 +User=@GDMOWN@
  UserAuthDir=
  UserAuthFBDir=/tmp
  UserAuthFile=.Xauthority
-@@ -50,7 +50,7 @@
- GlobalFaceDir=@datadir@/faces/
- Icon=@pixmapdir@/gdm.xpm
- LocaleFile=@localedir@/locale.alias
--Logo=@pixmapdir@/gnome-logo-large.png
-+Logo=@pixmapdir@/Daemon.png
- Quiver=1
- SystemMenu=0
+@@ -51,7 +51,7 @@
+ GlobalFaceDir=@EXPANDED_DATADIR@/faces/
+ Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
+ LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
+-Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
++Logo=@EXPANDED_PIXMAPDIR@/Daemon.png
+ Quiver=true
+ SystemMenu=true
  Welcome=Welcome to %n
-@@ -64,7 +64,7 @@
- Enable=0
+@@ -75,8 +75,8 @@
+ Enable=false
  
  [servers]
 -0=/usr/bin/X11/X
 -#1=/usr/bin/X11/X
 +0=@X11BASE@/bin/X
 +#1=@X11BASE@/bin/X
- 
- 
+ #Note: If you want to make sure X runs on a specific virtual console on linux,
+ #      you can use the following (for console 7):
+ #0=/usr/bin/X11/X vt7
diff --git a/x11/gdm/patches/patch-ac b/x11/gdm/patches/patch-ac
index d8b1d545743..d3642b8b988 100644
--- a/x11/gdm/patches/patch-ac
+++ b/x11/gdm/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+$NetBSD: patch-ac,v 1.2 2001/03/20 02:42:14 mjl Exp $
 
---- config/Gnome.in.orig	Mon Apr 19 00:08:08 1999
-+++ config/Gnome.in	Tue Nov  9 23:30:28 1999
+--- config/Gnome.in.orig	Tue Mar 20 02:24:39 2001
++++ config/Gnome.in	Tue Mar 20 02:25:08 2001
 @@ -1,4 +1,4 @@
 -#!/bin/bash -login
 +#!/bin/sh
diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
deleted file mode 100644
index 03274f60f5e..00000000000
--- a/x11/gdm/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
-
---- gui/gdmlogin.c.orig	Thu Sep 30 00:56:35 1999
-+++ gui/gdmlogin.c	Wed Nov 10 01:30:54 1999
-@@ -1007,7 +1007,7 @@
-     gint cols, rows;
-     struct stat statbuf;
- 
--    if(GdmGtkRC)
-+    if(*GdmGtkRC)
- 	gtk_rc_parse (GdmGtkRC);
- 
-     rootwin = gdk_window_foreign_new (GDK_ROOT_WINDOW ());
-@@ -1083,7 +1083,7 @@
- 	gtk_widget_show (GTK_WIDGET (item));
-     }
- 
--    if (GdmIcon) {
-+    if (*GdmIcon) {
- 	if (access (GdmIcon, R_OK)) {
- 	    syslog (LOG_WARNING, _("Can't open icon file: %s. Suspending iconify feature!"), GdmIcon);
- 	}
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index 4a2ce86886b..c4737ff0b2d 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+$NetBSD: patch-ae,v 1.2 2001/03/20 02:42:15 mjl Exp $
 
---- po/Makefile.in.in.orig	Thu Sep 30 01:14:23 1999
-+++ po/Makefile.in.in	Tue Nov  9 23:30:28 1999
+--- po/Makefile.in.in.orig	Tue Mar 20 02:30:22 2001
++++ po/Makefile.in.in	Tue Mar 20 02:30:39 2001
 @@ -19,7 +19,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
index 5f1ca562347..b0b736187a6 100644
--- a/x11/gdm/patches/patch-af
+++ b/x11/gdm/patches/patch-af
@@ -1,48 +1,26 @@
-$NetBSD: patch-af,v 1.4 1999/11/11 11:57:20 tron Exp $
-
---- daemon/slave.c.orig	Thu Sep 30 00:56:35 1999
-+++ daemon/slave.c	Thu Nov 11 12:30:39 1999
-@@ -300,8 +300,8 @@
-     setegid (GdmGroupId);
-     seteuid (0);
-     
--    session = gdm_slave_greeter_ctl (GDM_SESS, usrsess);
--    language = gdm_slave_greeter_ctl (GDM_LANG, usrlang);
-+    session = gdm_slave_greeter_ctl (GDM_SESS, usrsess ? usrsess : "");
-+    language = gdm_slave_greeter_ctl (GDM_LANG, usrlang ? usrlang : "");
-     
-     if (strlen (gdm_slave_greeter_ctl (GDM_SSESS, "")))
- 	savesess = TRUE;
-@@ -331,11 +331,11 @@
-     setenv ("DISPLAY", d->name, TRUE);
-     setenv ("LOGNAME", login, TRUE);
-     setenv ("USER", login, TRUE);
--    setenv ("USERNAME", login, TRUE);
-     setenv ("HOME", pwent->pw_dir, TRUE);
-     setenv ("GDMSESSION", session, TRUE);
-     setenv ("SHELL", pwent->pw_shell, TRUE);
--    putenv ("MAIL");
-+    unsetenv ("GROUP");
-+    unsetenv ("MAIL");
+--- daemon/slave.c.orig	Mon Mar  5 01:29:54 2001
++++ daemon/slave.c	Tue Mar 20 02:59:34 2001
+@@ -457,11 +457,11 @@
+     gdm_setenv ("DISPLAY", d->name);
+     gdm_setenv ("LOGNAME", login);
+     gdm_setenv ("USER", login);
+-    gdm_setenv ("USERNAME", login);
+     gdm_setenv ("HOME", pwent->pw_dir);
+     gdm_setenv ("GDMSESSION", session);
+     gdm_setenv ("SHELL", pwent->pw_shell);
+     gdm_unsetenv ("MAIL");	/* Unset $MAIL for broken shells */
++    gdm_unsetenv ("GROUP");
  
      /* Special PATH for root */
-     if(pwent->pw_uid == 0)
-@@ -385,6 +385,9 @@
- 	if (setgid (pwent->pw_gid) < 0) 
- 	    gdm_remanage (_("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid);
+     if (pwent->pw_uid == 0)
+@@ -518,6 +518,10 @@
+ 	    gdm_slave_exit (DISPLAY_REMANAGE,
+ 			    _("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid);
  	
 +	if (setlogin (login) < 0) 
-+	    gdm_remanage (_("gdm_slave_session_start: Could not set login name %s. Aborting."), login);
++		gdm_slave_exit (DISPLAY_REMANAGE,
++			    _("gdm_slave_session_start: Could not set login name %s. Aborting."), login);
 +
  	if (initgroups (login, pwent->pw_gid) < 0)
- 	    gdm_remanage (_("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login);
- 	
-@@ -423,7 +426,7 @@
- 	/* Restore sigmask inherited from init */
- 	sigprocmask (SIG_SETMASK, &sysmask, NULL);
- 	
--	execl (sesspath, NULL);
-+	execl (sesspath, sesspath, NULL);
- 	
- 	gdm_error (_("gdm_slave_session_start: Could not start session `%s'"), sesspath);
- 	
+ 	    gdm_slave_exit (DISPLAY_REMANAGE,
+ 			    _("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login);
diff --git a/x11/gdm/patches/patch-ba b/x11/gdm/patches/patch-ba
new file mode 100644
index 00000000000..fbceaa68005
--- /dev/null
+++ b/x11/gdm/patches/patch-ba
@@ -0,0 +1,10 @@
+--- daemon/gdm.c.orig	Tue Mar 20 02:55:01 2001
++++ daemon/gdm.c	Tue Mar 20 02:55:20 2001
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <syslog.h>
++#include <locale.h>
+ 
+ #include "gdm.h"
+ #include "misc.h"
diff --git a/x11/gdm/patches/patch-bb b/x11/gdm/patches/patch-bb
new file mode 100644
index 00000000000..e4400d669a8
--- /dev/null
+++ b/x11/gdm/patches/patch-bb
@@ -0,0 +1,11 @@
+--- daemon/verify-crypt.c.orig	Tue Mar 20 02:56:33 2001
++++ daemon/verify-crypt.c	Tue Mar 20 02:57:04 2001
+@@ -113,7 +113,7 @@
+  * Unregister the user's session */
+ 
+ void
+-gdm_verify_check (void)
++gdm_verify_cleanup (void)
+ {
+ }
+ 
diff --git a/x11/gdm/patches/patch-bc b/x11/gdm/patches/patch-bc
new file mode 100644
index 00000000000..e577c45ecb4
--- /dev/null
+++ b/x11/gdm/patches/patch-bc
@@ -0,0 +1,11 @@
+--- config/Makefile.in.orig	Tue Mar 20 03:07:31 2001
++++ config/Makefile.in	Tue Mar 20 03:08:13 2001
+@@ -315,7 +315,7 @@
+ 
+ 	if test '!' -d $(authdir); then \
+ 		$(mkinstalldirs) $(authdir); \
+-		chown gdm.gdm $(authdir); \
++		chown ${GDMOWN}.${GDMGRP} $(authdir); \
+ 		chmod 750 $(authdir); \
+ 	fi
+