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

Package-Manager: portage-2.1.3.16

5 files changed, 94 insertions, 15 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/Manifest b/kde-base/ksmserver/Manifest
index 10b8a26af132..0d14cbe63397 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ksmserver-3.5.8-gdm_interop_197133.patch 1224 RMD160 800d158dab30766f09ebe929ec1bde52c9337951 SHA1 c1501c1a388a215f1700a47ada4f15371b350e16 SHA256 705f8b644d0d25f4692818dd3c6c0919505e5af33424f34913bf7052ac055e11
+MD5 ffcc079ca0260ef80784d9f36aea46cd files/ksmserver-3.5.8-gdm_interop_197133.patch 1224
+RMD160 800d158dab30766f09ebe929ec1bde52c9337951 files/ksmserver-3.5.8-gdm_interop_197133.patch 1224
+SHA256 705f8b644d0d25f4692818dd3c6c0919505e5af33424f34913bf7052ac055e11 files/ksmserver-3.5.8-gdm_interop_197133.patch 1224
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5-patchset-07.tar.bz2 22868 RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b SHA1 df1a89279ed08839e8a9e9f64e01223139d52675 SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
@@ -19,14 +20,18 @@ EBUILD ksmserver-3.5.7.ebuild 618 RMD160 d61adec42c4d5714126af2f8deefc4fa87ce3d9
 MD5 d01e6b808de2a514eebb03e51c3d8117 ksmserver-3.5.7.ebuild 618
 RMD160 d61adec42c4d5714126af2f8deefc4fa87ce3d93 ksmserver-3.5.7.ebuild 618
 SHA256 ffb5c7efdcc6db35d11358b3b3e7f09563852413ba2bf72613bdba7f46c25f6a ksmserver-3.5.7.ebuild 618
+EBUILD ksmserver-3.5.8-r1.ebuild 784 RMD160 96fd11f8091da1253dedcb709e0a8b3687f7aa45 SHA1 76c097ccb26cc352c6f15d4484382b7aff6b8919 SHA256 b61fb84ce351569c2b542854d2a9b769a82d45b7a904ac9c88503f904138dc01
+MD5 982587e2197c886da9a50a3497a5d4b8 ksmserver-3.5.8-r1.ebuild 784
+RMD160 96fd11f8091da1253dedcb709e0a8b3687f7aa45 ksmserver-3.5.8-r1.ebuild 784
+SHA256 b61fb84ce351569c2b542854d2a9b769a82d45b7a904ac9c88503f904138dc01 ksmserver-3.5.8-r1.ebuild 784
 EBUILD ksmserver-3.5.8.ebuild 728 RMD160 44876527674766d68974bf916eac7463205d42f3 SHA1 d77085544c422be3dc453c4a4c813c8c2657ee6a SHA256 689dfe97afbf9eb8afa0b4e044d5629013bc3c07aab432412b0c47b2cfd26f8d
 MD5 8fc5998a82beaa70b026ca7772cb9b73 ksmserver-3.5.8.ebuild 728
 RMD160 44876527674766d68974bf916eac7463205d42f3 ksmserver-3.5.8.ebuild 728
 SHA256 689dfe97afbf9eb8afa0b4e044d5629013bc3c07aab432412b0c47b2cfd26f8d ksmserver-3.5.8.ebuild 728
-MISC ChangeLog 8514 RMD160 b03407cb519bf6b839e2e2dea587393dbc67aca0 SHA1 da9748b99c19d74d6383376c4ee33054f363877b SHA256 3dea75218841ca9d3bec4846ce65b93f8b2f4c98231a0da2a3ee5da98e811e6f
-MD5 436a745d594f3a507a67690c265c6060 ChangeLog 8514
-RMD160 b03407cb519bf6b839e2e2dea587393dbc67aca0 ChangeLog 8514
-SHA256 3dea75218841ca9d3bec4846ce65b93f8b2f4c98231a0da2a3ee5da98e811e6f ChangeLog 8514
+MISC ChangeLog 8804 RMD160 e9ef7aaba9a869e7a762ca2a1a0e97201959e229 SHA1 382d296fed50e51e7922805c26ea370024caa5f6 SHA256 7792664baa0c7343a5bc1f7edd9d4680ef4306c4ca268d6f83439f6fd36de7f4
+MD5 3073c5f9ef10afee4e01bf4dc5f807f0 ChangeLog 8804
+RMD160 e9ef7aaba9a869e7a762ca2a1a0e97201959e229 ChangeLog 8804
+SHA256 7792664baa0c7343a5bc1f7edd9d4680ef4306c4ca268d6f83439f6fd36de7f4 ChangeLog 8804
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -43,10 +48,6 @@ SHA256 11bbf15ec8cbbe44d698d6ff90385926a37599e75f18e55e21bc994709398ec6 files/di
 MD5 eec70bee63e8bcfd158f0f2bf824f107 files/digest-ksmserver-3.5.8 521
 RMD160 f22d489d2345df03e9226ad9a8580f5b7e8f7efe files/digest-ksmserver-3.5.8 521
 SHA256 e9eb779c6a6a1a3ed40fc91cad12baadc95c34ec483c25806ffb3145db6f09da files/digest-ksmserver-3.5.8 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGfFqCkvF58q80IkRAo7QAJ0aiwHuA8Lpq0oIUOP4rC0gEUlr+gCeLPim
-auY6nYgjijcYDTxNrNGc5yI=
-=dW3i
------END PGP SIGNATURE-----
+MD5 eec70bee63e8bcfd158f0f2bf824f107 files/digest-ksmserver-3.5.8-r1 521
+RMD160 f22d489d2345df03e9226ad9a8580f5b7e8f7efe files/digest-ksmserver-3.5.8-r1 521
+SHA256 e9eb779c6a6a1a3ed40fc91cad12baadc95c34ec483c25806ffb3145db6f09da files/digest-ksmserver-3.5.8-r1 521
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"