| 1 |
philantrop 07/11/03 22:58:19 |
| 2 |
|
| 3 |
Added: ksmserver-3.5.8-gdm_interop_197133.patch |
| 4 |
digest-ksmserver-3.5.8-r1 |
| 5 |
Log: |
| 6 |
Added an upstream patch to fix GDM interoperability. Fixes bug 197133. Thanks to pauldv for providing a patch, too. |
| 7 |
(Portage version: 2.1.3.16) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ksmserver-3.5.8-gdm_interop_197133.patch |
| 16 |
=================================================================== |
| 17 |
--- branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2006/10/31 11:38:26 600659 |
| 18 |
+++ branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2007/11/01 22:10:25 731815 |
| 19 |
@@ -65,21 +65,28 @@ |
| 20 |
if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) |
| 21 |
return; |
| 22 |
sa.sun_family = AF_UNIX; |
| 23 |
- if (DMType == GDM) |
| 24 |
- strcpy( sa.sun_path, "/tmp/.gdm_socket" ); |
| 25 |
- else { |
| 26 |
+ if (DMType == GDM) { |
| 27 |
+ strcpy( sa.sun_path, "/var/run/gdm_socket" ); |
| 28 |
+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { |
| 29 |
+ strcpy( sa.sun_path, "/tmp/.gdm_socket" ); |
| 30 |
+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { |
| 31 |
+ ::close( fd ); |
| 32 |
+ fd = -1; |
| 33 |
+ break; |
| 34 |
+ } |
| 35 |
+ } |
| 36 |
+ GDMAuthenticate(); |
| 37 |
+ } else { |
| 38 |
if ((ptr = strchr( dpy, ':' ))) |
| 39 |
ptr = strchr( ptr, '.' ); |
| 40 |
snprintf( sa.sun_path, sizeof(sa.sun_path), |
| 41 |
"%s/dmctl-%.*s/socket", |
| 42 |
- ctl, ptr ? ptr - dpy : 512, dpy ); |
| 43 |
- } |
| 44 |
- if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { |
| 45 |
- ::close( fd ); |
| 46 |
- fd = -1; |
| 47 |
+ ctl, ptr ? int(ptr - dpy) : 512, dpy ); |
| 48 |
+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { |
| 49 |
+ ::close( fd ); |
| 50 |
+ fd = -1; |
| 51 |
+ } |
| 52 |
} |
| 53 |
- if (DMType == GDM) |
| 54 |
- GDMAuthenticate(); |
| 55 |
break; |
| 56 |
case OldKDM: |
| 57 |
{ |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1 |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1?rev=1.1&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1?rev=1.1&content-type=text/plain |
| 65 |
|
| 66 |
Index: digest-ksmserver-3.5.8-r1 |
| 67 |
=================================================================== |
| 68 |
MD5 9a0c6a4983427e41226dee8d0ce23369 kdebase-3.5-patchset-07.tar.bz2 22868 |
| 69 |
RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b kdebase-3.5-patchset-07.tar.bz2 22868 |
| 70 |
SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b kdebase-3.5-patchset-07.tar.bz2 22868 |
| 71 |
MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172 |
| 72 |
RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172 |
| 73 |
SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172 |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
-- |
| 78 |
gentoo-commits@g.o mailing list |
Archives