11-env-fix-1.patch & 12-env-fix-2.patch: From upstream, fix various environnement...
authorJulien Lavergne <julien.lavergne@gmail.com>
Sun, 23 May 2010 10:02:04 +0000 (12:02 +0200)
committerJulien Lavergne <julien.lavergne@gmail.com>
Sun, 23 May 2010 10:02:04 +0000 (12:02 +0200)
debian/changelog
debian/patches/11-env-fix-1.patch [new file with mode: 0644]
debian/patches/12-env-fix-2.patch [new file with mode: 0644]
debian/patches/series

index 75df1a7..4b2aaa9 100644 (file)
@@ -18,6 +18,8 @@ lxdm (0.2.0-3) UNRELEASED; urgency=low
   * debian/patches/
    - 10-selinux-fix.patch: From upstream, various fixes, including SElinux
      support.
+   - 11-env-fix-1.patch & 12-env-fix-2.patch: From upstream, fix various
+     environnement settings.
    - 15-path-replace.patch : don't let lxdm replace PATH. (LP: #524761)
    - 17-follow-symlink.patch: Follow symlink instead of saving the
      configuration file on a symlink.
diff --git a/debian/patches/11-env-fix-1.patch b/debian/patches/11-env-fix-1.patch
new file mode 100644 (file)
index 0000000..655c9b3
--- /dev/null
@@ -0,0 +1,44 @@
+From 08bc773ed867bd65c8b36f16795193afebe4a77e Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Tue, 11 May 2010 21:27:21 +0800
+Subject: [PATCH] fix some env set bug
+
+---
+ src/lxdm.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index 6065e95..e34b20b 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -342,7 +342,7 @@ void create_server_auth(void)
+         mkdir("/var/run/lxdm",0700);
+         authfile = g_strdup("/var/run/lxdm/lxdm.auth");
+     }
+-    setenv("XAUTHORITY",authfile,0);
++    setenv("XAUTHORITY",authfile,1);
+     remove(authfile);
+ #if HAVE_LIBXAU
+     FILE *fp=fopen(authfile,"wb");
+@@ -721,7 +721,7 @@ void startx(void)
+     char **args;
+     if(!getenv("DISPLAY"))
+-        putenv("DISPLAY=:0");
++        setenv("DISPLAY",":0",1);
+ #ifndef DISABLE_XAUTH
+     create_server_auth();
+@@ -1070,9 +1070,6 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang)
+     if(alloc_lang)
+         g_free(lang);
+     child_watch=g_child_watch_add(pid, on_session_stop, 0);
+-
+-    printf("xserver %d\n",server_watch);
+-    printf("session %d\n",child_watch);
+ }
+ void lxdm_do_reboot(void)
+-- 
+1.6.3
+
diff --git a/debian/patches/12-env-fix-2.patch b/debian/patches/12-env-fix-2.patch
new file mode 100644 (file)
index 0000000..9fc7a27
--- /dev/null
@@ -0,0 +1,25 @@
+From 3cf91b090c7ba78eefc2e530e9ea50ac6c6dbd2c Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Tue, 11 May 2010 21:48:50 +0800
+Subject: [PATCH] fix left env bug
+
+---
+ src/greeter.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/greeter.c b/src/greeter.c
+index 761082e..21e31d4 100644
+--- a/src/greeter.c
++++ b/src/greeter.c
+@@ -754,7 +754,7 @@ int main(int arc, char *arg[])
+     p=gtk_settings_get_default();
+     if(p)
+     {
+-        putenv("GTK_IM_MODULE=gtk-im-context-simple");
++        setenv("GTK_IM_MODULE","gtk-im-context-simple",1);
+         gtk_settings_set_string_property(p,"gtk-im-module","gtk-im-context-simple",0);
+         gtk_settings_set_long_property(p,"gtk-show-input-method-menu",0,0);
+     }
+-- 
+1.6.3
+
index 8e616b2..24c27c6 100644 (file)
@@ -1,5 +1,7 @@
 #stderr_stdout_to_log.patch 
 lxdm.conf_greeter_path_fix.patch
 10-selinux-fix.patch
+11-env-fix-1.patch
+12-env-fix-2.patch
 15-path-replace.patch
 17-follow-symlink.patch