From c90b0028bb5b66e9be3617d575de764b2bab2218 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Mon, 23 Jan 2017 23:34:41 -0800
Subject: [PATCH] Put Xvnc first, then Xorg and X11rdp, remove rdp-any

Until xorgxrdp package is ready and is a dependency of xrdp, Xvnc should
be first. Enable X11rdp, but put it to the end of the list. rdp-any is
beyond repair and has been deleted in git, so don't leave it even
commented out.
---
 xrdp-0.9.1-xrdp-ini.patch | 51 +++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/xrdp-0.9.1-xrdp-ini.patch b/xrdp-0.9.1-xrdp-ini.patch
index ec0bdb3..718b5c4 100644
--- a/xrdp-0.9.1-xrdp-ini.patch
+++ b/xrdp-0.9.1-xrdp-ini.patch
@@ -1,6 +1,6 @@
-diff -urN xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
+diff -ur xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
 --- xrdp-0.9.1/xrdp/xrdp.ini	2016-12-22 09:02:47.000000000 -0800
-+++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini	2016-12-26 01:22:04.941401741 -0800
++++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini	2017-01-23 23:28:19.194963530 -0800
 @@ -147,15 +147,15 @@
  ; Session types
  ;
@@ -8,27 +8,38 @@ diff -urN xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
 -[X11rdp]
 -name=X11rdp
 -lib=libxup.so
--username=ask
--password=ask
--ip=127.0.0.1
--port=-1
++[Xvnc]
++name=Xvnc
++lib=libvnc.so
+ username=ask
+ password=ask
+ ip=127.0.0.1
+ port=-1
 -xserverbpp=24
 -code=10
-+#[X11rdp]
-+#name=X11rdp
-+#lib=libxup.so
-+#username=ask
-+#password=ask
-+#ip=127.0.0.1
-+#port=-1
 +#xserverbpp=24
-+#code=10
++#delay_ms=2000
  
  [Xorg]
  name=Xorg
-@@ -176,49 +176,49 @@
- #xserverbpp=24
- #delay_ms=2000
+@@ -166,59 +166,53 @@
+ port=-1
+ code=20
+ 
+-[Xvnc]
+-name=Xvnc
+-lib=libvnc.so
++[X11rdp]
++name=X11rdp
++lib=libxup.so
+ username=ask
+ password=ask
+ ip=127.0.0.1
+ port=-1
+-#xserverbpp=24
+-#delay_ms=2000
++xserverbpp=24
++code=10
  
 -[console]
 -name=console
@@ -94,12 +105,6 @@ diff -urN xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
 -port=ask3389
 -username=ask
 -password=ask
-+#[rdp-any]
-+#name=rdp-any
-+#lib=librdp.so
-+#ip=ask
-+#port=ask3389
-+
 +#[neutrinordp-any]
 +#name=neutrinordp-any
 +#lib=libxrdpneutrinordp.so