[kdebase-workspace/f16] kdm overwrites ~/.Xauthority with wrong SELinux context on logout (#567914, kde#242065)

[Rex Dieter]

commit 1ea1ef82c9f243d336424e6cc4cafb541f863919
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 3 14:45:37 2012 -0600

    kdm overwrites ~/.Xauthority with wrong SELinux context on logout (#567914,kde#242065)

 kde-workspace-4.7.95-kdm_xauth.patch |   16 ++++++++++++++++
 kdebase-workspace.spec               |   11 ++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.7.95-kdm_xauth.patch b/kde-workspace-4.7.95-kdm_xauth.patch
new file mode 100644
index 0000000..5c7a388
--- /dev/null
+++ b/kde-workspace-4.7.95-kdm_xauth.patch
@@ -0,0 +1,16 @@
+diff -up kde-workspace-4.7.95/kdm/backend/auth.c.selinux_wtf kde-workspace-4.7.95/kdm/backend/auth.c
+--- kde-workspace-4.7.95/kdm/backend/auth.c.selinux_wtf	2011-12-20 18:40:36.000000000 -0600
++++ kde-workspace-4.7.95/kdm/backend/auth.c	2012-01-03 14:33:38.931306044 -0600
+@@ -1292,6 +1292,12 @@ removeUserAuthorization(struct display *
+ 
+     if (!(auths = d->authorizations))
+         return;
++
++    /* given that the code below doesn't handle the forceUserAuthDir case, */
++    /* let's just bail out for now, see http://bugs.kde.org/242065         */
++    if ( d->forceUserAuthDir ) 
++        return;
++
+     debug("removeUserAuthorization\n");
+     startUserAuth(name, new_name, &old, &new);
+     if (new) {
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 19ec45a..7cdbb9f 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -78,6 +78,11 @@ Patch50: kdebase-workspace-4.6.80-kde#171685.patch
 # use /etc/login.defs to define a 'system' account instead of hard-coding 500 
 Patch52: kdebase-workspace-4.7.0-bz#732830-login.patch
 
+# kdm overwrites ~/.Xauthority with wrong SELinux context on logout
+# http://bugzilla.redhat.com/567914
+# http://bugs.kde.org/242065
+Patch53: kde-workspace-4.7.95-kdm_xauth.patch
+
 ## upstream patches
 Patch100: kdebase-workspace-4.7.5-batteryplasmoid.patch
 # http://bugs.kde.org/288802
@@ -387,6 +392,7 @@ Requires: akonadi
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
 %patch52 -p1 -b .bz#732830-login
+%patch53 -p1 -b .kdm_xauth
 
 # upstream patches
 %patch100 -p1 -b .batteryplasmoid
@@ -871,6 +877,9 @@ fi
 
 
 %changelog
+* Tue Jan 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-6
+- kdm overwrites ~/.Xauthority with wrong SELinux context on logout (#567914,kde#242065)
+
 * Wed Dec 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-5
 - -libs: move libkworkspace (versioned) dep here (from -devel)