- updated to 0.9.25.1, partial PLD merge

[packages/xrdp.git] / quiet.patch

diff --git a/quiet.patch b/quiet.patch
index ee6b5fae44dc6078ad3ca9201a7a46c8511f9726..2dd922239b003568581c619ba76470cc519a0785 100644 (file)
--- a/quiet.patch
+++ b/quiet.patch
@@ -1,33 +1,16 @@
-diff -ur xrdp-0.9.7.orig/common/log.c xrdp-0.9.7/common/log.c
---- xrdp-0.9.7.orig/common/log.c       2018-06-04 15:01:57.000000000 +0000
-+++ xrdp-0.9.7/common/log.c    2018-07-04 15:24:35.592840196 +0000
-@@ -382,11 +382,11 @@
-     /* try to create path if not exist */
-     g_create_path(lc->log_file);
+diff -ur xrdp-0.9.19.orig/xrdp/xrdp.c xrdp-0.9.19/xrdp/xrdp.c
+--- xrdp-0.9.19.orig/xrdp/xrdp.c       2022-03-17 07:19:24.000000000 +0100
++++ xrdp-0.9.19/xrdp/xrdp.c    2022-04-01 00:54:41.104512664 +0200
+@@ -504,7 +504,7 @@
  
--    g_printf("logging configuration:\r\n");
-+    /*g_printf("logging configuration:\r\n");
-     g_printf("\tLogFile:       %s\r\n", lc->log_file);
-     g_printf("\tLogLevel:      %i\r\n", lc->log_level);
-     g_printf("\tEnableSyslog:  %i\r\n", lc->enable_syslog);
--    g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level);
-+    g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level);*/
-     return LOG_STARTUP_OK;
- }
- 
-diff -ur xrdp-0.9.7.orig/xrdp/xrdp.c xrdp-0.9.7/xrdp/xrdp.c
---- xrdp-0.9.7.orig/xrdp/xrdp.c        2018-06-29 08:06:27.000000000 +0000
-+++ xrdp-0.9.7/xrdp/xrdp.c     2018-07-04 15:26:48.163832295 +0000
-@@ -475,7 +475,7 @@
- 
-     if (startup_params->kill)
+     if (startup_params.kill)
      {
 -        g_writeln("stopping xrdp");
 +        /*g_writeln("stopping xrdp");*/
          /* read the xrdp.pid file */
          fd = -1;
  
-@@ -493,7 +493,7 @@
+@@ -522,7 +522,7 @@
              g_memset(text, 0, 32);
              g_file_read(fd, text, 31);
              pid = g_atoi(text);
@@ -36,12 +19,3 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.c xrdp-0.9.7/xrdp/xrdp.c
  
              if (pid > 0)
              {
-@@ -597,7 +597,7 @@
-                    or systemd cannot detect xrdp daemon couldn't start properly */
-                 g_exit(1);
-             }
--            g_writeln("daemon process %d started ok", pid);
-+            /*g_writeln("daemon process %d started ok", pid);*/
-             /* exit, this is the main process */
-             g_deinit();
-             g_exit(0);