[Pkg-xfce-commits] r5864 - in goodies/trunk/lightdm/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sun Jul 17 05:00:40 UTC 2011
Author: mrpouit-guest
Date: 2011-07-17 17:00:39 +0000 (Sun, 17 Jul 2011)
New Revision: 5864
Removed:
goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch
Modified:
goodies/trunk/lightdm/debian/changelog
goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
goodies/trunk/lightdm/debian/patches/02_default-config.patch
goodies/trunk/lightdm/debian/patches/05_enforce-min-vt.patch
goodies/trunk/lightdm/debian/patches/series
Log:
update patches for new upstream release
Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-07-17 13:57:30 UTC (rev 5863)
+++ goodies/trunk/lightdm/debian/changelog 2011-07-17 17:00:39 UTC (rev 5864)
@@ -1,4 +1,4 @@
-lightdm (0.4.2-1) UNRELEASED; urgency=low
+lightdm (0.4.4-1) UNRELEASED; urgency=low
* Initial release. closes: #615591
Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-07-17 13:57:30 UTC (rev 5863)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-07-17 17:00:39 UTC (rev 5864)
@@ -1,48 +1,17 @@
Author: Yves-Alexis Perez <corsac at debian.org>
+Author: Lionel Le Folgoc <mrpouit at gmail.com>
Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
-Description: Add a default PATH environment variable
-diff --git a/src/session.c b/src/session.c
+Description: Fix default PATH environment variable
+diff --git a/src/display.c b/src/display.c
index 61267f0..c4b1971 100644
---- a/src/session.c
-+++ b/src/session.c
-@@ -104,6 +104,7 @@ session_start (Session *session, gboolean create_pipe)
- //gint session_stdin, session_stdout, session_stderr;
- gboolean result;
- GError *error = NULL;
-+ gchar *env_path = NULL;
+--- a/src/display.c
++++ b/src/display.c
+@@ -591,7 +591,7 @@ start_user_session (Display *display, co
- g_return_val_if_fail (session != NULL, FALSE);
- g_return_val_if_fail (session->priv->user != NULL, FALSE);
-@@ -114,6 +115,18 @@ session_start (Session *session, gboolean create_pipe)
- child_process_set_env (CHILD_PROCESS (session), "HOME", user_get_home_directory (session->priv->user));
- child_process_set_env (CHILD_PROCESS (session), "SHELL", user_get_shell (session->priv->user));
-
-+ env_path = g_hash_table_lookup (session->priv->env, "PATH");
-+ if (env_path == NULL)
-+ {
-+ if (user_get_uid (session->priv->user) == 0)
-+ env_path = g_strdup (DEF_ROOTPATH);
-+ else
-+ env_path = g_strdup (DEF_PATH);
-+
-+ child_process_set_env(CHILD_PROCESS (session), "PATH", env_path);
-+ }
-+ g_free(env_path);
-+
- if (session->priv->authorization)
- {
- g_debug ("Writing session authority to %s", session->priv->authorization_path);
-diff --git a/src/session.h b/src/session.h
-index 7383e74..e819932 100644
---- a/src/session.h
-+++ b/src/session.h
-@@ -21,6 +21,9 @@ G_BEGIN_DECLS
- #define SESSION_TYPE (session_get_type())
- #define SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SESSION_TYPE, Session))
-
-+#define DEF_PATH "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
-+#define DEF_ROOTPATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-+
- typedef struct SessionPrivate SessionPrivate;
-
- typedef struct
+ session_set_user (display->priv->user_session, user);
+ session_set_command (display->priv->user_session, session_command);
+- child_process_set_env (CHILD_PROCESS (display->priv->user_session), "PATH", "/usr/local/bin:/usr/bin:/bin");
++ child_process_set_env (CHILD_PROCESS (display->priv->user_session), "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
+ child_process_set_env (CHILD_PROCESS (display->priv->user_session), "USER", user_get_name (user));
+ child_process_set_env (CHILD_PROCESS (display->priv->user_session), "USERNAME", user_get_name (user)); // FIXME: Is this required?
+ child_process_set_env (CHILD_PROCESS (display->priv->user_session), "HOME", user_get_home_directory (user));
Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-07-17 13:57:30 UTC (rev 5863)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-07-17 17:00:39 UTC (rev 5864)
@@ -13,27 +13,19 @@
===================================================================
--- lightdm-0.4.0.orig/data/lightdm.conf 2011-06-27 18:43:17.805498735 +0200
+++ lightdm-0.4.0/data/lightdm.conf 2011-06-27 18:43:43.112623806 +0200
-@@ -18,7 +18,7 @@
- [LightDM]
- #xserver=default-xserver
- #default-xserver-command=
--#authorization-directory=/var/cache/lightdm/authority
-+authorization-directory=/var/cache/lightdm/authority
- #log-directory=/var/log/lightdm
- #theme-directory=/usr/share/lightdm/themes
- #theme-engine-directory=/usr/libexec/lightdm
-@@ -26,8 +26,8 @@
+@@ -28,9 +28,9 @@
#cache-directory=/var/cache/lightdm
#xsessions-directory=/usr/share/xsessions
#default-xsession=
-#session-wrapper=/etc/X11/Xsession
--#minimum-vt=7
+session-wrapper=/etc/X11/Xsession
+ #minimum-display-number=0
+-#minimum-vt=7
+minimum-vt=7
+ #user-authority-in-system-dir=false
seats=seat-0
- #
-@@ -78,7 +78,7 @@
+@@ -82,7 +82,7 @@ seats=seat-0
# hidden-shells = Shells that indicate a user cannot login
#
[UserManager]
@@ -42,11 +34,11 @@
#minimum-uid=500
#hidden-users=nobody nobody4 noaccess
#hidden-shells=/bin/false /usr/sbin/nologin
-@@ -108,6 +108,6 @@
+@@ -112,6 +112,6 @@ seats=seat-0
# it can be a word and the first 7 characters are used as the key.
#
[xdmcp]
--#enabled=true
+-#enabled=false
+enabled=false
#port=177
#key=0x0123456789ABCD
Deleted: goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch 2011-07-17 13:57:30 UTC (rev 5863)
+++ goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch 2011-07-17 17:00:39 UTC (rev 5864)
@@ -1,51 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: put xauthority file in user homedir
-Bug: https://bugs.launchpad.net/lightdm/+bug/685194
-Index: lightdm-0.4.0/src/display-manager.c
-===================================================================
---- lightdm-0.4.0.orig/src/display-manager.c 2011-06-17 04:04:18.000000000 +0200
-+++ lightdm-0.4.0/src/display-manager.c 2011-06-17 08:38:37.778236133 +0200
-@@ -137,14 +137,6 @@
- }
-
- authorization = xserver_get_authorization (display_get_xserver (display));
-- if (authorization)
-- {
-- gchar *path;
--
-- path = get_authorization_path (manager);
-- session_set_authorization (session, authorization, path);
-- g_free (path);
-- }
-
- if (is_greeter)
- {
-@@ -152,11 +144,28 @@
- filename = g_strdup_printf ("%s-greeter.log", xserver_get_address (display_get_xserver (display)));
- log_filename = g_build_filename (manager->priv->log_dir, filename, NULL);
- g_free (filename);
-+ if (authorization)
-+ {
-+ gchar *path;
-+
-+ path = get_authorization_path (manager);
-+ session_set_authorization (session, authorization, path);
-+ g_free (path);
-+ }
- }
- else
- {
- // FIXME: Copy old error file
- log_filename = g_build_filename (user_get_home_directory (session_get_user (session)), ".xsession-errors", NULL);
-+ if (authorization)
-+ {
-+ gchar *path;
-+
-+ path = g_build_filename(user_get_home_directory (session_get_user (session)), ".Xauthority", NULL);
-+ session_set_authorization (session, authorization, path);
-+ g_free (path);
-+ }
-+
- }
-
- if (log_filename)
Modified: goodies/trunk/lightdm/debian/patches/05_enforce-min-vt.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_enforce-min-vt.patch 2011-07-17 13:57:30 UTC (rev 5863)
+++ goodies/trunk/lightdm/debian/patches/05_enforce-min-vt.patch 2011-07-17 17:00:39 UTC (rev 5864)
@@ -1,4 +1,5 @@
Author: Yves-Alexis Perez <corsac at debian.org>
+Author: Lionel Le Folgoc <mrpouit at gmail.com>
Description: enforce minimum vt configuration
Even if plymouth is running and has an active vt, when minimum-vt is defined
enforce it.
@@ -26,42 +27,3 @@
return active;
#else
return -1;
-@@ -74,7 +79,7 @@ vt_is_used (gint number)
- }
-
- gint
--vt_get_unused (void)
-+vt_get_min (void)
- {
- gint number;
-
-@@ -82,6 +87,16 @@ vt_get_unused (void)
- if (number < 1)
- number = 1;
-
-+ return number;
-+}
-+
-+gint
-+vt_get_unused (void)
-+{
-+ gint number;
-+
-+ number = vt_get_min ();
-+
- while (vt_is_used (number))
- number++;
-
-diff --git a/src/vt.h b/src/vt.h
-index 31766f3..4396f1a 100644
---- a/src/vt.h
-+++ b/src/vt.h
-@@ -18,6 +18,8 @@ gint vt_get_active (void);
-
- gint vt_get_unused (void);
-
-+gint vt_get_min (void);
-+
- void vt_release (gint number);
-
- void vt_set_active (gint number);
Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-07-17 13:57:30 UTC (rev 5863)
+++ goodies/trunk/lightdm/debian/patches/series 2011-07-17 17:00:39 UTC (rev 5864)
@@ -1,5 +1,4 @@
01_set-default-path.patch
02_default-config.patch
03_quit-plymouth.patch
-04_fix_xauthority-path.patch
05_enforce-min-vt.patch
More information about the Pkg-xfce-commits
mailing list