Added an upstream patch to fix GDM interoperability. Fixes bug 197133. Thanks to pauldv for providing a patch, too.

(Portage version: 2.1.3.16)

4 files changed, 79 insertions, 1 deletions

diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index 213277f85699..53ae97228e45 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.68 2007/10/20 12:15:14 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.69 2007/11/03 22:58:17 philantrop Exp $
+
+*ksmserver-3.5.8-r1 (03 Nov 2007)
+
+  03 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/ksmserver-3.5.8-gdm_interop_197133.patch, +ksmserver-3.5.8-r1.ebuild:
+  Added an upstream patch to fix GDM interoperability. Fixes bug 197133.
+  Thanks to pauldv for providing a patch, too.
 
   20 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
   ksmserver-3.5.8.ebuild:
diff --git a/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1 b/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1
new file mode 100644
index 000000000000..f0fb6455d46c
--- /dev/null
+++ b/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1
@@ -0,0 +1,6 @@
+MD5 9a0c6a4983427e41226dee8d0ce23369 kdebase-3.5-patchset-07.tar.bz2 22868
+RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b kdebase-3.5-patchset-07.tar.bz2 22868
+SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b kdebase-3.5-patchset-07.tar.bz2 22868
+MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172
+RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172
+SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172
diff --git a/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch b/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch
new file mode 100644
index 000000000000..5fdc9af1a2e0
--- /dev/null
+++ b/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch
@@ -0,0 +1,41 @@
+--- branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp	2006/10/31 11:38:26	600659
++++ branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp	2007/11/01 22:10:25	731815
+@@ -65,21 +65,28 @@
+ 		if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
+ 			return;
+ 		sa.sun_family = AF_UNIX;
+-		if (DMType == GDM)
+-			strcpy( sa.sun_path, "/tmp/.gdm_socket" );
+-		else {
++		if (DMType == GDM) {
++			strcpy( sa.sun_path, "/var/run/gdm_socket" );
++			if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
++				strcpy( sa.sun_path, "/tmp/.gdm_socket" );
++				if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
++					::close( fd );
++					fd = -1;
++					break;
++				}
++			}
++			GDMAuthenticate();
++		} else {
+ 			if ((ptr = strchr( dpy, ':' )))
+ 				ptr = strchr( ptr, '.' );
+ 			snprintf( sa.sun_path, sizeof(sa.sun_path),
+ 			          "%s/dmctl-%.*s/socket",
+-			          ctl, ptr ? ptr - dpy : 512, dpy );
+-		}
+-		if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
+-			::close( fd );
+-			fd = -1;
++			          ctl, ptr ? int(ptr - dpy) : 512, dpy );
++			if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
++				::close( fd );
++				fd = -1;
++			}
+ 		}
+-		if (DMType == GDM)
+-			GDMAuthenticate();
+ 		break;
+ 	case OldKDM:
+ 		{
diff --git a/kde-base/ksmserver/ksmserver-3.5.8-r1.ebuild b/kde-base/ksmserver/ksmserver-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..4362cbf8ee60
--- /dev/null
+++ b/kde-base/ksmserver/ksmserver-3.5.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-3.5.8-r1.ebuild,v 1.1 2007/11/03 22:58:17 philantrop Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-07.tar.bz2"
+
+DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility"
+
+KMEXTRACTONLY="kdm/kfrontend/themer/"
+KMCOMPILEONLY="kdmlib/"
+KMNODOCS=true
+
+EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff
+				ksmserver-3.5.8-suspend_configure.diff"
+
+PATCHES="${FILESDIR}/${P}-gdm_interop_197133.patch"