Use xorgxrdp by default
- Make xrdp depend on xorgxrdp, not on tigervnc-server-minimal - Make Xorg backend default - Call /usr/libexec/Xorg directly to avoid permission checks
This commit is contained in:
Pavel Roskin
parent
2d35ec095a
commit
d3c649536b
@ -1,6 +1,6 @@
|
|||||||
diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini
|
diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini
|
||||||
--- xrdp-0.9.1/sesman/sesman.ini 2016-12-22 09:02:47.000000000 -0800
|
--- xrdp-0.9.1/sesman/sesman.ini 2016-12-22 09:02:47.000000000 -0800
|
||||||
+++ xrdp-0.9.1.sesman/sesman/sesman.ini 2016-12-26 00:59:43.698228315 -0800
|
+++ xrdp-0.9.1.sesman/sesman/sesman.ini 2017-03-09 15:45:53.303938439 -0800
|
||||||
@@ -3,7 +3,7 @@
|
@@ -3,7 +3,7 @@
|
||||||
ListenPort=3350
|
ListenPort=3350
|
||||||
EnableUserWindowManager=true
|
EnableUserWindowManager=true
|
||||||
@ -10,3 +10,12 @@ diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini
|
|||||||
|
|
||||||
[Security]
|
[Security]
|
||||||
AllowRootLogin=true
|
AllowRootLogin=true
|
||||||
|
@@ -78,7 +78,7 @@
|
||||||
|
param=96
|
||||||
|
|
||||||
|
[Xorg]
|
||||||
|
-param=Xorg
|
||||||
|
+param=/usr/libexec/Xorg
|
||||||
|
param=-config
|
||||||
|
param=xrdp/xorg.conf
|
||||||
|
param=-noreset
|
||||||
|
|||||||
@ -1,45 +1,26 @@
|
|||||||
diff -ur xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
|
diff -urN 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/xrdp.ini 2016-12-22 09:02:47.000000000 -0800
|
||||||
+++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini 2017-01-23 23:28:19.194963530 -0800
|
+++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini 2017-03-09 15:47:04.828968234 -0800
|
||||||
@@ -147,15 +147,15 @@
|
@@ -147,16 +147,6 @@
|
||||||
; Session types
|
; Session types
|
||||||
;
|
;
|
||||||
|
|
||||||
-[X11rdp]
|
-[X11rdp]
|
||||||
-name=X11rdp
|
-name=X11rdp
|
||||||
-lib=libxup.so
|
-lib=libxup.so
|
||||||
+[Xvnc]
|
-username=ask
|
||||||
+name=Xvnc
|
-password=ask
|
||||||
+lib=libvnc.so
|
-ip=127.0.0.1
|
||||||
username=ask
|
-port=-1
|
||||||
password=ask
|
|
||||||
ip=127.0.0.1
|
|
||||||
port=-1
|
|
||||||
-xserverbpp=24
|
-xserverbpp=24
|
||||||
-code=10
|
-code=10
|
||||||
+#xserverbpp=24
|
-
|
||||||
+#delay_ms=2000
|
|
||||||
|
|
||||||
[Xorg]
|
[Xorg]
|
||||||
name=Xorg
|
name=Xorg
|
||||||
@@ -166,59 +166,53 @@
|
lib=libxup.so
|
||||||
port=-1
|
@@ -176,49 +166,53 @@
|
||||||
code=20
|
#xserverbpp=24
|
||||||
|
#delay_ms=2000
|
||||||
-[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]
|
-[console]
|
||||||
-name=console
|
-name=console
|
||||||
@ -47,7 +28,16 @@ diff -ur xrdp-0.9.1/xrdp/xrdp.ini xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini
|
|||||||
-ip=127.0.0.1
|
-ip=127.0.0.1
|
||||||
-port=5900
|
-port=5900
|
||||||
-username=na
|
-username=na
|
||||||
-password=ask
|
+[X11rdp]
|
||||||
|
+name=X11rdp
|
||||||
|
+lib=libxup.so
|
||||||
|
+username=ask
|
||||||
|
password=ask
|
||||||
|
+ip=127.0.0.1
|
||||||
|
+port=-1
|
||||||
|
+xserverbpp=24
|
||||||
|
+code=10
|
||||||
|
+
|
||||||
+#[console]
|
+#[console]
|
||||||
+#name=console
|
+#name=console
|
||||||
+#lib=libvnc.so
|
+#lib=libvnc.so
|
||||||
|
|||||||
13
xrdp.spec
13
xrdp.spec
@ -4,7 +4,7 @@ Summary: Open source remote desktop protocol (RDP) server
|
|||||||
Name: xrdp
|
Name: xrdp
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.9.1
|
Version: 0.9.1
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
URL: http://www.xrdp.org/
|
URL: http://www.xrdp.org/
|
||||||
@ -29,8 +29,10 @@ BuildRequires: pkgconfig(pixman-1)
|
|||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
|
|
||||||
|
|
||||||
#vnc-server provides Xvnc (tigervnc-server in fedora)
|
# xorgxrdp is the default backend
|
||||||
Requires: tigervnc-server-minimal
|
Requires: xorgxrdp
|
||||||
|
Requires: /usr/libexec/Xorg
|
||||||
|
|
||||||
|
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(post): systemd-sysv
|
Requires(post): systemd-sysv
|
||||||
@ -183,6 +185,11 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || :
|
|||||||
%{_libdir}/pkgconfig/xrdp.pc
|
%{_libdir}/pkgconfig/xrdp.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 09 2017 Pavel Roskin <plroskin@gmail.com> - 1:0.9.1-6
|
||||||
|
- Make xrdp depend on xorgxrdp, not on tigervnc-server-minimal
|
||||||
|
- Make Xorg backend default
|
||||||
|
- Call /usr/libexec/Xorg directly to avoid permission checks
|
||||||
|
|
||||||
* Tue Feb 21 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-5
|
* Tue Feb 21 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-5
|
||||||
- Require openssl in posttrans phase
|
- Require openssl in posttrans phase
|
||||||
- Move conditional restart to posttrans phase
|
- Move conditional restart to posttrans phase
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user