11 files changed, 223 insertions, 0 deletions

diff --git a/x11/gdm/files/patch-aa b/x11/gdm/files/patch-aa
new file mode 100644
index 000000000000..52f448b51b0f
--- /dev/null
+++ b/x11/gdm/files/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/11/10 23:15:28 tron 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
+ 
diff --git a/x11/gdm/files/patch-ab b/x11/gdm/files/patch-ab
new file mode 100644
index 000000000000..8adacc171117
--- /dev/null
+++ b/x11/gdm/files/patch-ab
@@ -0,0 +1,47 @@
+--- config/gdm.conf.in.orig	Tue Sep  7 13:37:16 1999
++++ config/gdm.conf.in	Wed Sep 13 01:26:33 2000
+@@ -1,20 +1,20 @@
+ [daemon]
+ Chooser=@bindir@/gdmchooser --disable-sound --disable-crash-dialog
+-DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
++DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
+ DisplayInitDir=@sysconfdir@/gdm/Init
+ Greeter=@bindir@/gdmlogin --disable-sound --disable-crash-dialog
+-Group=gdm
++Group=wheel
+ HaltCommand=/sbin/shutdown -h now
+ KillInitClients=1
+-LogDir=@authdir@
++LogDir=/var/log
+ PidFile=/var/run/gdm.pid
+ PostSessionScriptDir=@sysconfdir@/gdm/PostSession/
+ PreSessionScriptDir=@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/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
+ ServAuthDir=@authdir@
+ SessionDir=@sysconfdir@/gdm/Sessions/
+-User=gdm
++User=root
+ 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
+ Welcome=Welcome to %n
+@@ -64,7 +64,7 @@
+ Enable=0
+ 
+ [servers]
+-0=/usr/bin/X11/X
+-#1=/usr/bin/X11/X
++0=@X11BASE@/bin/X
++#1=@X11BASE@/bin/X
+ 
+ 
diff --git a/x11/gdm/files/patch-ac b/x11/gdm/files/patch-ac
new file mode 100644
index 000000000000..99387e481e31
--- /dev/null
+++ b/x11/gdm/files/patch-ac
@@ -0,0 +1,16 @@
+--- config/Gnome.in.orig	Mon Apr 19 07:08:08 1999
++++ config/Gnome.in	Wed Sep 13 01:47:51 2000
+@@ -1,4 +1,4 @@
+-#!/bin/bash -login
++#!/bin/sh
+ 
+ for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
+ do
+@@ -13,6 +13,6 @@
+ if [ -x "$HOME/.gnomerc" ]; then
+ 	exec "$HOME/.gnomerc"
+ else
+-	exec "@sysconfdir@/gnomerc"
++	exec "@sysconfdir@/gdm/gnomerc"
+ fi
+ 
diff --git a/x11/gdm/files/patch-ad b/x11/gdm/files/patch-ad
new file mode 100644
index 000000000000..03274f60f5e0
--- /dev/null
+++ b/x11/gdm/files/patch-ad
@@ -0,0 +1,22 @@
+$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/files/patch-ae b/x11/gdm/files/patch-ae
new file mode 100644
index 000000000000..4a2ce86886be
--- /dev/null
+++ b/x11/gdm/files/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+
+--- po/Makefile.in.in.orig	Thu Sep 30 01:14:23 1999
++++ po/Makefile.in.in	Tue Nov  9 23:30:28 1999
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/x11/gdm/files/patch-af b/x11/gdm/files/patch-af
new file mode 100644
index 000000000000..5f1ca5623479
--- /dev/null
+++ b/x11/gdm/files/patch-af
@@ -0,0 +1,48 @@
+$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");
+ 
+     /* 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 (setlogin (login) < 0) 
++	    gdm_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);
+ 	
diff --git a/x11/gdm/files/patch-ag b/x11/gdm/files/patch-ag
new file mode 100644
index 000000000000..2c8b5868765b
--- /dev/null
+++ b/x11/gdm/files/patch-ag
@@ -0,0 +1,10 @@
+--- config/Default.orig	Tue Sep 12 22:07:51 2000
++++ config/Default	Tue Sep 12 22:07:59 2000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-/usr/bin/X11/xsetroot -solid "#007777"
++/usr/X11R6/bin/xsetroot -solid "#007777"
+ 
+ 
+ 
diff --git a/x11/gdm/files/patch-ah b/x11/gdm/files/patch-ah
new file mode 100644
index 000000000000..4738496f3561
--- /dev/null
+++ b/x11/gdm/files/patch-ah
@@ -0,0 +1,7 @@
+--- config/PreSession.orig	Thu Sep 30 07:42:27 1999
++++ config/PreSession	Wed Sep 13 00:51:23 2000
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-/usr/bin/X11/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER
++/usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER
+ 
diff --git a/x11/gdm/files/patch-ai b/x11/gdm/files/patch-ai
new file mode 100644
index 000000000000..f348fc2e4647
--- /dev/null
+++ b/x11/gdm/files/patch-ai
@@ -0,0 +1,7 @@
+--- config/PostSession.orig	Thu Sep 30 07:42:19 1999
++++ config/PostSession	Wed Sep 13 00:51:04 2000
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-/usr/bin/X11/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER
++/usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER
+ 
diff --git a/x11/gdm/files/patch-aj b/x11/gdm/files/patch-aj
new file mode 100644
index 000000000000..798169e5aa93
--- /dev/null
+++ b/x11/gdm/files/patch-aj
@@ -0,0 +1,8 @@
+--- config/Xsession.orig	Tue Sep 12 22:12:09 2000
++++ config/Xsession	Tue Sep 12 22:13:21 2000
+@@ -1,4 +1,4 @@
+-#!/bin/bash -login
++#!/bin/sh
+ # $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+ 
+ case $# in
diff --git a/x11/gdm/files/patch-ak b/x11/gdm/files/patch-ak
new file mode 100644
index 000000000000..7112d743b98f
--- /dev/null
+++ b/x11/gdm/files/patch-ak
@@ -0,0 +1,21 @@
+--- daemon/gdm.c.orig	Wed Sep 13 01:04:25 2000
++++ daemon/gdm.c	Wed Sep 13 01:05:17 2000
+@@ -271,18 +271,12 @@
+     else 
+ 	GdmUserId = pwent->pw_uid;
+ 
+-    if (GdmUserId==0)
+-	gdm_fail (_("gdm_config_parse: The gdm user should not be root. Aborting!"));
+-
+     grent = getgrnam (GdmGroup);
+ 
+     if (!grent)
+ 	gdm_fail (_("gdm_config_parse: Can't find the gdm group (%s). Aborting!"), GdmGroup);
+     else 
+ 	GdmGroupId = grent->gr_gid;   
+-
+-    if (GdmGroupId==0)
+-	gdm_fail (_("gdm_config_parse: The gdm group should not be root. Aborting!"));
+ 
+     setegid (GdmGroupId);	/* gid remains `gdm' */
+     seteuid (GdmUserId);