diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-26 00:51:40 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-26 00:51:40 +0800 |
| commit | fa4e06404d32d1cfba0d37066cb07949e8d22293 (patch) | |
| tree | d69dcfd007df59f59f95f15b0bee73b8c38f8d67 | |
| parent | 139438792baa8de4938c8ef56bfaa24eb32f169a (diff) | |
| download | marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.tar marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.tar.gz marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.tar.bz2 marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.tar.lz marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.tar.xz marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.tar.zst marcuscom-ports-fa4e06404d32d1cfba0d37066cb07949e8d22293.zip | |
Make sure DISPLAY and XAUTHORITY are set when initializing PAM so our
g-k-r PAM module can work properly.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11380 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/files/patch-daemon_gdm-session-worker.c | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 9e8e6be19..0ce4da7b2 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.129 2008/08/20 18:42:39 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.130 2008/08/21 20:40:30 mezz Exp $ # PORTNAME= gdm PORTVERSION= 2.23.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c index 67c65fc4c..406943895 100644 --- a/x11/gdm/files/patch-daemon_gdm-session-worker.c +++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c @@ -1,11 +1,22 @@ ---- daemon/gdm-session-worker.c.orig 2008-01-15 17:23:12.000000000 -0500 -+++ daemon/gdm-session-worker.c 2008-01-15 17:22:36.000000000 -0500 -@@ -226,7 +226,7 @@ gdm_session_execute (const char *file, +--- daemon/gdm-session-worker.c.orig 2008-07-30 19:15:47.000000000 -0400 ++++ daemon/gdm-session-worker.c 2008-08-25 12:50:00.000000000 -0400 +@@ -332,7 +332,7 @@ gdm_session_execute (const char *file, * what to search if PATH is unset. POSIX may, dunno. */ - path = "/bin:/usr/bin:."; -+ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:."; ++ path = "/bin:/usr/bin:/usr/local/bin:."; } len = strlen (file) + 1; +@@ -1062,6 +1062,10 @@ gdm_session_worker_initialize_pam (GdmSe + pam_conversation.conv = (GdmSessionWorkerPamNewMessagesFunc) gdm_session_worker_pam_new_messages_handler; + pam_conversation.appdata_ptr = worker; + ++ g_setenv ("DISPLAY", x11_display_name, FALSE); ++ ++ g_setenv ("XAUTHORITY", x11_authority_file, FALSE); ++ + gdm_session_worker_start_auditor (worker); + error_code = pam_start (service, + username, |