- updated to 0.9.19, partial PLD merge

[packages/xrdp.git] / config.patch

diff --git a/config.patch b/config.patch
index 9a8ff29c59c7c346d0194952b715f910fae723c9..02c2704cb73d9ca85eb4c2a4d89ccd1f54458981 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
-diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini
---- xrdp-0.9.15.orig/sesman/sesman.ini 2020-12-28 15:06:46.000000000 +0100
-+++ xrdp-0.9.15/sesman/sesman.ini      2021-01-04 00:09:55.106416646 +0100
+diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini
+--- xrdp-0.9.19.orig/sesman/sesman.ini 2022-03-17 07:21:20.000000000 +0100
++++ xrdp-0.9.19/sesman/sesman.ini      2022-04-01 00:52:52.926266171 +0200
 @@ -12,13 +12,13 @@
  ReconnectScript=reconnectwm.sh
  
@@ -16,10 +16,10 @@ diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini
  ; if the group TerminalServerUsers is not defined.
 -AlwaysGroupCheck=false
 +AlwaysGroupCheck=true
- ; When RestrictOutboundClipboard=true clipboard from the
+ ; When RestrictOutboundClipboard=all clipboard from the
  ; server is not pushed to the client.
- RestrictOutboundClipboard=false
-@@ -65,13 +65,13 @@
+ ; In addition, you can control text/file/image transfer restrictions
+@@ -80,13 +80,13 @@
  
  [Logging]
  ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
@@ -37,8 +37,8 @@ diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini
 +EnableProcessId=false
  
  [LoggingPerLogger]
- ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
-@@ -101,8 +101,8 @@
+ ; Note: per logger configuration is only used if xrdp is built with
+@@ -117,8 +117,8 @@
  param=-noreset
  param=-nolisten
  param=tcp
@@ -49,9 +49,9 @@ diff -ur xrdp-0.9.15.orig/sesman/sesman.ini xrdp-0.9.15/sesman/sesman.ini
  
  [Xvnc]
  param=Xvnc
-diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini
---- xrdp-0.9.15.orig/xrdp/xrdp.ini     2020-12-28 15:06:46.000000000 +0100
-+++ xrdp-0.9.15/xrdp/xrdp.ini  2021-01-04 00:10:37.448416646 +0100
+diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
+--- xrdp-0.9.19.orig/xrdp/xrdp.ini     2022-03-17 07:16:35.000000000 +0100
++++ xrdp-0.9.19/xrdp/xrdp.ini  2022-04-01 00:53:37.547367844 +0200
 @@ -5,6 +5,9 @@
  ; fork a new process for each incoming connection
  fork=true
@@ -62,7 +62,7 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini
  ; ports to listen on, number alone means listen on all interfaces
  ; 0.0.0.0 or :: if ipv6 is configured
  ; space between multiple occurrences
-@@ -151,13 +154,13 @@
+@@ -178,13 +181,13 @@
  
  [Logging]
  ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
@@ -80,8 +80,8 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini
 +EnableProcessId=false
  
  [LoggingPerLogger]
- ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
-@@ -193,14 +196,15 @@
+ ; Note: per logger configuration is only used if xrdp is built with
+@@ -218,14 +221,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.
@@ -105,10 +105,10 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini
  
  [Xvnc]
  name=Xvnc
-@@ -216,25 +220,25 @@
- #disabled_encodings_mask=0
- 
- 
+@@ -247,13 +251,13 @@
+ ; Generic VNC Proxy
+ ; Tailor this to specific hosts and VNC instances by specifying an ip
+ ; and port and setting a suitable name.
 -[vnc-any]
 -name=vnc-any
 -lib=libvnc.so
@@ -126,22 +126,26 @@ diff -ur xrdp-0.9.15.orig/xrdp/xrdp.ini xrdp-0.9.15/xrdp/xrdp.ini
  #pamusername=asksame
  #pampassword=asksame
  #pamsessionmng=127.0.0.1
- #delay_ms=2000
- 
+@@ -262,15 +266,15 @@
+ ; Generic RDP proxy using NeutrinoRDP
+ ; Tailor this to specific hosts by specifying an ip and port and setting
+ ; a suitable name.
 -[neutrinordp-any]
 -name=neutrinordp-any
++#[neutrinordp-any]
++#name=neutrinordp-any
+ ; To use this section, you should build xrdp with configure option
+ ; --enable-neutrinordp.
 -lib=libxrdpneutrinordp.so
 -ip=ask
 -port=ask3389
 -username=ask
 -password=ask
-+#[neutrinordp-any]
-+#name=neutrinordp-any
 +#lib=libxrdpneutrinordp.so
 +#ip=ask
 +#port=ask3389
 +#username=ask
 +#password=ask
- 
- ; You can override the common channel settings for each session type
- #channel.rdpdr=true
+ ; Uncomment the following lines to enable PAM authentication for proxy
+ ; connections.
+ #pamusername=ask