From be08a91e41b194fc1a614af8ab2ce5c3f213ba97 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 25 Feb 2019 11:03:39 +0100 Subject: [PATCH] - updated to 0.9.9 --- config.patch | 77 +++++++++------------------------------------------- xrdp.spec | 8 ++---- 2 files changed, 16 insertions(+), 69 deletions(-) diff --git a/config.patch b/config.patch index e27fb63..56af80c 100644 --- a/config.patch +++ b/config.patch @@ -1,6 +1,6 @@ -diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini ---- xrdp-0.9.7.orig/sesman/sesman.ini 2018-06-29 08:18:27.000000000 +0000 -+++ xrdp-0.9.7/sesman/sesman.ini 2018-09-06 09:10:42.289218472 +0000 +diff -ur xrdp-0.9.9.orig/sesman/sesman.ini xrdp-0.9.9/sesman/sesman.ini +--- xrdp-0.9.9.orig/sesman/sesman.ini 2018-12-25 05:49:32.000000000 +0100 ++++ xrdp-0.9.9/sesman/sesman.ini 2019-02-25 10:58:10.501000000 +0100 @@ -12,13 +12,13 @@ ReconnectScript=reconnectwm.sh @@ -19,7 +19,7 @@ diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini [Sessions] ;; X11DisplayOffset - x11 display number offset -@@ -55,10 +55,10 @@ +@@ -61,10 +61,10 @@ Policy=Default [Logging] @@ -33,7 +33,7 @@ diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini ; ; Session definitions - startup command-line parameters for each session type -@@ -81,8 +81,8 @@ +@@ -87,8 +87,8 @@ param=-noreset param=-nolisten param=tcp @@ -42,11 +42,11 @@ diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini +#param=-logfile +#param=.xorgxrdp.%s.log - [X11rdp] - param=X11rdp -diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini ---- xrdp-0.9.7.orig/xrdp/xrdp.ini 2018-06-29 08:18:27.000000000 +0000 -+++ xrdp-0.9.7/xrdp/xrdp.ini 2018-09-06 09:13:13.540216769 +0000 + [Xvnc] + param=Xvnc +diff -ur xrdp-0.9.9.orig/xrdp/xrdp.ini xrdp-0.9.9/xrdp/xrdp.ini +--- xrdp-0.9.9.orig/xrdp/xrdp.ini 2018-12-25 05:49:32.000000000 +0100 ++++ xrdp-0.9.9/xrdp/xrdp.ini 2019-02-25 10:59:57.214000000 +0100 @@ -4,6 +4,8 @@ ; fork a new process for each incoming connection @@ -70,7 +70,7 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug [Channels] -@@ -153,24 +155,24 @@ +@@ -153,14 +155,15 @@ ; 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. @@ -82,16 +82,7 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini -ip=127.0.0.1 -port=-1 -code=20 -- --[X11rdp] --name=X11rdp --lib=libxup.so --username=ask --password=ask --ip=127.0.0.1 --port=-1 --xserverbpp=24 --code=10 ++ +#[Xorg] +#name=Xorg +#lib=libxup.so @@ -100,39 +91,13 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini +#ip=127.0.0.1 +#port=-1 +#code=20 -+ -+#[X11rdp] -+#name=X11rdp -+#lib=libxup.so -+#username=ask -+#password=ask -+#ip=127.0.0.1 -+#port=-1 -+#xserverbpp=24 -+#code=10 [Xvnc] name=Xvnc -@@ -182,43 +184,43 @@ +@@ -172,25 +175,25 @@ #xserverbpp=24 #delay_ms=2000 --[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 @@ -152,22 +117,6 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini #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 diff --git a/xrdp.spec b/xrdp.spec index f621028..c80f65f 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -1,12 +1,12 @@ Summary: Remote desktop server Summary(pl.UTF-8): Serwer remote desktop Name: xrdp -Version: 0.9.8 +Version: 0.9.9 Release: 1 License: GPL Group: X11/Applications/Networking Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 88a3c075583ccedf2183098478b57c17 +# Source0-md5: d2f57182036c3f69dcaca0dfed4aaa6b Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.README.TLD @@ -17,7 +17,6 @@ Patch1: quiet.patch URL: http://www.xrdp.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: freerdp-devel BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: pam-devel @@ -100,8 +99,7 @@ install %{SOURCE4} README.TLD.pl %{__autoconf} %{__autoheader} %{__automake} -%configure \ - --enable-freerdp1 +%configure %{__make} %install -- 2.46.0