[systemd/f16] logind: move X11 socket

[Michal Schmidt]

commit 5bbea84736cea7e23955bae8b09f17a52487735f
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Mar 1 10:42:20 2012 +0100

    logind: move X11 socket

 0154-logind-move-X11-socket.patch |   40 +++++++++++++++++++++++++++++++++++++
 systemd.spec                      |    6 ++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/0154-logind-move-X11-socket.patch b/0154-logind-move-X11-socket.patch
new file mode 100644
index 0000000..adcff62
--- /dev/null
+++ b/0154-logind-move-X11-socket.patch
@@ -0,0 +1,40 @@
+From 51f829b44f56505f70a6cda544b67510a24abad6 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Tue, 17 Jan 2012 14:03:00 +0100
+Subject: [PATCH] logind: move X11 socket (cherry picked from commit
+ fc3c1c6e091ea16ad5600b145201ec535bbb5d7c)
+
+---
+ src/logind-session.c |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/logind-session.c b/src/logind-session.c
+index 58c70c3..555e952 100644
+--- a/src/logind-session.c
++++ b/src/logind-session.c
+@@ -380,15 +380,13 @@ static int session_link_x11_socket(Session *s) {
+                 return -ENOENT;
+         }
+ 
+-        t = strappend(s->user->runtime_path, "/X11/display");
++        t = strappend(s->user->runtime_path, "/X11-display");
+         if (!t) {
+                 log_error("Out of memory");
+                 free(f);
+                 return -ENOMEM;
+         }
+ 
+-        mkdir_parents(t, 0755);
+-
+         if (link(f, t) < 0) {
+                 if (errno == EEXIST) {
+                         unlink(t);
+@@ -641,7 +639,7 @@ static int session_unlink_x11_socket(Session *s) {
+ 
+         s->user->display = NULL;
+ 
+-        t = strappend(s->user->runtime_path, "/X11/display");
++        t = strappend(s->user->runtime_path, "/X11-display");
+         if (!t) {
+                 log_error("Out of memory");
+                 return -ENOMEM;
diff --git a/systemd.spec b/systemd.spec
index 7dde987..0ad488d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -2,7 +2,7 @@ Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Version:        37
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
 Summary:        A System and Service Manager
@@ -205,6 +205,7 @@ Patch0150:      0150-util-fix-handling-of-empty-files-in-read_one_line_fi.patch
 Patch0151:      0151-Fix-broken-Git-repository-URLs.patch
 Patch0152:      0152-timedate-don-t-fail-if-NTP-is-not-installed.patch
 Patch0153:      0153-namespace-temporaily-reset-umask-when-creating-priva.patch
+Patch0154:      0154-logind-move-X11-socket.patch
 
 # For sysvinit tools
 Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
@@ -526,6 +527,9 @@ fi
 %{_bindir}/systemd-sysv-convert
 
 %changelog
+* Thu Mar 01 2012 Michal Schmidt <mschmidt at redhat.com> - 37-15
+- logind: move X11 socket
+
 * Mon Feb 27 2012 Michal Schmidt <mschmidt at redhat.com> - 37-14
 - A few fixes from upstream:
   - PrivateTmp permissions (#790522)