From 66c205af73ecee4c3c78fe8e3ea70b786d3d92f8 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Sun, 22 Jan 2017 11:58:17 -0800
Subject: [PATCH] Restore patch for *.service files

Thanks to Bojan Smojver.
---
 xrdp-0.9.1-service.patch | 47 ++++++++++++++++++++++++++++++++++++++++
 xrdp.spec                |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 xrdp-0.9.1-service.patch

diff --git a/xrdp-0.9.1-service.patch b/xrdp-0.9.1-service.patch
new file mode 100644
index 0000000..23e6566
--- /dev/null
+++ b/xrdp-0.9.1-service.patch
@@ -0,0 +1,47 @@
+diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.service
+--- xrdp-0.9.1/instfiles/xrdp.service	2016-12-22 09:02:47.000000000 -0800
++++ xrdp-0.9.1.service/instfiles/xrdp.service	2017-01-19 23:35:06.000000000 -0800
+@@ -1,15 +1,11 @@
+ [Unit]
+ Description=xrdp daemon
+ Requires=xrdp-sesman.service
+-After=syslog.target network.target xrdp-sesman.service
++After=xrdp-sesman.service
+ 
+ [Service]
+-Type=forking
+-PIDFile=/var/run/xrdp.pid
+-EnvironmentFile=-/etc/sysconfig/xrdp
+-EnvironmentFile=-/etc/default/xrdp
+-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
+-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
++EnvironmentFile=/etc/sysconfig/xrdp
++ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/xrdp-sesman.service
+--- xrdp-0.9.1/instfiles/xrdp-sesman.service	2016-12-22 09:02:47.000000000 -0800
++++ xrdp-0.9.1.service/instfiles/xrdp-sesman.service	2017-01-22 11:39:23.000000000 -0800
+@@ -1,16 +1,13 @@
+ [Unit]
+ Description=xrdp session manager
+-After=syslog.target network.target
++Wants=network-online.target nss-lookup.target nss-user-lookup.target
++After=network-online.target nss-lookup.target nss-user-lookup.target
+ StopWhenUnneeded=true
+-BindTo=xrdp.service
++BindsTo=xrdp.service
+ 
+ [Service]
+-Type=forking
+-PIDFile=/var/run/xrdp-sesman.pid
+-EnvironmentFile=-/etc/sysconfig/xrdp
+-EnvironmentFile=-/etc/default/xrdp
+-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
+-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
++EnvironmentFile=/etc/sysconfig/xrdp
++ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/xrdp.spec b/xrdp.spec
index 59a332c..16aa804 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -12,6 +12,7 @@ Source2:   xrdp.sysconfig
 Source3:   xrdp.logrotate
 Patch0:    xrdp-0.9.1-sesman.patch
 Patch1:    xrdp-0.9.1-xrdp-ini.patch
+Patch2:    xrdp-0.9.1-service.patch
 
 Buildrequires: libX11-devel
 BuildRequires: libXfixes-devel