From ffa7452139b19b156b86b6ae8e3cd1a981930540 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 1 Nov 2018 15:30:20 +0100 Subject: [PATCH] TT#37401 Ensure to always have netcat-openbsd available We have a hard dependency on netcat-openbsd, see: | commit 26ba0340b6cb8f7b17cfa1270e167ef90a636fbf | Author: Alexander Lutay | Date: Mon Jun 4 13:22:27 2018 +0200 | | TT#37401 Fix 50ecc1544: depends on netcat-openbsd since we use 'nc -U' (not available in 'netcat-traditional') But our docker image still uses netcat-traditional. Make sure to have netcat-openbsd available, while at it also adjust Build-Depends accordingly. Change-Id: I1d3cfd9b4b56047fa51c3ef1d77060122f4d2568 --- debian/control | 2 +- t/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index f4705661..58fe15bc 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: libsys-hostname-long-perl, libtemplate-perl, libyaml-libyaml-perl, - netcat-openbsd | netcat, + netcat-openbsd, pkwalify, python3-pytest, xsltproc, diff --git a/t/Dockerfile b/t/Dockerfile index 7a6f2e62..d1286a3d 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -5,12 +5,12 @@ FROM docker.mgm.sipwise.com/sipwise-stretch:latest # is updated with the current date. It will force refresh of all # of the base images and things like `apt-get update` won't be using # old cached versions when the Dockerfile is built. -ENV REFRESHED_AT 2017-09-22 +ENV REFRESHED_AT 2018-11-01 RUN apt-get update # sourcecode test dependencies -RUN apt-get install --assume-yes netcat libhash-merge-perl libtemplate-perl \ +RUN apt-get install --assume-yes netcat-openbsd libhash-merge-perl libtemplate-perl \ libyaml-libyaml-perl libyaml-tiny-perl libyaml-perl \ libdata-validate-ip-perl libio-interface-perl libregexp-ipv6-perl # misc stuff for execution/debugging/devel