summaryrefslogtreecommitdiff
path: root/x11/gdm
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1999-11-11 10:47:25 +0000
committertron <tron@pkgsrc.org>1999-11-11 10:47:25 +0000
commitca0c3d7660e1ad0acd748db1b2889aa5fb1c540b (patch)
tree47bb153479f640ec78e9c4b5996e1bcf100f1c0f /x11/gdm
parentb25539e6a222be31e8c6fb8808f636da9a877357 (diff)
downloadpkgsrc-ca0c3d7660e1ad0acd748db1b2889aa5fb1c540b.tar.gz
Patch session setup so that the we get an environment which looks mostly
like what we get from XDM or KDM and use setlogin(). A complete rewrite of the session setup will be requested via a bug report to the GNOME maintainers.
Diffstat (limited to 'x11/gdm')
-rw-r--r--x11/gdm/Makefile6
-rw-r--r--x11/gdm/files/patch-sum4
-rw-r--r--x11/gdm/patches/patch-af38
3 files changed, 39 insertions, 9 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index c288dd75c12..a420ef63c19 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/11/10 23:48:12 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/11/11 10:47:25 tron Exp $
DISTNAME= gdm-2.0beta4
PKGNAME= gdm-2.0b4
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.gnome.org/
DEPENDS+= gnome-libs-*:../../x11/gnome-libs
-BROKEN= user privileges are not initialized correctly
-
GNU_CONFIGURE= yes
USE_X11BASE= yes
@@ -68,7 +66,7 @@ post-build:
post-install:
.for FILE in ${GDMCFGFILES}
- cd ${WRKSRC}/config; \
+ @cd ${WRKSRC}/config; \
SOURCE=${FILE:C/:.*//}; \
TARGET=${GDMCFGDIR}/${FILE:C/.*://:S/.default//}; \
if [ ! -f $$TARGET ]; then \
diff --git a/x11/gdm/files/patch-sum b/x11/gdm/files/patch-sum
index 244f1542cb5..a39bf2c4f1a 100644
--- a/x11/gdm/files/patch-sum
+++ b/x11/gdm/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/11/10 23:15:27 tron Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/11 10:47:26 tron Exp $
MD5 (patch-aa) = 2467d33da85bef94f9af52c61e0dcd3a
MD5 (patch-ab) = 74545f81c15f33c95d30736d2c7ada06
MD5 (patch-ac) = e79133c3fccf8671ee1be210a0e9b111
MD5 (patch-ad) = 40cad34a11fd0c81b9016fa170a70b9e
MD5 (patch-ae) = 68d772ee3a07c03eb122332bc5bf8822
-MD5 (patch-af) = cbbd1555cb58256206bff130e802fe48
+MD5 (patch-af) = b1fb0fae5ee8172a02d95acaa414ca48
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
index 840093a3fc9..3b644d1ceca 100644
--- a/x11/gdm/patches/patch-af
+++ b/x11/gdm/patches/patch-af
@@ -1,8 +1,40 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+$NetBSD: patch-af,v 1.2 1999/11/11 10:47:26 tron Exp $
--- daemon/slave.c.orig Thu Sep 30 00:56:35 1999
-+++ daemon/slave.c Wed Nov 10 01:18:48 1999
-@@ -423,7 +423,7 @@
++++ daemon/slave.c Thu Nov 11 11:41:17 1999
+@@ -259,6 +259,7 @@
+ gchar *session, *language, *usrsess, *usrlang;
+ gboolean savesess = FALSE, savelang = FALSE, usrcfgok = FALSE, authok = FALSE;
+ gint i;
++ extern char **environ;
+
+ pwent = getpwnam (login);
+
+@@ -331,11 +332,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 +386,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 +427,7 @@
/* Restore sigmask inherited from init */
sigprocmask (SIG_SETMASK, &sysmask, NULL);