Fix bug #281442, wrong DESKTOP_SESSION set if ${HOME}/.dmrc is empty and autologin enabled. Thanks to Fabio Erculiani <lxnay@sabayonlinux.org> for this work. Clean up old revision

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 52 insertions, 14 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 0582b5428f98..a53c34171233 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.301 2009/07/26 22:10:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.302 2009/08/24 22:54:11 mrpouet Exp $
+
+*gdm-2.20.10-r2 (24 Aug 2009)
+
+  24 Aug 2009; Romain Perier <mrpouet@gentoo.org>
+  -gdm-2.20.10-r1.ebuild, +gdm-2.20.10-r2.ebuild,
+  +files/gdm-2.20.10-desktop-session-dmrc-autologin.patch:
+  Fix bug #281442, wrong DESKTOP_SESSION set if ${HOME}/.dmrc is empty and
+  autologin enabled. Thanks to Fabio Erculiani <lxnay@sabayonlinux.org> for
+  this work. Clean up old revision.
 
   26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> files/50-ssh-agent,
   -gdm-2.20.10.ebuild:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d34974d7bd0f..632f66555ca1 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140
 AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 AUX gdm-2.20.10-custom-session.patch 1105 RMD160 2d300e076dea63a08935ef6c8f3cac6f4909f6c2 SHA1 fdf3b5f24626ebe52502d0d0b31d9bccfff6689b SHA256 58d09e131375f993e46088078993953ea2fedc87ed9deafbfa35eb7f4e731e67
+AUX gdm-2.20.10-desktop-session-dmrc-autologin.patch 873 RMD160 41cba29b927036b784048978fb00ff31feecf39c SHA1 86b4822e546e7d2ebb6f22c427afaf5dde701045 SHA256 57f8e88acaf45b0cb84d80bb672dddf8e71a5152e9bff8216ff76d15b1e7dfcf
 AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 RMD160 cc84a57a53e0f8ab8688173f96869c6563054b98 SHA1 d15d3187df74570831b6b4a9c125ff9ee218fd72 SHA256 59b0150159776a200c6041290f672f367b4a56f8adc5218d74a271a376c7cfe1
 AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d
 AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce
@@ -18,16 +16,9 @@ DIST gdm-2.26-gentoo-patches.tar.bz2 4175 RMD160 356cd339b733e41c504bf2c951a322d
 DIST gdm-2.26.1.tar.bz2 2526832 RMD160 abba568b616d5837f6aeedf3d2759a349df66c9e SHA1 7c0b665c1235b903b58e5bfff8678e435529ff6c SHA256 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
-EBUILD gdm-2.20.10-r1.ebuild 6520 RMD160 bec05c9d8cab66c48376aa52f22c5a4d0d9e0f41 SHA1 9be06f4e2fbd6e80053b07bc45e545a3ef5915db SHA256 5d223c1e62ad080b2db17f0c2bc0cd6fec9c2945ad71be042de1ca18bdd01b82
+EBUILD gdm-2.20.10-r2.ebuild 6728 RMD160 d1fb7d72f15931ba621ea0442afa97295cb4cf0b SHA1 fb2261f2302f1447b8c14905de52283fbecb8eae SHA256 7e1216fbd711e8e70e4bccfeebd3716538fd5b85c79d37c6ecae90de26e65cc9
 EBUILD gdm-2.20.3.ebuild 5462 RMD160 01aaa98ab94e130959e550282e4353727d972caa SHA1 7dbff1038ee6f984f2fbf705bf810a73561ea09b SHA256 1ad90379beebf205f16d2d5cc449e60a968e0854c438cd84413175a836accd87
 EBUILD gdm-2.20.9-r1.ebuild 6363 RMD160 3b4160a5ae31f902f8d13afab3ad7d00e19ef1ca SHA1 d5170509fdadb527f1e5001cdc7e8f8067ec5aad SHA256 0c761ebb646018875b2a326d578f1895cc48477bbb900b55034751478b236ec4
 EBUILD gdm-2.26.1.ebuild 5658 RMD160 af5494ccebe8a176f12d59f201eda2df97bbe152 SHA1 34d31f15cb2ebcf374234918554db028424dd715 SHA256 b226d4231faee7063773054bb53c45d44ce0fdad1e3da893bae7e70eb6d41ca4
-MISC ChangeLog 41023 RMD160 c50a21968ad9e90021c6199572a64513ff1f1d91 SHA1 6368de8dee7911355ea4818221fe57844ee2e795 SHA256 7877bd3eeff3ae1e82c3de036fce37c015a0b91ff680740a7e6b824aeba9ecdb
+MISC ChangeLog 41405 RMD160 476a52ed709d0dce7a5562896ba4392e485a95d3 SHA1 dee7f0f6b464ad49e30066c54e1066e3027444f7 SHA256 c27a57c29eb9c7f101dea61331f4dc4e49f8f5bce685d55f5ec0cb5e54c2f62a
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkps1G8ACgkQ1fmVwcYIWAZKWQCfbmgEHIjJXC2WXOsSV4GrZ7J1
-TcwAnihZcsYjmu1n0UhjAk/Sj8R2s1GO
-=zqGv
------END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch b/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch
new file mode 100644
index 000000000000..1c7b674382f5
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch
@@ -0,0 +1,34 @@
+Author: Fabio Erculiani <lxnay@sabayonlinux.org>
+Date: Fri, 08 Aug 2009 09:19 +0000
+Subject: Fix DESTOP_SESSION when dmrc is empty and autologin enabled.
+
+---
+ daemon/slave.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/slave.c b/daemon/slave.c
+index b52774d..ced9567 100644
+--- a/daemon/slave.c
++++ b/daemon/slave.c
+@@ -4638,10 +4638,6 @@ gdm_slave_session_start (void)
+ 		language = g_strdup (usrlang);
+ 	}
+ 
+-	tmp = gdm_strip_extension (session, ".desktop");
+-	g_free (session);
+-	session = tmp;
+-
+ 	if (ve_string_empty (session)) {
+ 		g_free (session);
+ 		session = find_a_session ();
+@@ -4651,6 +4647,10 @@ gdm_slave_session_start (void)
+ 		}
+ 	}
+ 
++	tmp = gdm_strip_extension (session, ".desktop");
++	g_free (session);
++	session = tmp;
++
+ 	if G_LIKELY (ve_string_empty (language)) {
+ 		g_free (language);
+ 		language = NULL;
diff --git a/gnome-base/gdm/gdm-2.20.10-r1.ebuild b/gnome-base/gdm/gdm-2.20.10-r2.ebuild
index 66b887cc632c..6b78be8d2b07 100644
--- a/gnome-base/gdm/gdm-2.20.10-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.20.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild,v 1.2 2009/06/17 22:56:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r2.ebuild,v 1.1 2009/08/24 22:54:11 mrpouet Exp $
 
 EAPI="2"
 
@@ -114,6 +114,10 @@ src_prepare() {
 
 	# ssh-agent handling must be done at xinitrc.d, bug #220603
 	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
+
+	# Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or
+	# does not contain any relevant data and autologin enabled, bug #281442
+	epatch "${FILESDIR}/${P}-desktop-session-dmrc-autologin.patch"
 }
 
 src_install() {