[debian-edu-commits] debian-edu/pkg-team/ 109/159: partially fix /var/run/xrdp creation (XXX not correct!)

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit b45ca86a1ee1f334272a8c6b9b3593b795eea145
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 26 23:46:03 2015 +0200

    partially fix /var/run/xrdp creation (XXX not correct!)
    
    cf. http://www.freedesktop.org/software/systemd/man/systemd.exec.html#RuntimeDirectory=
---
 changelog            |  6 ++++++
 copyright            |  2 +-
 patches/systemd.diff | 12 ++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 8d37ed8..39ebc81 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~git20150826-1~alpha3) teckids; urgency=medium
+
+  * Foreground xrdp-sesman as well; partially unbreak /var/run/xrdp
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 26 Aug 2015 23:44:47 +0200
+
 xrdp (0.9.0~git20150826-1~alpha2) teckids; urgency=medium
 
   * Fix “service xrdp start” to not hang forever as we foreground xrdp
diff --git a/copyright b/copyright
index 7c57216..0b4289a 100644
--- a/copyright
+++ b/copyright
@@ -25,7 +25,7 @@ of said person’s immediate fault when using the work as intended.
 
 
 The systemd integration, as part of the packaging, is also covered
-by The MirOS Licence (see above), but done by:
+by The MirOS Licence (see above), but done (mostly) by:
 Copyright © 2015
 	Dominik George <dominik.george at teckids.org>
 
diff --git a/patches/systemd.diff b/patches/systemd.diff
index c6f4ef5..b8370cd 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -2,7 +2,7 @@
 
 --- a/instfiles/xrdp-sesman.service
 +++ b/instfiles/xrdp-sesman.service
-@@ -1,14 +1,15 @@
+@@ -1,14 +1,17 @@
  [Unit]
 -Description=xrdp session manager
 -After=syslog.target network.target
@@ -19,14 +19,16 @@
 +Type=simple
 +PIDFile=/var/run/xrdp/xrdp-sesman.pid
 +EnvironmentFile=/etc/default/xrdp
-+RuntimeDirectory=/run/xrdp
++RuntimeDirectory=xrdp
++RuntimeDirectoryMode=0775
++Group=xrdp
 +ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
  ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
  
  [Install]
 --- a/instfiles/xrdp.service
 +++ b/instfiles/xrdp.service
-@@ -1,12 +1,13 @@
+@@ -1,12 +1,15 @@
  [Unit]
 -Description=xrdp daemon
 +Description=Remote Desktop Protocol (RDP) server
@@ -41,7 +43,9 @@
 +Type=simple
 +PIDFile=/var/run/xrdp/xrdp.pid
 +EnvironmentFile=/etc/default/xrdp
-+RuntimeDirectory=/run/xrdp
++RuntimeDirectory=xrdp
++RuntimeDirectoryMode=0775
++Group=xrdp
  ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
  ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git