- merged PLD changes, updated to 0.9.15

[packages/xrdp.git] / config.patch

diff --git a/config.patch b/config.patch
index 294c8cbae150cc1367798b4b6a780a96786c0822..9a8ff29c59c7c346d0194952b715f910fae723c9 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
-diff -ur xrdp-0.9.11.orig/sesman/sesman.ini xrdp-0.9.11/sesman/sesman.ini
---- xrdp-0.9.11.orig/sesman/sesman.ini 2019-08-19 17:41:37.000000000 +0200
-+++ xrdp-0.9.11/sesman/sesman.ini      2019-08-21 23:14:04.896000000 +0200
+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
 @@ -12,13 +12,13 @@
  ReconnectScript=reconnectwm.sh
  
@@ -19,21 +19,26 @@ diff -ur xrdp-0.9.11.orig/sesman/sesman.ini xrdp-0.9.11/sesman/sesman.ini
  ; When RestrictOutboundClipboard=true clipboard from the
  ; server is not pushed to the client.
  RestrictOutboundClipboard=false
-@@ -64,10 +64,10 @@
- Policy=Default
+@@ -65,13 +65,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
-@@ -90,8 +90,8 @@
+ [LoggingPerLogger]
+ ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
+@@ -101,8 +101,8 @@
  param=-noreset
  param=-nolisten
  param=tcp
@@ -44,9 +49,9 @@ diff -ur xrdp-0.9.11.orig/sesman/sesman.ini xrdp-0.9.11/sesman/sesman.ini
  
  [Xvnc]
  param=Xvnc
-diff -ur xrdp-0.9.11.orig/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
---- xrdp-0.9.11.orig/xrdp/xrdp.ini     2019-08-19 17:41:37.000000000 +0200
-+++ xrdp-0.9.11/xrdp/xrdp.ini  2019-08-21 23:15:10.436000000 +0200
+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
 @@ -5,6 +5,9 @@
  ; fork a new process for each incoming connection
  fork=true
@@ -57,21 +62,26 @@ diff -ur xrdp-0.9.11.orig/xrdp/xrdp.ini xrdp-0.9.11/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
-@@ -143,10 +146,10 @@
- ls_btn_cancel_height=30
+@@ -151,13 +154,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]
-@@ -178,14 +181,15 @@
+ [LoggingPerLogger]
+ ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
+@@ -193,14 +196,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.
@@ -95,9 +105,9 @@ diff -ur xrdp-0.9.11.orig/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
  
  [Xvnc]
  name=Xvnc
-@@ -197,25 +201,25 @@
- #xserverbpp=24
- #delay_ms=2000
+@@ -216,25 +220,25 @@
+ #disabled_encodings_mask=0
+ 
  
 -[vnc-any]
 -name=vnc-any