[pkg-remote-commits] [xrdp] 04/04: Split systemd service file patch into correct patches.

[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 a45858b23a7dbdc34aa3cf037308138da55adbb8
Author: Dominik George <nik at naturalnet.de>
Date:   Wed Jan 25 16:29:06 2017 +0100

    Split systemd service file patch into correct patches.
---
 debian/patches/sockpath.diff | 14 ++++++++++++++
 debian/patches/systemd.diff  | 11 +++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/debian/patches/sockpath.diff b/debian/patches/sockpath.diff
index 3fdf09e..1ea6ba0 100644
--- a/debian/patches/sockpath.diff
+++ b/debian/patches/sockpath.diff
@@ -248,3 +248,17 @@ Subject: change location of the socket path to something less racy
      s.sun_path[bytes - 1] = 0;
      bytes = sizeof(struct sockaddr_un);
  
+--- a/instfiles/xrdp.service
++++ b/instfiles/xrdp.service
+@@ -8,8 +8,11 @@ Type=forking
+ PIDFile=/var/run/xrdp.pid
+ EnvironmentFile=-/etc/sysconfig/xrdp
+ EnvironmentFile=-/etc/default/xrdp
++PermissionsStartOnly=true
++ExecStartPre=/bin/sh /usr/share/xrdp/socksetup
+ ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
+ ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
++ExecStopPost=/bin/rm -rf /var/run/xrdp/sockdir
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/debian/patches/systemd.diff b/debian/patches/systemd.diff
index ec75c02..13f0b21 100644
--- a/debian/patches/systemd.diff
+++ b/debian/patches/systemd.diff
@@ -22,7 +22,7 @@ Forwarded: https://github.com/neutrinolabs/xrdp/pull/646
  ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
 --- a/instfiles/xrdp.service
 +++ b/instfiles/xrdp.service
-@@ -1,15 +1,21 @@
+@@ -1,13 +1,16 @@
  [Unit]
  Description=xrdp daemon
 +Documentation=man:xrdp(8) man:xrdp.ini(5)
@@ -38,11 +38,6 @@ Forwarded: https://github.com/neutrinolabs/xrdp/pull/646
  EnvironmentFile=-/etc/default/xrdp
 +User=xrdp
 +Group=xrdp
-+PermissionsStartOnly=true
-+ExecStartPre=/bin/sh /usr/share/xrdp/socksetup
+ PermissionsStartOnly=true
+ ExecStartPre=/bin/sh /usr/share/xrdp/socksetup
  ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
- ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
-+ExecStopPost=/bin/rm -rf /var/run/xrdp/sockdir
- 
- [Install]
- WantedBy=multi-user.target

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