From 7da4ed7d64ec1556216a65b4bbdd22f80a0fde38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 10 Jun 2017 23:11:01 +0200
Subject: [PATCH] Switch qubes.UpdatesProxy to socat

 - there are many netcat versions (openbsd, nmap, ...), which behave
 differently - especially while handling EOF
 - Debian jessie doesn't have nmap-ncat (which handle EOFs sufficiently
   good)

QubesOS/qubes-issues#1854
---
 debian/control               | 2 +-
 qubes-rpc/qubes.UpdatesProxy | 2 +-
 rpm_spec/core-agent.spec     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 1398d35..759ccde 100644
--- a/debian/control
+++ b/debian/control
@@ -116,8 +116,8 @@ Depends:
     iptables,
     net-tools,
     ethtool,
+    socat,
     tinyproxy,
-    nmap-ncat,
     ${python:Depends},
     ${misc:Depends}
 Recommends:
diff --git a/qubes-rpc/qubes.UpdatesProxy b/qubes-rpc/qubes.UpdatesProxy
index 072eba8..67b81ab 100755
--- a/qubes-rpc/qubes.UpdatesProxy
+++ b/qubes-rpc/qubes.UpdatesProxy
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec nc localhost 8082
+exec socat STDIO TCP:localhost:8082
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index f90c773..2642f66 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -214,7 +214,7 @@ Summary:    Networking support for Qubes VM
 Requires:   ethtool
 Requires:   net-tools
 Requires:   nftables
-Requires:   nmap-ncat
+Requires:   socat
 Requires:   qubes-core-agent
 Requires:   tinyproxy
 Conflicts:  qubes-core-vm < 4.0.0