[freenx-server] Hush ncat output that confuses NoMachine NX client (#903186, Rok Mandeljc).

[Ville Skyttä]

commit b5309335d3919fd751cd212dc5e19629c4910e14
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jan 24 23:34:41 2013 +0200

    Hush ncat output that confuses NoMachine NX client (#903186, Rok Mandeljc).

 ...=> freenx-server-0.7.3-ncat-891109-903186.patch |    8 ++++----
 freenx-server.spec                                 |    7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/freenx-server-0.7.3-ncat-891109.patch b/freenx-server-0.7.3-ncat-891109-903186.patch
similarity index 94%
rename from freenx-server-0.7.3-ncat-891109.patch
rename to freenx-server-0.7.3-ncat-891109-903186.patch
index 6a5987c..ba2ae3b 100644
--- a/freenx-server-0.7.3-ncat-891109.patch
+++ b/freenx-server-0.7.3-ncat-891109-903186.patch
@@ -41,7 +41,7 @@ diff -up freenx-server-0.7.3/nxserver~ freenx-server-0.7.3/nxserver
  
                          let PROXY_DISPLAY=$SESS_DISPLAY+4000
 -                        if $COMMAND_NETCAT -z "$SERVER_HOST" $PROXY_DISPLAY
-+                        if $COMMAND_NETCAT --send-only "$SERVER_HOST" $PROXY_DISPLAY </dev/null
++                        if $COMMAND_NETCAT --send-only "$SERVER_HOST" $PROXY_DISPLAY </dev/null 2>/dev/null
                          then
                                  log 2 "Warning: nxagent proxy without .nX$SESS_DISPLAY-lock found on host:port $SERVER_HOST:$AGENT_DISPLAY."
                                  let SESS_DISPLAY=$SESS_DISPLAY+1
@@ -50,7 +50,7 @@ diff -up freenx-server-0.7.3/nxserver~ freenx-server-0.7.3/nxserver
  			
  			let SAMBA_DISPLAY=$SESS_DISPLAY+3000
 -			if [ "$(getparam 'samba')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $SAMBA_DISPLAY
-+			if [ "$(getparam 'samba')" = 1 ] && $COMMAND_NETCAT --send-only "$SERVER_HOST" $SAMBA_DISPLAY </dev/null
++			if [ "$(getparam 'samba')" = 1 ] && $COMMAND_NETCAT --send-only "$SERVER_HOST" $SAMBA_DISPLAY </dev/null 2>/dev/null
  			then
  				log 2 "Warning: Skipping $SERVER_HOST:$AGENT_DISPLAY as samba port is not free."
  				let SESS_DISPLAY=$SESS_DISPLAY+1
@@ -59,7 +59,7 @@ diff -up freenx-server-0.7.3/nxserver~ freenx-server-0.7.3/nxserver
  			
  			let MEDIA_DISPLAY=$SESS_DISPLAY+7000
 -			if [ "$(getparam 'media')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $MEDIA_DISPLAY
-+			if [ "$(getparam 'media')" = 1 ] && $COMMAND_NETCAT --send-only "$SERVER_HOST" $MEDIA_DISPLAY </dev/null
++			if [ "$(getparam 'media')" = 1 ] && $COMMAND_NETCAT --send-only "$SERVER_HOST" $MEDIA_DISPLAY </dev/null 2>/dev/null
  			then
  				log 2 "Warning: Skipping $SERVER_HOST:$AGENT_DISPLAY as media port is not free."
  				let SESS_DISPLAY=$SESS_DISPLAY+1
@@ -68,7 +68,7 @@ diff -up freenx-server-0.7.3/nxserver~ freenx-server-0.7.3/nxserver
  			
  			let CUPS_DISPLAY=$SESS_DISPLAY+9000
 -			if [ "$(getparam 'cups')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $CUPS_DISPLAY
-+			if [ "$(getparam 'cups')" = 1 ] && $COMMAND_NETCAT --send-only "$SERVER_HOST" $CUPS_DISPLAY </dev/null
++			if [ "$(getparam 'cups')" = 1 ] && $COMMAND_NETCAT --send-only "$SERVER_HOST" $CUPS_DISPLAY </dev/null 2>/dev/null
  			then
  				log 2 "Warning: Skipping $SERVER_HOST:$AGENT_DISPLAY as cups port is not free."
  				let SESS_DISPLAY=$SESS_DISPLAY+1
diff --git a/freenx-server.spec b/freenx-server.spec
index d93cc8c..dc5c923 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -17,7 +17,7 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx-server
 Version: 0.7.3
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
@@ -35,7 +35,7 @@ Patch6: freenx-server-0.7.3-init.patch
 Patch7: freenx-server-0.7.3-nxipp.patch
 Patch8: freenx-server-0.7.3-nxagent-version-827176.patch
 Patch9: freenx-server-0.7.3-authkeys2-830838.patch
-Patch10: freenx-server-0.7.3-ncat-891109.patch
+Patch10: freenx-server-0.7.3-ncat-891109-903186.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imake, redhat-release
 %if %{with systemd}
@@ -214,6 +214,9 @@ systemctl daemon-reload &>/dev/null || :
 /var/log/nx
 
 %changelog
+* Thu Jan 24 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-30
+- Hush ncat output that confuses NoMachine NX client (#903186, Rok Mandeljc).
+
 * Wed Jan  9 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-29
 - Patch to work with ncat in F-18+ (#891109).
 - Add Documentation field to systemd service.