diff --git a/x11-packages/xrdp/build.sh b/x11-packages/xrdp/build.sh index 5a4b068db..7b6159c49 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 Pliushch " -TERMUX_PKG_VERSION=0.9.15 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=0.9.16 TERMUX_PKG_SRCURL=https://github.com/neutrinolabs/xrdp/releases/download/v${TERMUX_PKG_VERSION}/xrdp-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ad0381e45fe5236c34ff750850df9545c5bef45fc3b3c9386217cb65a6f9b541 +TERMUX_PKG_SHA256=72a86bf3bb8ca3a41905bfa84f500ad73cd23615753f34db7e36278a33c19916 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 ff211273d..921ebdc6b 100644 --- a/x11-packages/xrdp/fix-configs.patch +++ b/x11-packages/xrdp/fix-configs.patch @@ -1,6 +1,6 @@ -diff -uNr xrdp-0.9.15/sesman/sesman.ini xrdp-0.9.15.mod/sesman/sesman.ini ---- xrdp-0.9.15/sesman/sesman.ini 2020-12-28 14:06:46.000000000 +0000 -+++ xrdp-0.9.15.mod/sesman/sesman.ini 2021-02-09 20:49:43.840603310 +0000 +diff -uNr xrdp-0.9.16/sesman/sesman.ini xrdp-0.9.16.mod/sesman/sesman.ini +--- xrdp-0.9.16/sesman/sesman.ini 2021-04-30 12:26:36.000000000 +0000 ++++ xrdp-0.9.16.mod/sesman/sesman.ini 2021-05-05 22:52:27.069387793 +0000 @@ -4,11 +4,14 @@ ListenAddress=127.0.0.1 ListenPort=3350 @@ -41,9 +41,9 @@ diff -uNr xrdp-0.9.15/sesman/sesman.ini xrdp-0.9.15.mod/sesman/sesman.ini [SessionVariables] -PULSE_SCRIPT=/etc/xrdp/pulse/default.pa +PULSE_SCRIPT=@TERMUX_PREFIX@/etc/xrdp/pulse/default.pa -diff -uNr xrdp-0.9.15/sesman/startwm.sh xrdp-0.9.15.mod/sesman/startwm.sh ---- xrdp-0.9.15/sesman/startwm.sh 2020-12-28 14:03:43.000000000 +0000 -+++ xrdp-0.9.15.mod/sesman/startwm.sh 2021-02-09 20:48:25.124354950 +0000 +diff -uNr xrdp-0.9.16/sesman/startwm.sh xrdp-0.9.16.mod/sesman/startwm.sh +--- xrdp-0.9.16/sesman/startwm.sh 2020-12-28 14:03:43.000000000 +0000 ++++ xrdp-0.9.16.mod/sesman/startwm.sh 2021-05-05 22:52:27.069387793 +0000 @@ -25,8 +25,8 @@ # END IF pre_start() @@ -91,9 +91,9 @@ diff -uNr xrdp-0.9.15/sesman/startwm.sh xrdp-0.9.15.mod/sesman/startwm.sh wm_start exit 1 -diff -uNr xrdp-0.9.15/xrdp/xrdp.ini xrdp-0.9.15.mod/xrdp/xrdp.ini ---- xrdp-0.9.15/xrdp/xrdp.ini 2020-12-28 14:06:46.000000000 +0000 -+++ xrdp-0.9.15.mod/xrdp/xrdp.ini 2021-02-09 20:50:21.452544512 +0000 +diff -uNr xrdp-0.9.16/xrdp/xrdp.ini xrdp-0.9.16.mod/xrdp/xrdp.ini +--- xrdp-0.9.16/xrdp/xrdp.ini 2021-04-30 12:26:36.000000000 +0000 ++++ xrdp-0.9.16.mod/xrdp/xrdp.ini 2021-05-05 22:54:03.485386615 +0000 @@ -153,7 +153,7 @@ ; Note: Log levels can be any of: core, error, warning, info, debug, or trace LogFile=xrdp.log @@ -103,17 +103,13 @@ diff -uNr xrdp-0.9.15/xrdp/xrdp.ini xrdp-0.9.15.mod/xrdp/xrdp.ini #SyslogLevel=INFO #EnableConsole=false #ConsoleLevel=INFO -@@ -180,32 +180,20 @@ +@@ -180,29 +180,17 @@ tcutils=true ; for debugging xrdp, in section xrdp1, change port=-1 to this: -#port=/tmp/.xrdp/xrdp_display_10 +#port=@TERMUX_PREFIX@/tmp/.xrdp/xrdp_display_10 - ; for debugging xrdp, add following line to section xrdp1 --#chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 -+#chansrvport=@TERMUX_PREFIX@/tmp/.xrdp/xrdp_chansrv_socket_7210 - ; ; Session types @@ -139,10 +135,10 @@ diff -uNr xrdp-0.9.15/xrdp/xrdp.ini xrdp-0.9.15.mod/xrdp/xrdp.ini password=ask ip=127.0.0.1 port=-1 -@@ -215,27 +203,6 @@ - ; (1 = ExtendedDesktopSize) - #disabled_encodings_mask=0 - +@@ -215,34 +203,3 @@ + ; (e.g. as part of an x11vnc console session). Replace '0' with the + ; display number of the session + #chansrvport=DISPLAY(0) - -[vnc-any] -name=vnc-any @@ -163,7 +159,14 @@ diff -uNr xrdp-0.9.15/xrdp/xrdp.ini xrdp-0.9.15.mod/xrdp/xrdp.ini -port=ask3389 -username=ask -password=ask +-; Currently NeutrinoRDP doesn't support dynamic resizing. Uncomment +-; this line if you're using a client which does. +-#enable_dynamic_resizing=false - - ; You can override the common channel settings for each session type - #channel.rdpdr=true - #channel.rdpsnd=true +-; You can override the common channel settings for each session type +-#channel.rdpdr=true +-#channel.rdpsnd=true +-#channel.drdynvc=true +-#channel.cliprdr=true +-#channel.rail=true +-#channel.xrdpvr=true diff --git a/x11-packages/xrdp/fix-tmpdir.patch b/x11-packages/xrdp/fix-tmpdir.patch index ccd0312a9..db9bd966e 100644 --- a/x11-packages/xrdp/fix-tmpdir.patch +++ b/x11-packages/xrdp/fix-tmpdir.patch @@ -1,6 +1,6 @@ -diff -uNr xrdp-0.9.15/sesman/sesman.c xrdp-0.9.15.mod/sesman/sesman.c ---- xrdp-0.9.15/sesman/sesman.c 2020-12-28 14:03:43.000000000 +0000 -+++ xrdp-0.9.15.mod/sesman/sesman.c 2021-02-09 20:42:04.596481217 +0000 +diff -uNr xrdp-0.9.16/sesman/sesman.c xrdp-0.9.16.mod/sesman/sesman.c +--- xrdp-0.9.16/sesman/sesman.c 2021-04-30 12:12:07.000000000 +0000 ++++ xrdp-0.9.16.mod/sesman/sesman.c 2021-05-05 22:56:39.013384734 +0000 @@ -573,14 +573,14 @@ g_mk_socket_path("xrdp-sesman"); @@ -20,10 +20,10 @@ diff -uNr xrdp-0.9.15/sesman/sesman.c xrdp-0.9.15.mod/sesman/sesman.c } g_snprintf(text, 255, "xrdp_sesman_%8.8x_main_term", g_pid); -diff -uNr xrdp-0.9.15/sesman/session.c xrdp-0.9.15.mod/sesman/session.c ---- xrdp-0.9.15/sesman/session.c 2020-12-28 14:03:43.000000000 +0000 -+++ xrdp-0.9.15.mod/sesman/session.c 2021-02-09 20:40:54.773164884 +0000 -@@ -168,12 +168,12 @@ +diff -uNr xrdp-0.9.16/sesman/session.c xrdp-0.9.16.mod/sesman/session.c +--- xrdp-0.9.16/sesman/session.c 2021-04-30 12:12:07.000000000 +0000 ++++ xrdp-0.9.16.mod/sesman/session.c 2021-05-05 22:57:32.057384094 +0000 +@@ -164,13 +164,13 @@ int x_running; int sck; @@ -33,12 +33,13 @@ diff -uNr xrdp-0.9.15/sesman/session.c xrdp-0.9.15.mod/sesman/session.c if (!x_running) { + LOG(LOG_LEVEL_DEBUG, "Did not find a running X server at %s", text); - g_sprintf(text, "/tmp/.X%d-lock", display); + g_sprintf(text, "@TERMUX_PREFIX@/tmp/.X%d-lock", display); x_running = g_file_exist(text); } -@@ -254,12 +254,12 @@ +@@ -264,13 +264,13 @@ char text[256]; int x_running; @@ -48,15 +49,16 @@ diff -uNr xrdp-0.9.15/sesman/session.c xrdp-0.9.15.mod/sesman/session.c if (!x_running) { + LOG(LOG_LEVEL_DEBUG, "Did not find a running X server at %s", text); - g_sprintf(text, "/tmp/.X%d-lock", display); + g_sprintf(text, "@TERMUX_PREFIX@/tmp/.X%d-lock", display); x_running = g_file_exist(text); } -diff -uNr xrdp-0.9.15/xrdp/xrdp_mm.c xrdp-0.9.15.mod/xrdp/xrdp_mm.c ---- xrdp-0.9.15/xrdp/xrdp_mm.c 2020-12-28 14:03:43.000000000 +0000 -+++ xrdp-0.9.15.mod/xrdp/xrdp_mm.c 2021-02-09 20:40:54.773164884 +0000 -@@ -2458,7 +2458,7 @@ +diff -uNr xrdp-0.9.16/xrdp/xrdp_mm.c xrdp-0.9.16.mod/xrdp/xrdp_mm.c +--- xrdp-0.9.16/xrdp/xrdp_mm.c 2021-04-30 12:12:07.000000000 +0000 ++++ xrdp-0.9.16.mod/xrdp/xrdp_mm.c 2021-05-05 22:56:39.013384734 +0000 +@@ -2705,7 +2705,7 @@ header.bytes_follow = enc_done->comp_bytes - (2 + pheader_bytes[0]); if (ii == 0) {