From 5135db1c5db5f8d297b02b389f0a473472f71dca Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Jul 17 2015 01:24:24 +0000
Subject: Merge branch 'master' into f22


---

diff --git a/xrdp-0.9.0-service.patch b/xrdp-0.9.0-service.patch
new file mode 100644
index 0000000..1ac11ca
--- /dev/null
+++ b/xrdp-0.9.0-service.patch
@@ -0,0 +1,42 @@
+diff -ruN xrdp-0.9.0-vanilla/instfiles/xrdp.service xrdp-0.9.0/instfiles/xrdp.service
+--- xrdp-0.9.0-vanilla/instfiles/xrdp.service	2015-07-15 07:17:49.000000000 +1000
++++ xrdp-0.9.0/instfiles/xrdp.service	2015-07-17 10:19:19.000000000 +1000
+@@ -1,14 +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
+-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
+-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
++ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff -ruN xrdp-0.9.0-vanilla/instfiles/xrdp-sesman.service xrdp-0.9.0/instfiles/xrdp-sesman.service
+--- xrdp-0.9.0-vanilla/instfiles/xrdp-sesman.service	2015-07-15 07:17:49.000000000 +1000
++++ xrdp-0.9.0/instfiles/xrdp-sesman.service	2015-07-17 10:19:46.000000000 +1000
+@@ -1,14 +1,13 @@
+ [Unit]
+ Description=xrdp session manager
+-After=syslog.target network.target
++BindsTo=xrdp.service
++Wants=network-online.target nss-lookup.target nss-user-lookup.target
++After=network-online.target nss-lookup.target nss-user-lookup.target
+ StopWhenUnneeded=true
+ 
+ [Service]
+-Type=forking
+-PIDFile=/var/run/xrdp-sesman.pid
+ EnvironmentFile=/etc/sysconfig/xrdp
+-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
+-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
++ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/xrdp-0.9.0-sesman.patch b/xrdp-0.9.0-sesman.patch
new file mode 100644
index 0000000..8b13c8f
--- /dev/null
+++ b/xrdp-0.9.0-sesman.patch
@@ -0,0 +1,52 @@
+diff -ruN xrdp-0.9.0-vanilla/sesman/sesman.ini xrdp-0.9.0/sesman/sesman.ini
+--- xrdp-0.9.0-vanilla/sesman/sesman.ini	2015-07-15 07:17:49.000000000 +1000
++++ xrdp-0.9.0/sesman/sesman.ini	2015-07-17 10:25:13.449024694 +1000
+@@ -3,7 +3,7 @@
+ ListenPort=3350
+ EnableUserWindowManager=1
+ UserWindowManager=startwm.sh
+-DefaultWindowManager=startwm.sh
++DefaultWindowManager=startwm-bash.sh
+ 
+ [Security]
+ AllowRootLogin=1
+@@ -64,19 +64,17 @@
+ 
+ [X11rdp]
+ param1=-bs
+-param2=-ac
+-param3=-nolisten
+-param4=tcp
+-param5=-uds
++param2=-nolisten
++param3=tcp
++param4=-uds
+ 
+ [Xvnc]
+ param1=-bs
+-param2=-ac
+-param3=-nolisten
+-param4=tcp
+-param5=-localhost
+-param6=-dpi
+-param7=96
++param2=-nolisten
++param3=tcp
++param4=-localhost
++param5=-dpi
++param6=96
+ 
+ [Xorg]
+ param1=-config
+@@ -84,9 +82,8 @@
+ param3=-logfile
+ param4=/dev/null
+ param5=-noreset
+-param6=-ac
+-param7=-nolisten
+-param8=tcp
++param6=-nolisten
++param7=tcp
+ 
+ [Chansrv]
+ # drive redirection, defaults to xrdp_client if not set
diff --git a/xrdp.spec b/xrdp.spec
index 7a68426..13efdf1 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -2,7 +2,7 @@ Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Epoch:     1
 Version:   0.9.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -11,6 +11,9 @@ Source1:   xrdp-sesman.pamd
 Source2:   xrdp.sysconfig
 Source3:   xrdp.logrotate
 
+Patch0:    xrdp-0.9.0-sesman.patch
+Patch1:    xrdp-0.9.0-service.patch
+
 BuildRequires: pam-devel
 BuildRequires: openssl-devel
 BuildRequires: autoconf
@@ -38,6 +41,11 @@ terminal server / remote desktop clients.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .sesman
+%patch1 -p1 -b .service
+
+# never hardcode rpaths
+%{__sed} -i -e 's/^\(AM_CONDITIONAL(GOT_PREFIX,\).*$/\1 false)/' configure.ac
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp1\]/,$d' xrdp/xrdp.ini
@@ -178,7 +186,11 @@ fi
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
-* Tue Jul 15 2015 Dan Horák <dan[at]danny.cz> - 1:0.9.0-2
+* Fri Jul 17 2015 Bojan Smojver <bojan@rexursive.com> - 1:0.9.0-3
+- service files fixes and dependencies
+- sesman default configuration
+
+* Wed Jul 15 2015 Dan Horák <dan[at]danny.cz> - 1:0.9.0-2
 - install epoch back to keep clean upgrade path
 
 * Tue Jul 14 2015 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.9.0-1