Fix xrdp.ini patch.

This commit is contained in:
Bojan Smojver 2019-01-11 19:31:06 +11:00
parent 7384cc1e10
commit d6af8928b2
3 changed files with 69 additions and 121 deletions

View File

@ -1,120 +0,0 @@
diff -ruN xrdp-0.9.5-v/xrdp/xrdp.ini xrdp-0.9.5/xrdp/xrdp.ini
--- xrdp-0.9.5-v/xrdp/xrdp.ini 2017-12-28 01:30:25.000000000 +1100
+++ xrdp-0.9.5/xrdp/xrdp.ini 2017-12-30 18:14:09.862621310 +1100
@@ -153,72 +153,72 @@
; 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
+[Xvnc]
+name=Xvnc
+lib=libvnc.so
username=ask
password=ask
ip=127.0.0.1
port=-1
-code=20
+#xserverbpp=24
+#delay_ms=2000
-[X11rdp]
-name=X11rdp
+[Xorg]
+name=Xorg
lib=libxup.so
username=ask
password=ask
ip=127.0.0.1
port=-1
-xserverbpp=24
-code=10
+code=20
-[Xvnc]
-name=Xvnc
-lib=libvnc.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
+#[X11rdp]
+#name=X11rdp
+#lib=libxup.so
+#username=ask
+#password=ask
+#ip=127.0.0.1
+#port=-1
#xserverbpp=24
-#delay_ms=2000
+#code=10
-[console]
-name=console
-lib=libvnc.so
-ip=127.0.0.1
-port=5900
-username=na
-password=ask
+#[console]
+#name=console
+#lib=libvnc.so
+#ip=127.0.0.1
+#port=5900
+#username=na
+#password=ask
#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
-[sesman-any]
-name=sesman-any
-lib=libvnc.so
-ip=ask
-port=-1
-username=ask
-password=ask
+#[sesman-any]
+#name=sesman-any
+#lib=libvnc.so
+#ip=ask
+#port=-1
+#username=ask
+#password=ask
#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

67
xrdp-0.9.9-xrdp-ini.patch Normal file
View File

@ -0,0 +1,67 @@
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

View File

@ -19,7 +19,7 @@ Source4: openssl.conf
Source5: README.Fedora
Source6: xrdp.te
Patch0: xrdp-0.9.9-sesman.patch
Patch1: xrdp-0.9.5-xrdp-ini.patch
Patch1: xrdp-0.9.9-xrdp-ini.patch
Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.7-scripts-libexec.patch
@ -268,6 +268,7 @@ fi
* Fri Jan 11 2019 Bojan Smojver <bojan@rexurive.com> - 1:0.9.9-1
- Bump up to 0.9.9
- Fix sesman.ini patch
- Fix xrdp.ini patch
* Wed Nov 14 2018 Bojan Smojver <bojan@rexurive.com> - 1:0.9.8-2
- Make main and selinux packages codependent