- updated to 0.9.11

diff --git a/config.patch b/config.patch
index 85d64c34960dd076d2ec2084b075a291fd855c7a..294c8cbae150cc1367798b4b6a780a96786c0822 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
-diff -ur xrdp-0.9.10.orig/sesman/sesman.ini xrdp-0.9.10/sesman/sesman.ini
---- xrdp-0.9.10.orig/sesman/sesman.ini 2019-04-18 08:01:58.000000000 +0200
-+++ xrdp-0.9.10/sesman/sesman.ini      2019-05-22 18:36:13.188000000 +0200
+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
 @@ -12,13 +12,13 @@
  ReconnectScript=reconnectwm.sh
  
@@ -44,19 +44,20 @@ diff -ur xrdp-0.9.10.orig/sesman/sesman.ini xrdp-0.9.10/sesman/sesman.ini
  
  [Xvnc]
  param=Xvnc
-diff -ur xrdp-0.9.10.orig/xrdp/xrdp.ini xrdp-0.9.10/xrdp/xrdp.ini
---- xrdp-0.9.10.orig/xrdp/xrdp.ini     2019-04-18 08:01:58.000000000 +0200
-+++ xrdp-0.9.10/xrdp/xrdp.ini  2019-05-22 18:35:14.363000000 +0200
-@@ -4,6 +4,8 @@
- 
+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
+@@ -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 @@
++#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
+@@ -143,10 +146,10 @@
  ls_btn_cancel_height=30
  
  [Logging]
@@ -70,7 +71,7 @@ diff -ur xrdp-0.9.10.orig/xrdp/xrdp.ini xrdp-0.9.10/xrdp/xrdp.ini
  ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
  
  [Channels]
-@@ -153,14 +155,15 @@
+@@ -178,14 +181,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,7 +95,7 @@ diff -ur xrdp-0.9.10.orig/xrdp/xrdp.ini xrdp-0.9.10/xrdp/xrdp.ini
  
  [Xvnc]
  name=Xvnc
-@@ -172,25 +175,25 @@
+@@ -197,25 +201,25 @@
  #xserverbpp=24
  #delay_ms=2000
  

diff --git a/quiet.patch b/quiet.patch
index a4fb25b2edfe83be00e7973d9043ec46b1d34e0e..95ccf883451355ba25923069c17767f133f4e403 100644 (file)
--- a/quiet.patch
+++ b/quiet.patch
@@ -1,6 +1,6 @@
-diff -ur xrdp-0.9.10.orig/common/log.c xrdp-0.9.10/common/log.c
---- xrdp-0.9.10.orig/common/log.c      2019-04-18 07:38:26.000000000 +0200
-+++ xrdp-0.9.10/common/log.c   2019-05-22 18:37:25.964000000 +0200
+diff -ur xrdp-0.9.11.orig/common/log.c xrdp-0.9.11/common/log.c
+--- xrdp-0.9.11.orig/common/log.c      2019-03-25 03:34:16.000000000 +0100
++++ xrdp-0.9.11/common/log.c   2019-08-21 23:15:55.763000000 +0200
 @@ -382,11 +382,11 @@
      /* try to create path if not exist */
      g_create_path(lc->log_file);
@@ -15,9 +15,9 @@ diff -ur xrdp-0.9.10.orig/common/log.c xrdp-0.9.10/common/log.c
      return LOG_STARTUP_OK;
  }
  
-diff -ur xrdp-0.9.10.orig/xrdp/xrdp.c xrdp-0.9.10/xrdp/xrdp.c
---- xrdp-0.9.10.orig/xrdp/xrdp.c       2019-04-18 07:38:26.000000000 +0200
-+++ xrdp-0.9.10/xrdp/xrdp.c    2019-05-22 18:37:25.964000000 +0200
+diff -ur xrdp-0.9.11.orig/xrdp/xrdp.c xrdp-0.9.11/xrdp/xrdp.c
+--- xrdp-0.9.11.orig/xrdp/xrdp.c       2019-08-19 17:39:17.000000000 +0200
++++ xrdp-0.9.11/xrdp/xrdp.c    2019-08-21 23:16:41.256000000 +0200
 @@ -475,7 +475,7 @@
  
      if (startup_params->kill)
@@ -37,11 +37,11 @@ diff -ur xrdp-0.9.10.orig/xrdp/xrdp.c xrdp-0.9.10/xrdp/xrdp.c
              if (pid > 0)
              {
 @@ -597,7 +597,7 @@
-                    or systemd cannot detect xrdp daemon couldn't start properly */
-                 g_exit(1);
-             }
+ 
+         if (0 != pid)
+         {
 -            g_writeln("daemon process %d started ok", pid);
-+            /*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);

diff --git a/xrdp.spec b/xrdp.spec
index 50b44ad241252d5a09e10b42fc8a009b3634015f..59fd4ad7fb98a6c284a20b97beb38c4602cb1b30 100644 (file)
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,12 +1,12 @@
 Summary:       Remote desktop server
 Summary(pl.UTF-8):     Serwer remote desktop
 Name:          xrdp
-Version:       0.9.10
+Version:       0.9.11
 Release:       1
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f2cb9b1f502b88c958de3a424ed6baa9
+# Source0-md5: 5d8000c5c7308051d9af7ab1f7f46c3b
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD