diff options
Diffstat (limited to 'system/lxdm/patches')
| -rw-r--r-- | system/lxdm/patches/lxdm-0.3.0-without_pam.diff | 14 | ||||
| -rw-r--r-- | system/lxdm/patches/null_pointer_dereference.patch | 51 | ||||
| -rw-r--r-- | system/lxdm/patches/remove_suse_from_Xsession.diff | 10 |
3 files changed, 63 insertions, 12 deletions
diff --git a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff index e9a8c5ae97..dacd16d770 100644 --- a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff +++ b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff @@ -1,18 +1,18 @@ -diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c ---- lxdm-0.3.0.orig//src/lxdm.c 2010-09-24 10:43:49.000000000 -0500 -+++ lxdm-0.3.0/src/lxdm.c 2010-10-10 23:01:24.711716765 -0500 -@@ -150,6 +150,7 @@ +diff -Naur lxdm-0.4.0.orig/src/lxdm.c lxdm-0.4.0/src/lxdm.c +--- lxdm-0.4.0.orig/src/lxdm.c 2011-07-13 14:00:34.000000000 +0200 ++++ lxdm-0.4.0/src/lxdm.c 2011-07-22 17:27:34.000000000 +0200 +@@ -153,6 +153,7 @@ while( waitpid(-1, 0, WNOHANG) > 0 ) ; } +/* Sorry, -ENOPAM here + #if HAVE_LIBPAM static void close_pam_session(pam_handle_t *pamh) { - int err; -@@ -159,6 +160,7 @@ - pam_end(pamh, err); +@@ -164,6 +165,7 @@ pamh = NULL; } + #endif +*/ static LXSession *lxsession_find_greeter(void) diff --git a/system/lxdm/patches/null_pointer_dereference.patch b/system/lxdm/patches/null_pointer_dereference.patch new file mode 100644 index 0000000000..7abdbd4705 --- /dev/null +++ b/system/lxdm/patches/null_pointer_dereference.patch @@ -0,0 +1,51 @@ +From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001 +From: Andrea Florio <andrea@opensuse.org> +Date: Fri, 29 Jul 2011 23:59:32 +0200 +Subject: [PATCH] fix null pointer dereference + +--- + src/config.c | 25 ++++++++++--------------- + 1 files changed, 10 insertions(+), 15 deletions(-) + +diff --git a/src/config.c b/src/config.c +index 3f92f7b..4603ab4 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename) + static void update_face_image(GtkWidget *w) + { + GdkPixbuf *pixbuf; +- char *path; +- path=g_build_filename(user->pw_dir,".face",NULL); +- if(access(path,R_OK)) +- { +- g_free(path); +- if(ui_nobody) +- pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); +- if(!pixbuf) +- pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), ++ char *path=g_build_filename(user->pw_dir,".face",NULL); ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); ++ g_free(path); ++ if(!pixbuf && ui_nobody) ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); ++ if(!pixbuf) ++ pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); +- } +- else ++ if(pixbuf) + { +- pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); +- g_free(path); ++ gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); ++ g_object_unref(pixbuf); + } +- gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); +- g_object_unref(pixbuf); + } + + static void set_face_file(const char *filename) +-- +1.7.0.1 + diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff index df1da70b83..475c5c75a9 100644 --- a/system/lxdm/patches/remove_suse_from_Xsession.diff +++ b/system/lxdm/patches/remove_suse_from_Xsession.diff @@ -1,10 +1,10 @@ -diff -Nur lxdm-0.3.0.orig//data/Xsession lxdm-0.3.0/data/Xsession ---- lxdm-0.3.0.orig//data/Xsession 2010-10-12 20:13:01.316302089 -0500 -+++ lxdm-0.3.0/data/Xsession 2010-10-12 20:12:40.989504750 -0500 -@@ -31,10 +31,6 @@ +diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession +--- lxdm-0.4.0.orig/data/Xsession 2011-03-17 16:35:47.000000000 +0100 ++++ lxdm-0.4.0/data/Xsession 2011-07-22 17:23:49.000000000 +0200 +@@ -27,10 +27,6 @@ elif [ -x /etc/X11/Xsession ]; then # mandriva, debian, ubuntu - exec /etc/X11/Xsession $LXSESSION + exec /etc/X11/Xsession "$LXSESSION" -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION |