sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xrdp: update to 0.9.11

Browse Source
This commit is contained in:
Leonid Pliushch 2019-09-18 20:31:12 +03:00 committed by Yaksh Bariya
parent 1a154803a9
commit f749239598
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
2 changed files with 18 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11-packages/xrdp/build.sh
View File

@ -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_DESCRIPTION="An open source remote desktop protocol (RDP) server"
TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>" TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=0.9.10 TERMUX_PKG_VERSION=0.9.11
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://github.com/neutrinolabs/xrdp/releases/download/v${TERMUX_PKG_VERSION}/xrdp-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/neutrinolabs/xrdp/releases/download/v${TERMUX_PKG_VERSION}/xrdp-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=c9222b6b0a6beac0e7d6842deb6598b4a2cbac6c3f570f74c11771dbee641c98 TERMUX_PKG_SHA256=3569a29402ee2f5f1c07fa2adda68d6bda30f9c49b2582391d5065fb01a1a83c
TERMUX_PKG_DEPENDS="libandroid-shmem, libcrypt, libice, libsm, libuuid, libx11, libxau, libxcb, libxfixes, libxdmcp, libxrandr, openssl, procps, tigervnc" 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_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

71
x11-packages/xrdp/fix-configs.patch
View File

@ -1,6 +1,6 @@
diff -uNr xrdp-0.9.10/instfiles/xrdp.sh xrdp-0.9.10.mod/instfiles/xrdp.sh diff -uNr xrdp-0.9.11/instfiles/xrdp.sh xrdp-0.9.11.mod/instfiles/xrdp.sh
--- xrdp-0.9.10/instfiles/xrdp.sh 2019-04-18 08:38:26.000000000 +0300 --- xrdp-0.9.11/instfiles/xrdp.sh 2019-03-25 04:34:16.000000000 +0200
+++ xrdp-0.9.10.mod/instfiles/xrdp.sh 2019-05-20 00:35:14.703244638 +0300 +++ xrdp-0.9.11.mod/instfiles/xrdp.sh 2019-09-18 20:27:56.389595811 +0300
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
# Description: starts xrdp # Description: starts xrdp
### END INIT INFO ### END INIT INFO
@ -36,9 +36,9 @@ diff -uNr xrdp-0.9.10/instfiles/xrdp.sh xrdp-0.9.10.mod/instfiles/xrdp.sh
fi fi
fi fi
return 0; return 0;
diff -uNr xrdp-0.9.10/sesman/sesman.ini xrdp-0.9.10.mod/sesman/sesman.ini diff -uNr xrdp-0.9.11/sesman/sesman.ini xrdp-0.9.11.mod/sesman/sesman.ini
--- xrdp-0.9.10/sesman/sesman.ini 2019-04-18 09:01:58.000000000 +0300 --- xrdp-0.9.11/sesman/sesman.ini 2019-08-19 18:41:37.000000000 +0300
+++ xrdp-0.9.10.mod/sesman/sesman.ini 2019-05-20 00:35:59.357402227 +0300 +++ xrdp-0.9.11.mod/sesman/sesman.ini 2019-09-18 20:27:56.392929148 +0300
@@ -4,11 +4,14 @@ @@ -4,11 +4,14 @@
ListenAddress=127.0.0.1 ListenAddress=127.0.0.1
ListenPort=3350 ListenPort=3350
@ -105,9 +105,9 @@ diff -uNr xrdp-0.9.10/sesman/sesman.ini xrdp-0.9.10.mod/sesman/sesman.ini
[SessionVariables] [SessionVariables]
-PULSE_SCRIPT=/etc/xrdp/pulse/default.pa -PULSE_SCRIPT=/etc/xrdp/pulse/default.pa
+PULSE_SCRIPT=@TERMUX_PREFIX@/etc/xrdp/pulse/default.pa +PULSE_SCRIPT=@TERMUX_PREFIX@/etc/xrdp/pulse/default.pa
diff -uNr xrdp-0.9.10/sesman/startwm.sh xrdp-0.9.10.mod/sesman/startwm.sh diff -uNr xrdp-0.9.11/sesman/startwm.sh xrdp-0.9.11.mod/sesman/startwm.sh
--- xrdp-0.9.10/sesman/startwm.sh 2019-04-18 08:38:26.000000000 +0300 --- xrdp-0.9.11/sesman/startwm.sh 2019-03-25 04:34:16.000000000 +0200
+++ xrdp-0.9.10.mod/sesman/startwm.sh 2019-05-20 00:35:14.703244638 +0300 +++ xrdp-0.9.11.mod/sesman/startwm.sh 2019-09-18 20:27:56.392929148 +0300
@@ -4,12 +4,12 @@ @@ -4,12 +4,12 @@
# depending on your distro if it doesn't work for you. # depending on your distro if it doesn't work for you.
# #
@ -190,49 +190,10 @@ diff -uNr xrdp-0.9.10/sesman/startwm.sh xrdp-0.9.10.mod/sesman/startwm.sh
wm_start wm_start
diff -uNr xrdp-0.9.10/xrdp/xrdp.ini xrdp-0.9.10.mod/xrdp/xrdp.ini diff -uNr xrdp-0.9.11/xrdp/xrdp.ini xrdp-0.9.11.mod/xrdp/xrdp.ini
--- xrdp-0.9.10/xrdp/xrdp.ini 2019-04-18 09:01:58.000000000 +0300 --- xrdp-0.9.11/xrdp/xrdp.ini 2019-08-19 18:41:37.000000000 +0300
+++ xrdp-0.9.10.mod/xrdp/xrdp.ini 2019-05-20 00:39:35.043195599 +0300 +++ xrdp-0.9.11.mod/xrdp/xrdp.ini 2019-09-18 20:27:56.396262485 +0300
@@ -4,13 +4,17 @@ @@ -72,12 +72,12 @@
; fork a new process for each incoming connection
fork=true
+
; tcp port to listen
port=3389
+
; 'port' above should be connected to with vsock instead of tcp
use_vsock=false
+
; regulate if the listening socket use socket option tcp_nodelay
; no buffering will be performed in the TCP stack
tcp_nodelay=true
+
; regulate if the listening socket use socket option keepalive
; if the network connection disappear without close messages the connection will be closed
tcp_keepalive=true
@@ -20,16 +24,20 @@
; security layer can be 'tls', 'rdp' or 'negotiate'
; for client compatible layer
security_layer=negotiate
+
; minimum security level allowed for client
; can be 'none', 'low', 'medium', 'high', 'fips'
crypt_level=high
+
; X.509 certificate and private key
; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365
certificate=
key_file=
+
; set SSL protocols
; can be comma separated list of 'SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3'
ssl_protocols=TLSv1.2, TLSv1.3
+
; set TLS cipher suites
#tls_ciphers=HIGH
@@ -47,12 +55,12 @@
#hidelogwindow=true #hidelogwindow=true
max_bpp=32 max_bpp=32
new_cursors=true new_cursors=true
@ -247,7 +208,7 @@ diff -uNr xrdp-0.9.10/xrdp/xrdp.ini xrdp-0.9.10.mod/xrdp/xrdp.ini
; ;
; colors used by windows in RGB format ; colors used by windows in RGB format
@@ -120,7 +128,7 @@ @@ -145,7 +145,7 @@
[Logging] [Logging]
LogFile=xrdp.log LogFile=xrdp.log
LogLevel=DEBUG LogLevel=DEBUG
@ -256,7 +217,7 @@ diff -uNr xrdp-0.9.10/xrdp/xrdp.ini xrdp-0.9.10.mod/xrdp/xrdp.ini
SyslogLevel=DEBUG SyslogLevel=DEBUG
; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
@@ -140,10 +148,10 @@ @@ -165,10 +165,10 @@
tcutils=true tcutils=true
; for debugging xrdp, in section xrdp1, change port=-1 to this: ; for debugging xrdp, in section xrdp1, change port=-1 to this:
@ -269,7 +230,7 @@ diff -uNr xrdp-0.9.10/xrdp/xrdp.ini xrdp-0.9.10.mod/xrdp/xrdp.ini
; ;
@@ -153,45 +161,16 @@ @@ -178,45 +178,16 @@
; Some session types such as Xorg, X11rdp and Xvnc start a display server. ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
; Startup command-line parameters for the display server are configured ; Startup command-line parameters for the display server are configured
; in sesman.ini. See and configure also sesman.ini. ; in sesman.ini. See and configure also sesman.ini.