diff --git a/xrdp-0.9.1-sesman.patch b/xrdp-0.9.1-sesman.patch index 17974bf..79936e6 100644 --- a/xrdp-0.9.1-sesman.patch +++ b/xrdp-0.9.1-sesman.patch @@ -1,6 +1,6 @@ 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/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 @@ ListenPort=3350 EnableUserWindowManager=true @@ -10,3 +10,12 @@ diff -urN xrdp-0.9.1/sesman/sesman.ini xrdp-0.9.1.sesman/sesman/sesman.ini [Security] AllowRootLogin=true +@@ -78,7 +78,7 @@ + param=96 + + [Xorg] +-param=Xorg ++param=/usr/libexec/Xorg + param=-config + param=xrdp/xorg.conf + param=-noreset diff --git a/xrdp-0.9.1-xrdp-ini.patch b/xrdp-0.9.1-xrdp-ini.patch index 718b5c4..a282360 100644 --- a/xrdp-0.9.1-xrdp-ini.patch +++ b/xrdp-0.9.1-xrdp-ini.patch @@ -1,53 +1,43 @@ -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-ini/xrdp/xrdp.ini 2017-01-23 23:28:19.194963530 -0800 -@@ -147,15 +147,15 @@ ++++ xrdp-0.9.1.xrdp-ini/xrdp/xrdp.ini 2017-03-09 15:47:04.828968234 -0800 +@@ -147,16 +147,6 @@ ; Session types ; -[X11rdp] -name=X11rdp -lib=libxup.so -+[Xvnc] -+name=Xvnc -+lib=libvnc.so - username=ask - password=ask - ip=127.0.0.1 - port=-1 +-username=ask +-password=ask +-ip=127.0.0.1 +-port=-1 -xserverbpp=24 -code=10 -+#xserverbpp=24 -+#delay_ms=2000 - +- [Xorg] name=Xorg -@@ -166,59 +166,53 @@ - port=-1 - code=20 + lib=libxup.so +@@ -176,49 +166,53 @@ + #xserverbpp=24 + #delay_ms=2000 --[Xvnc] --name=Xvnc +-[console] +-name=console -lib=libvnc.so +-ip=127.0.0.1 +-port=5900 +-username=na +[X11rdp] +name=X11rdp +lib=libxup.so - username=ask ++username=ask password=ask - ip=127.0.0.1 - port=-1 --#xserverbpp=24 --#delay_ms=2000 ++ip=127.0.0.1 ++port=-1 +xserverbpp=24 +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 diff --git a/xrdp.spec b/xrdp.spec index fc31827..cd689c5 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -4,7 +4,7 @@ Summary: Open source remote desktop protocol (RDP) server Name: xrdp Epoch: 1 Version: 0.9.1 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://www.xrdp.org/ @@ -29,8 +29,10 @@ BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(systemd) -#vnc-server provides Xvnc (tigervnc-server in fedora) -Requires: tigervnc-server-minimal +# xorgxrdp is the default backend +Requires: xorgxrdp +Requires: /usr/libexec/Xorg + Requires(post): systemd Requires(post): systemd-sysv @@ -183,6 +185,11 @@ systemctl try-restart xrdp.service >/dev/null 2>&1 || : %{_libdir}/pkgconfig/xrdp.pc %changelog +* Thu Mar 09 2017 Pavel Roskin - 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 - 1:0.9.1-5 - Require openssl in posttrans phase - Move conditional restart to posttrans phase