diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-10-28 06:10:10 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-10-28 06:10:10 +0800 |
commit | 752a66b40a757b50196fb97fda1143a42e96c295 (patch) | |
tree | 49bd85e2fc333a96c40e09b46a8027f64b1a470f /x11/gdm/files/patch-daemon_gdm-session-worker.c | |
parent | 2d81cfc3ccdf086d3ac5c107818ffe2f73f04d9a (diff) | |
download | marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.gz marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.bz2 marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.lz marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.xz marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.zst marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.zip |
Move gnome3 ports into the place of the gnome2 locations.
Update to new port rules, remove conflicts, latest_link, enable stage support.
gnome-games was skipped because I got a update for that.
gnome-keyring 2 vs 3, needs to be looked at.
zenity 2 vs 3, and libgnomekbd 2 vs 3
Use new lib_depend syntax in bsd.gnome.mk.
Possible lots of broken links.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files/patch-daemon_gdm-session-worker.c')
-rw-r--r-- | x11/gdm/files/patch-daemon_gdm-session-worker.c | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c deleted file mode 100644 index a15c91658..000000000 --- a/x11/gdm/files/patch-daemon_gdm-session-worker.c +++ /dev/null @@ -1,68 +0,0 @@ ---- 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> - #include <pwd.h> -+#ifdef HAVE_LOGINCAP -+#include <login_cap.h> -+#endif - - #ifdef HAVE_LOGINDEVPERM - #include <libdevinfo.h> -@@ -341,7 +344,7 @@ - * what to search if PATH is unset. POSIX may, dunno. - */ - -- path = "/bin:/usr/bin:."; -+ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:."; - } - - len = strlen (file) + 1; -@@ -2032,15 +2035,16 @@ - char *cachedirname; - char *home_dir; - int fd; -+#ifdef HAVE_LOGINCAP -+ char *login = worker->priv->username; -+ struct passwd *pwent = getpwnam (login); -+#endif - - /* Make sure cachedir gets created before we drop to user */ - cachedirname = gdm_session_worker_create_cachedir (worker); - g_free (cachedirname); - -- if (setuid (worker->priv->uid) < 0) { -- g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno)); -- _exit (1); -- } -+ /* Call setsid() before setusercontext() */ - - if (setsid () < 0) { - g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s", -@@ -2048,6 +2052,25 @@ - _exit (2); - } - -+#ifdef HAVE_LOGINCAP -+ if (setusercontext (NULL, pwent, pwent->pw_uid, -+ LOGIN_SETALL & ~LOGIN_SETGROUP) < 0) { -+ g_debug ("%s: setusercontext () failed for %s. " -+ "Aborting.", "gdm_session_worker_start_user_session", -+ login ? login : "(null)"); -+ } -+ -+ /* Propagate PATH environment variable from user context to child processes */ -+ -+ gdm_session_worker_set_environment_variable (worker, "PATH", getenv ("PATH")); -+ -+#else -+ if (setuid (worker->priv->uid) < 0) { -+ g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno)); -+ _exit (1); -+ } -+#endif -+ - environment = gdm_session_worker_get_environment (worker); - - g_assert (geteuid () == getuid ()); |