From 0c1109091e483ea5b1804b7494fce9c1a1efd0f4 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Sep 15 2019 11:40:59 +0000
Subject: Decouple xrdp from xorgxrdp, causing repeated installation issues in RHEL.


---

diff --git a/README.Fedora b/README.Fedora
index 8ce52b1..e88fdf1 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -28,6 +28,10 @@ to run, put the following into /etc/X11/Xwrapper.config:
 
 allowed_users = anybody
 
+Note that xorgxrdp is not installed and configured by default. Each build
+depends on specific binary version of Xorg, which tends to create very strict
+installation dependencies that can be an inconvenience in EPEL.
+
 SELinux
 =======
 
diff --git a/xrdp-0.9.11-xrdp-ini.patch b/xrdp-0.9.11-xrdp-ini.patch
new file mode 100644
index 0000000..469f4d1
--- /dev/null
+++ b/xrdp-0.9.11-xrdp-ini.patch
@@ -0,0 +1,66 @@
+diff -ruN xrdp-0.9.11-v/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
+--- xrdp-0.9.11-v/xrdp/xrdp.ini	2019-08-20 01:41:37.000000000 +1000
++++ xrdp-0.9.11/xrdp/xrdp.ini	2019-09-15 21:30:19.352135681 +1000
+@@ -178,14 +178,14 @@
+ ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
+ ; Startup command-line parameters for the display server are configured
+ ; in sesman.ini. See and configure also sesman.ini.
+-[Xorg]
+-name=Xorg
+-lib=libxup.so
+-username=ask
+-password=ask
+-ip=127.0.0.1
+-port=-1
+-code=20
++#[Xorg]
++#name=Xorg
++#lib=libxup.so
++#username=ask
++#password=ask
++#ip=127.0.0.1
++#port=-1
++#code=20
+ 
+ [Xvnc]
+ name=Xvnc
+@@ -197,25 +197,25 @@
+ #xserverbpp=24
+ #delay_ms=2000
+ 
+-[vnc-any]
+-name=vnc-any
+-lib=libvnc.so
+-ip=ask
+-port=ask5900
+-username=na
+-password=ask
++#[vnc-any]
++#name=vnc-any
++#lib=libvnc.so
++#ip=ask
++#port=ask5900
++#username=na
++#password=ask
+ #pamusername=asksame
+ #pampassword=asksame
+ #pamsessionmng=127.0.0.1
+ #delay_ms=2000
+ 
+-[neutrinordp-any]
+-name=neutrinordp-any
+-lib=libxrdpneutrinordp.so
+-ip=ask
+-port=ask3389
+-username=ask
+-password=ask
++#[neutrinordp-any]
++#name=neutrinordp-any
++#lib=libxrdpneutrinordp.so
++#ip=ask
++#port=ask3389
++#username=ask
++#password=ask
+ 
+ ; You can override the common channel settings for each session type
+ #channel.rdpdr=true
diff --git a/xrdp-0.9.9-xrdp-ini.patch b/xrdp-0.9.9-xrdp-ini.patch
deleted file mode 100644
index 2e3edf6..0000000
--- a/xrdp-0.9.9-xrdp-ini.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ruN xrdp-0.9.9-v/xrdp/xrdp.ini xrdp-0.9.9/xrdp/xrdp.ini
---- xrdp-0.9.9-v/xrdp/xrdp.ini	2018-12-25 15:49:32.000000000 +1100
-+++ xrdp-0.9.9/xrdp/xrdp.ini	2019-01-11 19:29:37.622677165 +1100
-@@ -153,15 +153,6 @@
- ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
- ; Startup command-line parameters for the display server are configured
- ; in sesman.ini. See and configure also sesman.ini.
--[Xorg]
--name=Xorg
--lib=libxup.so
--username=ask
--password=ask
--ip=127.0.0.1
--port=-1
--code=20
--
- [Xvnc]
- name=Xvnc
- lib=libvnc.so
-@@ -172,25 +163,34 @@
- #xserverbpp=24
- #delay_ms=2000
- 
--[vnc-any]
--name=vnc-any
--lib=libvnc.so
--ip=ask
--port=ask5900
--username=na
-+[Xorg]
-+name=Xorg
-+lib=libxup.so
-+username=ask
- password=ask
-+ip=127.0.0.1
-+port=-1
-+code=20
-+
-+#[vnc-any]
-+#name=vnc-any
-+#lib=libvnc.so
-+#ip=ask
-+#port=ask5900
-+#username=na
-+#password=ask
- #pamusername=asksame
- #pampassword=asksame
- #pamsessionmng=127.0.0.1
- #delay_ms=2000
- 
--[neutrinordp-any]
--name=neutrinordp-any
--lib=libxrdpneutrinordp.so
--ip=ask
--port=ask3389
--username=ask
--password=ask
-+#[neutrinordp-any]
-+#name=neutrinordp-any
-+#lib=libxrdpneutrinordp.so
-+#ip=ask
-+#port=ask3389
-+#username=ask
-+#password=ask
- 
- ; You can override the common channel settings for each session type
- #channel.rdpdr=true
diff --git a/xrdp.spec b/xrdp.spec
index f271393..bd5e384 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Epoch:     1
 Version:   0.9.11
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   ASL 2.0
 URL:       http://www.xrdp.org/
 Source0:   https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
@@ -24,7 +24,7 @@ Source4:   openssl.conf
 Source5:   README.Fedora
 Source6:   xrdp.te
 Patch0:    xrdp-0.9.9-sesman.patch
-Patch1:    xrdp-0.9.9-xrdp-ini.patch
+Patch1:    xrdp-0.9.11-xrdp-ini.patch
 Patch2:    xrdp-0.9.4-service.patch
 Patch3:    xrdp-0.9.2-setpriv.patch
 Patch4:    xrdp-0.9.10-scripts-libexec.patch
@@ -46,9 +46,8 @@ BuildRequires: checkpolicy, selinux-policy-devel
 BuildRequires: %{_hardlink}
 
 # tigervnc-server-minimal provides Xvnc (default for now)
+# xorgxrdp is another back end, depends on specific Xorg binary, omit
 Requires: tigervnc-server-minimal
-# xorgxrdp is another back end (small, so require it too)
-Requires: xorgxrdp
 Requires: xorg-x11-xinit
 Requires: util-linux
 Requires: %{name}-selinux = %{epoch}:%{version}-%{release}
@@ -267,6 +266,9 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Sun Sep 15 2019 Bojan Smojver <bojan@rexurive.com> - 1:0.9.11-3
+- Decouple xrdp from xorgxrdp, causing repeated installation issues in RHEL.
+
 * Tue Aug 27 2019 Bojan Smojver <bojan@rexurive.com> - 1:0.9.11-2
 - Increment release for rebuild in F31.