- updated to 0.9.25.1, partial PLD merge

[packages/xrdp.git] / config.patch

diff --git a/config.patch b/config.patch
index 56af80c0d9d24e6c5c94c12ab72ad751e621d7de..02c2704cb73d9ca85eb4c2a4d89ccd1f54458981 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
-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
+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,24 +16,29 @@ diff -ur xrdp-0.9.9.orig/sesman/sesman.ini xrdp-0.9.9/sesman/sesman.ini
  ; if the group TerminalServerUsers is not defined.
 -AlwaysGroupCheck=false
 +AlwaysGroupCheck=true
- 
- [Sessions]
- ;; X11DisplayOffset - x11 display number offset
-@@ -61,10 +61,10 @@
- Policy=Default
+ ; When RestrictOutboundClipboard=all clipboard from the
+ ; server is not pushed to the client.
+ ; 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
 -LogFile=xrdp-sesman.log
--LogLevel=DEBUG
 +LogFile=/dev/null
-+LogLevel=INFO
- EnableSyslog=1
--SyslogLevel=DEBUG
+ LogLevel=INFO
+ EnableSyslog=true
+-#SyslogLevel=INFO
+-#EnableConsole=false
+-#ConsoleLevel=INFO
+-#EnableProcessId=false
 +SyslogLevel=INFO
++EnableConsole=false
++ConsoleLevel=INFO
++EnableProcessId=false
  
- ;
- ; Session definitions - startup command-line parameters for each session type
-@@ -87,8 +87,8 @@
+ [LoggingPerLogger]
+ ; Note: per logger configuration is only used if xrdp is built with
+@@ -117,8 +117,8 @@
  param=-noreset
  param=-nolisten
  param=tcp
@@ -44,33 +49,39 @@ diff -ur xrdp-0.9.9.orig/sesman/sesman.ini xrdp-0.9.9/sesman/sesman.ini
  
  [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 @@
- 
+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
+ 
 +; IP address to listen
-+;address=127.0.0.1
- ; tcp port to listen
- port=3389
- ; 'port' above should be connected to with vsock instead of tcp
-@@ -118,10 +120,10 @@
- ls_btn_cancel_height=30
++#address=127.0.0.1
++
+ ; ports to listen on, number alone means listen on all interfaces
+ ; 0.0.0.0 or :: if ipv6 is configured
+ ; space between multiple occurrences
+@@ -178,13 +181,13 @@
  
  [Logging]
+ ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
 -LogFile=xrdp.log
--LogLevel=DEBUG
 +LogFile=/dev/null
-+LogLevel=INFO
+ LogLevel=INFO
  EnableSyslog=true
--SyslogLevel=DEBUG
+-#SyslogLevel=INFO
+-#EnableConsole=false
+-#ConsoleLevel=INFO
+-#EnableProcessId=false
 +SyslogLevel=INFO
- ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
++EnableConsole=false
++ConsoleLevel=INFO
++EnableProcessId=false
  
- [Channels]
-@@ -153,14 +155,15 @@
+ [LoggingPerLogger]
+ ; 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.
@@ -94,10 +105,10 @@ diff -ur xrdp-0.9.9.orig/xrdp/xrdp.ini xrdp-0.9.9/xrdp/xrdp.ini
  
  [Xvnc]
  name=Xvnc
-@@ -172,25 +175,25 @@
- #xserverbpp=24
- #delay_ms=2000
- 
+@@ -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
@@ -115,22 +126,26 @@ diff -ur xrdp-0.9.9.orig/xrdp/xrdp.ini xrdp-0.9.9/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