From: Thomas Huth <[email protected]> nmap / ncat has a somewhat problematic license (e.g. saying claiming that derived work is also considered for software that "is designed specifically to execute Covered Software and parse the results", e.g. by executing ncat from your own program, you might already fall into this category) - so for example in openSUSE 16, you can only find it in the "non-OSS" repository.
We are currently only using it in the migration functional test, and that likely does not fall into this "derived work" category yet (since it is also doing some other stuff), but still, to be safe, we should move away from using it now. Unfortunately, switching to one of the other flavors of netcat is also not a real option (see commit f700abbbeb6ab68a3446d1fb168a934d), but socat should be a solid replacement here instead. To avoid that someone else easily uses ncat again, let's also remove it from our container files now. Suggested-by: Daniel P. Berrangé <[email protected]> Signed-off-by: Thomas Huth <[email protected]> Acked-by: Peter Xu <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- scripts/ci/setup/debian/debian-13-ppc64le.yaml | 1 - scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml | 1 - scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml | 1 - tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos9.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 1 - tests/docker/dockerfiles/debian-armhf-cross.docker | 1 - tests/docker/dockerfiles/debian-i686-cross.docker | 1 - tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 - tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 - tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 - tests/docker/dockerfiles/debian-riscv64-cross.docker | 1 - tests/docker/dockerfiles/debian-s390x-cross.docker | 1 - tests/docker/dockerfiles/debian.docker | 1 - tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/ubuntu2204.docker | 1 - tests/functional/migration.py | 4 ++-- tests/lcitool/projects/qemu.yml | 1 - 21 files changed, 2 insertions(+), 22 deletions(-) diff --git a/scripts/ci/setup/debian/debian-13-ppc64le.yaml b/scripts/ci/setup/debian/debian-13-ppc64le.yaml index 25d96cea460..b16d6d58f8e 100644 --- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml +++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml @@ -101,7 +101,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml index 6a72eabca9e..b58fcda0fa3 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -102,7 +102,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml index 6001da12504..fa439db4ca1 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -100,7 +100,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index c0303feb48a..a7ee85fcda7 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -76,7 +76,6 @@ RUN apk update && \ ndctl-dev \ net-tools \ nettle-dev \ - nmap-ncat \ numactl-dev \ openssh-client \ pcre2-dev \ diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker index 6b1aa6dc0de..41a1225856e 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -87,7 +87,6 @@ RUN dnf --quiet distro-sync -y && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index c386b658b04..6fad808e1b6 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 9d83ab7a32e..889d8a1a755 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index c2077ec7a2c..988c87075f6 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index db9f04ee93d..d720ebb0bca 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 7758afd80aa..90a2ef15574 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index cba7f43870f..b7e36b3d974 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 24f946d1441..a70fbee0c1d 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index f476cf65eaa..9ada5ecce0d 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index a60b4ab01d1..a1de94ff9aa 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index 6c6ab0256ea..c34923b253d 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -109,7 +109,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ make \ mtools \ multipath-tools \ - ncat \ nettle-dev \ ninja-build \ openssh-client \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker index 38381ef8f59..8766f952ac8 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 818485c4ba2..751789e849b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -42,7 +42,6 @@ exec "$@"\n' > /usr/bin/nosync && \ make \ mtools \ ninja-build \ - nmap-ncat \ openssh-clients \ python3 \ python3-PyYAML \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 32aaf01aff4..ec787aa7027 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 44e763f571a..fb5b03e7a1b 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -107,7 +107,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ make \ mtools \ multipath-tools \ - ncat \ nettle-dev \ ninja-build \ openssh-client \ diff --git a/tests/functional/migration.py b/tests/functional/migration.py index e995328e833..2395119d6c6 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -84,6 +84,6 @@ def migration_with_exec(self): self.skipTest('ncat is not available') with Ports() as ports: free_port = self._get_free_port(ports) - dst_uri = 'exec:ncat -l localhost %u' % free_port - src_uri = 'exec:ncat localhost %u' % free_port + dst_uri = 'exec:socat TCP-LISTEN:%u -' % free_port + src_uri = 'exec:socat - TCP:localhost:%u' % free_port self.migrate(dst_uri, src_uri) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index b78a1d7f2e0..131d9c4ec81 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -83,7 +83,6 @@ packages: - meson - mtools - ncursesw - - netcat - nettle - ninja - nsis -- 2.47.3
