summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-06-25 22:53:53 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-06-25 22:53:53 +0800
commitd4253d949391aa63919137da3a748080eacb7fe1 (patch)
treeb3f856fb1953d598bf70f0c2dc6c0d88bdadd6fa
parent4d85c99d713a78f1391fbfbad022278c4f54904f (diff)
downloadmarcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.tar
marcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.tar.gz
marcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.tar.bz2
marcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.tar.lz
marcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.tar.xz
marcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.tar.zst
marcuscom-ports-d4253d949391aa63919137da3a748080eacb7fe1.zip
Sync w/ FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16090 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gdm/Makefile3
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 685bd4876..7a99c74c1 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.188 2011/06/03 21:27:51 mezz Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.189 2011/06/10 23:04:42 mezz Exp $
#
PORTNAME= gdm
PORTVERSION= 2.30.7
+PORTREVISION= 1
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 e98e8d4d3..2305cd439 100644
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -1,5 +1,5 @@
---- daemon/gdm-session-worker.c.orig 2011-06-02 16:50:17.000000000 +0200
-+++ daemon/gdm-session-worker.c 2011-06-03 21:08:07.000000000 +0200
+--- daemon/gdm-session-worker.c.orig 2011-06-02 09:50:17.000000000 -0500
++++ daemon/gdm-session-worker.c 2011-06-24 17:59:50.000000000 -0500
@@ -31,6 +31,9 @@
#include <errno.h>
#include <grp.h>
@@ -40,16 +40,13 @@
if (setsid () < 0) {
g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -2048,6 +2052,28 @@
+@@ -2048,6 +2052,25 @@
_exit (2);
}
+#ifdef HAVE_LOGINCAP
+ if (setusercontext (NULL, pwent, pwent->pw_uid,
-+ LOGIN_SETLOGIN | LOGIN_SETPATH |
-+ LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
-+ LOGIN_SETUMASK | LOGIN_SETUSER |
-+ LOGIN_SETENV) < 0) {
++ LOGIN_SETALL & ~LOGIN_SETGROUP) < 0) {
+ g_debug ("%s: setusercontext () failed for %s. "
+ "Aborting.", "gdm_session_worker_start_user_session",
+ login ? login : "(null)");