[xrdp/el6] Add a delay loop for VNC back end.

[bojan]

commit a0e9085f3b5cc1f850bf0d52dc994c3f1693706f
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Mon Dec 22 18:11:55 2014 +1100

    Add a delay loop for VNC back end.
    
    Conflicts:
    	xrdp.spec

 xrdp-0.6.1-vnc-delay.patch |   27 +++++++++++++++++++++++++++
 xrdp.spec                  |    7 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/xrdp-0.6.1-vnc-delay.patch b/xrdp-0.6.1-vnc-delay.patch
new file mode 100644
index 0000000..0220bfa
--- /dev/null
+++ b/xrdp-0.6.1-vnc-delay.patch
@@ -0,0 +1,27 @@
+diff -ruN xrdp-v0.6.1-vanilla/vnc/vnc.c xrdp-v0.6.1/vnc/vnc.c
+--- xrdp-v0.6.1-vanilla/vnc/vnc.c	2013-11-10 07:11:15.000000000 +1100
++++ xrdp-v0.6.1/vnc/vnc.c	2014-12-22 17:49:57.474144440 +1100
+@@ -846,6 +846,7 @@
+   int error;
+   int i;
+   int check_sec_result;
++  int count;
+ 
+   v->server_msg(v, "started connecting", 0);
+   check_sec_result = 1;
+@@ -870,7 +871,14 @@
+   v->sck_closed = 0;
+   g_sprintf(text, "connecting to %s %s", v->ip, con_port);
+   v->server_msg(v, text, 0);
+-  error = g_tcp_connect(v->sck, v->ip, con_port);
++
++  for (count = 0; count < 10; count++) {
++    error = g_tcp_connect(v->sck, v->ip, con_port);
++    if (error == 0)
++      break;
++    g_sleep(1000);
++  }
++
+   if (error == 0)
+   {
+     v->server_msg(v, "tcp connected", 0);
diff --git a/xrdp.spec b/xrdp.spec
index 4c8e9b9..e1afcc5 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -3,7 +3,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -17,6 +17,7 @@ Patch3: xrdp-endian.patch
 Patch4: xrdp-0.6.1-syslog-format.patch
 Patch5: xrdp-0.6.1-memset.patch
 Patch6: xrdp-0.6.1-implicit-decl.patch
+Patch7: xrdp-0.6.1-vnc-delay.patch
 
 Source1: xrdp.init
 Source2: xrdp.sysconfig
@@ -56,6 +57,7 @@ terminal server / remote desktop clients.
 %patch4 -p1 -b .syslog-format
 %patch5 -p1 -b .memset
 %patch6 -p1 -b .implicit-decl
+%patch7 -p1 -b .vnc-delay
 
 
 # remove unused modules from xrdp login combobox
@@ -174,6 +176,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Mon Dec 22 2014 Bojan Smojver <bojan at rexursive.com> - 0.6.1-2
+- add a delay loop when connecting to VNC back end
+
 * Wed Dec 10 2014 Bojan Smojver <bojan at rexursive.com> - 0.6.1-1
 - try a bump to official 0.6.1
 - provide format for syslog() call