From 920bd34e04c94d1262c9fdecd6346b30e47b9660 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 20 May 2019 00:42:05 +0300 Subject: [PATCH] xrdp: update to 0.9.10 --- x11-packages/xrdp/build.sh | 5 +- x11-packages/xrdp/fix-configs.patch | 75 +++++++---------------------- 2 files changed, 20 insertions(+), 60 deletions(-) diff --git a/x11-packages/xrdp/build.sh b/x11-packages/xrdp/build.sh index 46fab17d3..ef67ed393 100644 --- a/x11-packages/xrdp/build.sh +++ b/x11-packages/xrdp/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/neutrinolabs/xrdp TERMUX_PKG_DESCRIPTION="An open source remote desktop protocol (RDP) server" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=0.9.8 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=0.9.10 TERMUX_PKG_SRCURL=https://github.com/neutrinolabs/xrdp/releases/download/v${TERMUX_PKG_VERSION}/xrdp-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=bbb2c114903d65c212cb2cca0b11bb2620e5034fa9353e0479bc8aa9290b78ee +TERMUX_PKG_SHA256=c9222b6b0a6beac0e7d6842deb6598b4a2cbac6c3f570f74c11771dbee641c98 TERMUX_PKG_DEPENDS="libandroid-shmem, libcrypt, libice, libsm, libuuid, libx11, libxau, libxcb, libxfixes, libxdmcp, libxrandr, openssl, procps, tigervnc" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/x11-packages/xrdp/fix-configs.patch b/x11-packages/xrdp/fix-configs.patch index 7e7f854b9..9e4a07ea9 100644 --- a/x11-packages/xrdp/fix-configs.patch +++ b/x11-packages/xrdp/fix-configs.patch @@ -1,6 +1,6 @@ -diff -uNr xrdp-0.9.8/instfiles/xrdp.sh xrdp-0.9.8.mod/instfiles/xrdp.sh ---- xrdp-0.9.8/instfiles/xrdp.sh 2017-06-26 16:09:39.000000000 +0300 -+++ xrdp-0.9.8.mod/instfiles/xrdp.sh 2018-12-28 23:50:07.097044009 +0200 +diff -uNr xrdp-0.9.10/instfiles/xrdp.sh xrdp-0.9.10.mod/instfiles/xrdp.sh +--- xrdp-0.9.10/instfiles/xrdp.sh 2019-04-18 08:38:26.000000000 +0300 ++++ xrdp-0.9.10.mod/instfiles/xrdp.sh 2019-05-20 00:35:14.703244638 +0300 @@ -17,9 +17,9 @@ # Description: starts xrdp ### END INIT INFO @@ -36,9 +36,9 @@ diff -uNr xrdp-0.9.8/instfiles/xrdp.sh xrdp-0.9.8.mod/instfiles/xrdp.sh fi fi return 0; -diff -uNr xrdp-0.9.8/sesman/sesman.ini xrdp-0.9.8.mod/sesman/sesman.ini ---- xrdp-0.9.8/sesman/sesman.ini 2018-09-25 09:19:28.000000000 +0300 -+++ xrdp-0.9.8.mod/sesman/sesman.ini 2018-12-28 23:50:35.690747248 +0200 +diff -uNr xrdp-0.9.10/sesman/sesman.ini xrdp-0.9.10.mod/sesman/sesman.ini +--- xrdp-0.9.10/sesman/sesman.ini 2019-04-18 09:01:58.000000000 +0300 ++++ xrdp-0.9.10.mod/sesman/sesman.ini 2019-05-20 00:35:59.357402227 +0300 @@ -4,11 +4,14 @@ ListenAddress=127.0.0.1 ListenPort=3350 @@ -64,7 +64,7 @@ diff -uNr xrdp-0.9.8/sesman/sesman.ini xrdp-0.9.8.mod/sesman/sesman.ini ; When AlwaysGroupCheck=false access will be permitted ; if the group TerminalServerUsers is not defined. AlwaysGroupCheck=false -@@ -57,40 +61,13 @@ +@@ -66,33 +70,13 @@ [Logging] LogFile=xrdp-sesman.log LogLevel=DEBUG @@ -95,26 +95,19 @@ diff -uNr xrdp-0.9.8/sesman/sesman.ini xrdp-0.9.8.mod/sesman/sesman.ini -param=tcp -param=-logfile -param=.xorgxrdp.%s.log -- --[X11rdp] --param=X11rdp --param=-bs --param=-nolisten --param=tcp --param=-uds - [Xvnc] param=Xvnc param=-bs -@@ -105,4 +82,4 @@ +@@ -107,4 +91,4 @@ FuseMountName=thinclient_drives [SessionVariables] -PULSE_SCRIPT=/etc/xrdp/pulse/default.pa +PULSE_SCRIPT=@TERMUX_PREFIX@/etc/xrdp/pulse/default.pa -diff -uNr xrdp-0.9.8/sesman/startwm.sh xrdp-0.9.8.mod/sesman/startwm.sh ---- xrdp-0.9.8/sesman/startwm.sh 2018-03-27 17:15:16.000000000 +0300 -+++ xrdp-0.9.8.mod/sesman/startwm.sh 2018-12-28 23:50:07.097044009 +0200 +diff -uNr xrdp-0.9.10/sesman/startwm.sh xrdp-0.9.10.mod/sesman/startwm.sh +--- xrdp-0.9.10/sesman/startwm.sh 2019-04-18 08:38:26.000000000 +0300 ++++ xrdp-0.9.10.mod/sesman/startwm.sh 2019-05-20 00:35:14.703244638 +0300 @@ -4,12 +4,12 @@ # depending on your distro if it doesn't work for you. # @@ -197,9 +190,9 @@ diff -uNr xrdp-0.9.8/sesman/startwm.sh xrdp-0.9.8.mod/sesman/startwm.sh wm_start -diff -uNr xrdp-0.9.8/xrdp/xrdp.ini xrdp-0.9.8.mod/xrdp/xrdp.ini ---- xrdp-0.9.8/xrdp/xrdp.ini 2018-09-25 09:19:28.000000000 +0300 -+++ xrdp-0.9.8.mod/xrdp/xrdp.ini 2018-12-28 23:51:21.074665937 +0200 +diff -uNr xrdp-0.9.10/xrdp/xrdp.ini xrdp-0.9.10.mod/xrdp/xrdp.ini +--- xrdp-0.9.10/xrdp/xrdp.ini 2019-04-18 09:01:58.000000000 +0300 ++++ xrdp-0.9.10.mod/xrdp/xrdp.ini 2019-05-20 00:39:35.043195599 +0300 @@ -4,13 +4,17 @@ ; fork a new process for each incoming connection @@ -263,7 +256,7 @@ diff -uNr xrdp-0.9.8/xrdp/xrdp.ini xrdp-0.9.8.mod/xrdp/xrdp.ini SyslogLevel=DEBUG ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug -@@ -140,86 +148,29 @@ +@@ -140,10 +148,10 @@ tcutils=true ; for debugging xrdp, in section xrdp1, change port=-1 to this: @@ -276,11 +269,8 @@ diff -uNr xrdp-0.9.8/xrdp/xrdp.ini xrdp-0.9.8.mod/xrdp/xrdp.ini ; - ; Session types - ; - --; Some session types such as Xorg, X11rdp and Xvnc start a display server. -+; Some session types such as Xvnc start a display server. +@@ -153,45 +161,16 @@ + ; 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] @@ -291,20 +281,9 @@ diff -uNr xrdp-0.9.8/xrdp/xrdp.ini xrdp-0.9.8.mod/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 -+name=Xvnc (TigerVNC) + name=Xvnc lib=libvnc.so -username=ask +username=na @@ -314,15 +293,6 @@ diff -uNr xrdp-0.9.8/xrdp/xrdp.ini xrdp-0.9.8.mod/xrdp/xrdp.ini #xserverbpp=24 #delay_ms=2000 --[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 @@ -335,15 +305,6 @@ diff -uNr xrdp-0.9.8/xrdp/xrdp.ini xrdp-0.9.8.mod/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 --#delay_ms=2000 -- -[neutrinordp-any] -name=neutrinordp-any -lib=libxrdpneutrinordp.so