Fix bug #271023, Do not crash when xsmp->priv->conn is NULL for a given GsmXsmpClient, when SMS connection dies. Import from 2.28 dev cycle, new revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 123 insertions, 1 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index e70b17536102..64661006144e 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.241 2009/10/24 16:40:56 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.242 2009/10/29 11:11:19 mrpouet Exp $
+
+*gnome-session-2.26.2-r1 (29 Oct 2009)
+
+  29 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  +gnome-session-2.26.2-r1.ebuild,
+  +files/gnome-session-2.26.2-xsmp-stop-throw-error.patch:
+  Fix bug #271023, Do not crash when xsmp->priv->conn is NULL for a given
+  GsmXsmpClient, when SMS connection dies. Import from 2.28 dev cycle, new
+  revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> gnome-session-2.26.2.ebuild:
   ppc stable #281427
diff --git a/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch b/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch
new file mode 100644
index 000000000000..165be019fc59
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch
@@ -0,0 +1,27 @@
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Wed, 28 Oct 2009 17:20:04 +0100
+Subject: Avoid a SIGSEGV in xsmp_stop() when the SmsConn object is NULL, in this case we must throw an GError (imported from 2.28 dev cycle)
+
+When xsmp->priv->conn is NULL in xsmp_end_session() for a given GsmXsmpClient object, it implies
+that this same object in xsmp_stop() will also have a NULL SmsConn field.
+
+---
+ gnome-session/gsm-xsmp-client.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+--- a/gnome-session/gsm-xsmp-client.c
++++ b/gnome-session/gsm-xsmp-client.c
+@@ -702,6 +702,13 @@ xsmp_stop (GsmClient *client,
+ 
+         g_debug ("GsmXSMPClient: xsmp_stop ('%s')", xsmp->priv->description);
+ 
++        if (xsmp->priv->conn == NULL) {
++                g_set_error (error,
++                             GSM_CLIENT_ERROR,
++                             GSM_CLIENT_ERROR_NOT_REGISTERED,
++                             "Client is not registered");
++                return FALSE;
++        }
+         SmsDie (xsmp->priv->conn);
+ 
+         return TRUE;
diff --git a/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild
new file mode 100644
index 000000000000..37c2c7b43bde
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild,v 1.1 2009/10/29 11:11:19 mrpouet Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-2.26.2-session-saving-button.patch.bz2
+	branding? ( mirror://gentoo/gentoo-splash.png )"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="branding doc ipv6 policykit elibc_FreeBSD"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.11.1
+	>=gnome-base/libglade-2.3.6
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.9
+	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-apps/xdpyinfo"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )"
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		--docdir=/usr/share/doc/${PF}
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)
+		$(use_enable policykit polkit)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Fix shutdown/restart capability, upstream bug #549150
+	epatch "${FILESDIR}/${PN}-2.26.2-shutdown.patch"
+
+	# Add "session saving" button back, upstream bug #575544
+	epatch "${WORKDIR}/${PN}-2.26.2-session-saving-button.patch"
+
+	# Do not crash when xsmp->priv->conn is NULL for a given GsmXsmpClient,
+	# when SMS connection dies, bug #271023, import from 2.28 dev cycle.
+	epatch "${FILESDIR}/${P}-xsmp-stop-throw-error.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+	# Our own splash for world domination
+	if use branding ; then
+		insinto /usr/share/pixmaps/splash/
+		doins "${DISTDIR}/gentoo-splash.png" || die "doins failed"
+	fi
+}