backport NULL pointer dereference patch from git

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 62 insertions, 4 deletions

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index edc00e2fe212..31c0952f489d 100644
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for lxde-base/lxdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.8 2011/08/02 16:39:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.9 2011/08/02 16:44:29 lxnay Exp $
+
+  02 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> lxdm-0.4.1.ebuild,
+  +files/lxdm-0.4.1-git-fix-null-pointer-deref.patch:
+  backport NULL pointer dereference patch from git
 
   02 Aug 2011; Fabio Erculiani <lxnay@gentoo.org>
   -files/lxdm-0.4.0-pam_console-disable.patch,
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index ab1afc4b58e7..81d9383f86f8 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,12 +1,13 @@
 AUX lxdm-0.3.0-consolekit-disable.patch 272 RMD160 2f0a98002f85ca47b529cc9ae530b6907100b85b SHA1 810371ac3319c3ebcc39e420a2b64d00ee27210b SHA256 b23a338405f6d01a9a93e7afaaf95a91cb8e5f36d2b864d955f0dcc452f8680a
 AUX lxdm-0.3.0-pam_console-disable.patch 260 RMD160 fa8fb4bd2d0d57235924bb241688b491988fccb3 SHA1 820ef218b6f379bc63c8f24cd43e58fc75769004 SHA256 0e9dbcf422b8db8e559015fb7d50fa0c73006c2f5550f6832b2ba36e38b3c0e0
 AUX lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch 932 RMD160 752138f9d851080e9a8a31838c6ca95b0a0bf97b SHA1 d4e9525483494ab87a61d852c42e8186d0aeaf7e SHA256 d3ad21a7643b86706d5d7f4ec4cf09dbe9805e3eea95c4c035abbf5049ff0c10
+AUX lxdm-0.4.1-git-fix-null-pointer-deref.patch 1560 RMD160 d08dcf5f05df205649418ee932a05dcc94500a82 SHA1 67596f26225d36af8d165f31ca027a87d7fec799 SHA256 a33e3226c463bc445d7d27b11e34de8b09c7c1fdf44be8628d54334fd41b7ea3
 AUX lxdm-0.4.1-pam_console-disable.patch 344 RMD160 faa1026b361b4e5bf0b002651cb1bcf45f5f8800 SHA1 8169882a4bcdeeba34586d0fd5bd0dc3048556bc SHA256 51d1a0f0b5749e451e313df3bd3d08b3f5181f00eb01993973393c1b4dcd8ad2
 AUX xinitrc 1549 RMD160 f75ead6179a30f718019cc062c14f06dffc88369 SHA1 bdb6ae9f3bdcbc7c1fc893615fbdd3bbb1190d92 SHA256 59b2f69c3a5eba060b2eaae43fc871d9b014419e3b51c84af95cee10f429880c
 DIST lxdm-0.3.0.tar.gz 271373 RMD160 989868e611df4aafe817eaca399ca54155e3dc16 SHA1 a8bcf9e8dcda4203b846c09ee9d9d8c7e2374746 SHA256 19d167898299937c3b2787a0583f308e99e732fa1647fec60083edf812efa638
 DIST lxdm-0.4.1.tar.gz 296714 RMD160 cacb103b8ac90b3afa450e9dee3ec01ed0c69a12 SHA1 652886ac27ac01b24e7d13c3be3b1e582e2159cc SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08
 EBUILD lxdm-0.3.0-r1.ebuild 1314 RMD160 2b64fcd1108d941c2beafbb4d447bc3117b3deda SHA1 e533d98abd0ade2df7cf1dcbaacbf2d4caea6832 SHA256 82b63bcb28671761b43ab72869956e93b532c0d8726d3eb1d370f725f1f2877a
 EBUILD lxdm-0.3.0-r3.ebuild 1504 RMD160 d16106d0379a81f4558a2dc0524df83ede24710c SHA1 53176d1965d8480df11382f5cc2c7bf112658f50 SHA256 f12a450fa8009699e271b340033ec4f30b490990cf26040548670b0f9c568657
-EBUILD lxdm-0.4.1.ebuild 1390 RMD160 664d775a1b70532b9386c3c276bdd070e5c548dc SHA1 77f108059b1c45764abd621b3873ece913208ea8 SHA256 79d2db663a52e3134b8ea68835de681b1abfa72050104606fb8bf1f875893422
-MISC ChangeLog 1751 RMD160 191979dc44b8404d32e699c4601240cd0896697c SHA1 0d2816b7411ed956a8d546ef5e70806d33567f31 SHA256 b37e4a9a984e12ba444bdff2e87bc63bd413dca1c14d3abb3d140fc44a5f80a9
+EBUILD lxdm-0.4.1.ebuild 1503 RMD160 3c3bf18b6e6082c6a4403a3055a50758062d6f2f SHA1 6851a4314963ef30fa9dcf53cc9aba2609445c4f SHA256 c4f1f6f5ebfdc792dcf3b483615ee44f917e395124f09e992ef1914e7082799b
+MISC ChangeLog 1926 RMD160 094b9653d4df14d06d712f9c062b45165e6d9844 SHA1 0cb72507072fc8679ec7d4db3fbb9cc0c2c34319 SHA256 f2af467bfd9851253dad8ef8cf5b8d88de70cb7993a7b669f908b9a79d1c80b6
 MISC metadata.xml 307 RMD160 780146af5f44d5a94235167d9f27fa430e374101 SHA1 c018aecad3148053495b66d84c45f17bf7c5d5c6 SHA256 854f7a5d79f761b1a129a5f227d74854cd4a5e62827fe6022cddd8dfc2a4b264
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
new file mode 100644
index 000000000000..7abdbd470523
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.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/lxde-base/lxdm/lxdm-0.4.1.ebuild b/lxde-base/lxdm/lxdm-0.4.1.ebuild
index 11e7e467abe1..d03562c5d7d7 100644
--- a/lxde-base/lxdm/lxdm-0.4.1.ebuild
+++ b/lxde-base/lxdm/lxdm-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1.ebuild,v 1.1 2011/08/02 16:35:32 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1.ebuild,v 1.2 2011/08/02 16:44:29 lxnay Exp $
 
 EAPI="2"
 
@@ -40,6 +40,8 @@ src_configure() {
 src_prepare() {
 	# There is consolekit
 	epatch "${FILESDIR}/${P}-pam_console-disable.patch"
+	# Fix null pointer dereference, backported from git
+	epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch"
 
 	# this replaces the bootstrap/autogen script in most packages
 	eautoreconf