From f5708ae118115a64880f2a11feeb13cbc647bd43 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Thu, 10 Aug 2017 10:42:06 +1000
Subject: [PATCH] Bump up to 0.9.3.

---
 .gitignore                                          |  1 +
 README.Fedora                                       | 11 +++++++++++
 sources                                             |  2 +-
 ...-0.9.2-service.patch => xrdp-0.9.3-service.patch |  8 ++++----
 xrdp.spec                                           | 13 +++++++++----
 5 files changed, 26 insertions(+), 9 deletions(-)
 rename xrdp-0.9.2-service.patch => xrdp-0.9.3-service.patch (87%)

diff --git a/.gitignore b/.gitignore
index 507c07c..0df20b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xrdp-cvs-03-17-2010.tar.gz
 /xrdp-0.9.0.tar.gz
 /xrdp-0.9.1.tar.gz
 /xrdp-0.9.2.tar.gz
+/xrdp-0.9.3.tar.gz
diff --git a/README.Fedora b/README.Fedora
index 8da3687..8ce52b1 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -53,3 +53,14 @@ param=-SendPrimary=0
 param=-SetPrimary=0
 
 Of course, cut and paste support will not work with these set.
+
+Runlevel
+========
+
+If the system is configured to boot into graphical target, you may experience
+problems with xrdp Gnome sessions. In order to avoid this, put the system into
+multi user target. Like this:
+
+systemctl set-default multi-user.target
+
+Then reboot.
diff --git a/sources b/sources
index 1fd2dd1..42fb178 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrdp-0.9.2.tar.gz) = 49626a75b0cf432436d3ac39a91d10224a264e8603523baf441e1f95f44c7cca02c0824ca48406aacfe1d9b2475abfc5703ce44254c95fd49382a57b62ee636e
+SHA512 (xrdp-0.9.3.tar.gz) = 8f7d2f8bb992e00c4c88441c504574c5de6592382a6c3139b5c9499b0b61795c740a4570e6aff912c79a67f4ee9b08ce190b07dcddbef8e9b8fc81ff07297690
diff --git a/xrdp-0.9.2-service.patch b/xrdp-0.9.3-service.patch
similarity index 87%
rename from xrdp-0.9.2-service.patch
rename to xrdp-0.9.3-service.patch
index bcda3f0..e64968d 100644
--- a/xrdp-0.9.2-service.patch
+++ b/xrdp-0.9.3-service.patch
@@ -13,8 +13,8 @@ diff -ur xrdp-0.9.1/instfiles/xrdp.service xrdp-0.9.1.service/instfiles/xrdp.ser
 -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
+-ExecStart=/usr/local/sbin/xrdp $XRDP_OPTIONS
+-ExecStop=/usr/local/sbin/xrdp $XRDP_OPTIONS --kill
 +EnvironmentFile=/etc/sysconfig/xrdp
 +ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
  
@@ -37,8 +37,8 @@ diff -ur xrdp-0.9.1/instfiles/xrdp-sesman.service xrdp-0.9.1.service/instfiles/x
 -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
+-ExecStart=/usr/local/sbin/xrdp-sesman $SESMAN_OPTIONS
+-ExecStop=/usr/local/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
 +EnvironmentFile=/etc/sysconfig/xrdp
 +ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
  
diff --git a/xrdp.spec b/xrdp.spec
index 45655c1..43279ca 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -6,8 +6,8 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Epoch:     1
-Version:   0.9.2
-Release:   14%{?dist}
+Version:   0.9.3
+Release:   1%{?dist}
 License:   ASL 2.0
 Group:     Applications/Internet
 URL:       http://www.xrdp.org/
@@ -20,7 +20,7 @@ Source5:   README.Fedora
 Source6:   xrdp.te
 Patch0:    xrdp-0.9.2-sesman.patch
 Patch1:    xrdp-0.9.2-xrdp-ini.patch
-Patch2:    xrdp-0.9.2-service.patch
+Patch2:    xrdp-0.9.3-service.patch
 Patch3:    xrdp-0.9.2-setpriv.patch
 Patch4:    xrdp-0.9.2-scripts-libexec.patch
 Patch5:    xrdp-0.9.2-split-line.patch
@@ -119,8 +119,9 @@ cd -
 #install 'bash -l' startwm script
 %{__install} -Dp -m 755 sesman/startwm-bash.sh %{buildroot}%{_libexecdir}/xrdp/startwm-bash.sh
 
-#move startwm script to libexec
+#move startwm and reconnectwm scripts to libexec
 %{__mv} -f %{buildroot}%{_sysconfdir}/xrdp/startwm.sh %{buildroot}%{_libexecdir}/xrdp/
+%{__mv} -f %{buildroot}%{_sysconfdir}/xrdp/reconnectwm.sh %{buildroot}%{_libexecdir}/xrdp/
 
 # SELinux policy module
 for selinuxvariant in %{selinux_variants}
@@ -204,6 +205,7 @@ fi
 %{_sysconfdir}/xrdp/openssl.conf
 %{_sysconfdir}/xrdp/xrdp_keyboard.ini
 %{_libexecdir}/xrdp/startwm*.sh
+%{_libexecdir}/xrdp/reconnectwm.sh
 %{_bindir}/xrdp-genkeymap
 %{_bindir}/xrdp-sesadmin
 %{_bindir}/xrdp-keygen
@@ -257,6 +259,9 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Thu Aug 10 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.3-1
+- Bump up to 0.9.3
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild