From d483fa010caed1fc1bd05e68086586ffe6382dc2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 11 May 2015 14:29:19 +0200 Subject: [PATCH] Switch from netcat-traditional to netcat6 netcat6 supports both ipv4 and ipv6, contrary to netcat-traditional. Additionally rather than using the alternatives-managed /bin/nc path, /bin/nc6 is now used which always points to the netcat6 implementation, allowing us to drop the netcat-openbsd conflict entry. --- PVE/API2/Qemu.pm | 2 +- control.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 67bcb742..c0a6bc31 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1337,7 +1337,7 @@ __PACKAGE__->register_method({ my $qmstr = join(' ', @$qmcmd); # also redirect stderr (else we get RFB protocol errors) - $cmd = ['/bin/nc', '-l', '-p', $port, '-w', $timeout, '-c', "$qmstr 2>/dev/null"]; + $cmd = ['/bin/nc6', '-l', '-p', $port, '-w', $timeout, '-e', "$qmstr 2>/dev/null"]; } PVE::Tools::run_command($cmd); diff --git a/control.in b/control.in index b4bb5879..84841cef 100644 --- a/control.in +++ b/control.in @@ -3,8 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@ Section: admin Priority: optional Architecture: @@ARCH@@ -Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 2.2-1), netcat-traditional, libpve-access-control, libpve-storage-perl, pve-cluster, libjson-perl, libjson-xs-perl, libio-multiplex-perl, libnet-ssleay-perl, socat, pve-firewall, libuuid-perl, pve-ha-manager -Conflicts: netcat-openbsd +Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 2.2-1), netcat6, libpve-access-control, libpve-storage-perl, pve-cluster, libjson-perl, libjson-xs-perl, libio-multiplex-perl, libnet-ssleay-perl, socat, pve-firewall, libuuid-perl, pve-ha-manager Maintainer: Proxmox Support Team Description: Qemu Server Tools This package contains the Qemu Server tools used by Proxmox VE