From e773cafcd2319f531b85b077afbf25599e00daee Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 26 Mar 2008 04:53:20 +0000 Subject: [PATCH] - Update to snapshot - Turn on profiling --- gdm-2.21.9-fix-default-path.patch | 57 ------------------------------- gdm.spec | 10 +++--- sources | 2 +- 3 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 gdm-2.21.9-fix-default-path.patch diff --git a/gdm-2.21.9-fix-default-path.patch b/gdm-2.21.9-fix-default-path.patch deleted file mode 100644 index 7858367..0000000 --- a/gdm-2.21.9-fix-default-path.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: daemon/gdm-session-worker.c -=================================================================== ---- gdm-2.21.9/daemon/gdm-session-worker.c (revision 6042) -+++ gdm-2.21.9/daemon/gdm-session-worker.c (working copy) -@@ -67,7 +67,7 @@ - #endif - - #ifndef GDM_SESSION_DEFAULT_PATH --#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin" -+#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" - #endif - - #ifndef GDM_SESSION_ROOT_UID -@@ -1315,7 +1315,13 @@ gdm_session_worker_accredit_user (GdmSes - /* Let's give the user a default PATH if he doesn't already have one - */ - if (!gdm_session_worker_environment_variable_is_set (worker, "PATH")) { -- gdm_session_worker_set_environment_variable (worker, "PATH", GDM_SESSION_DEFAULT_PATH); -+ if (strcmp (BINDIR, "/usr/bin") == 0) { -+ gdm_session_worker_set_environment_variable (worker, "PATH", -+ GDM_SESSION_DEFAULT_PATH); -+ } else { -+ gdm_session_worker_set_environment_variable (worker, "PATH", -+ BINDIR ":" GDM_SESSION_DEFAULT_PATH); -+ } - } - - if (! _change_user (worker, uid, gid)) { ---- gdm-2.21.9/daemon/gdm-session-direct.c (revision 6042) -+++ gdm-2.21.9/daemon/gdm-session-direct.c (working copy) -@@ -59,6 +59,10 @@ - #define GDM_SESSION_DBUS_INTERFACE "org.gnome.DisplayManager.Session" - #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel" - -+#ifndef GDM_SESSION_DEFAULT_PATH -+#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" -+#endif -+ - struct _GdmSessionDirectPrivate - { - /* per open scope */ -@@ -1927,9 +1931,14 @@ setup_session_environment (GdmSessionDir - session->priv->user_x11_authority_file); - } - -+ /* FIXME: We do this here and in the session worker. We should consolidate -+ * somehow. -+ */ - gdm_session_direct_set_environment_variable (session, - "PATH", -- "/bin:/usr/bin:" BINDIR); -+ strcmp (BINDIR, "/usr/bin") == 0? -+ GDM_SESSION_DEFAULT_PATH : -+ BINDIR ":" GDM_SESSION_DEFAULT_PATH); - - } - diff --git a/gdm.spec b/gdm.spec index 6bbb808..3093ac3 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.10 -Release: 0.2008.03.18.3%{?dist} +Release: 0.2008.03.26.1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -76,7 +76,6 @@ BuildRequires: gnome-panel-devel Requires: audit-libs >= %{libauditver} -Patch0: gdm-2.21.9-fix-default-path.patch Patch99: gdm-2.21.8-fedora-logo.patch %package user-switch-applet @@ -97,8 +96,6 @@ multiple simulanteous logged in users. %prep %setup -q -%patch0 -p1 -b .fix-default-path - %patch99 -p1 -b .fedora-logo %build @@ -107,6 +104,7 @@ cp -f %{SOURCE2} data/gdm-autologin cp -f %{SOURCE3} utils/gdmsetup-pam %configure --with-pam-prefix=%{_sysconfdir} \ + --enable-profiling \ --enable-console-helper \ --disable-scrollkeeper \ --with-console-kit \ @@ -292,6 +290,10 @@ fi %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Wed Mar 26 2008 Ray Strode - 1:2.21.10-0.2008.03.26.1 +- Update to snapshot +- Turn on profiling + * Fri Mar 21 2008 Matthias Clasen - 1:2.21.10-0.2008.03.18.3 - Don't require a theme we don't use diff --git a/sources b/sources index 11e44d2..38e2fe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9f161e3c4e1a99845a25c774e6fe751 gdm-2.21.10.tar.gz +c34f287727d8888d7c6b06701a255b60 gdm-2.21.10.tar.gz