crossbuild: need oathtool now for tests

diff --git a/scripts/docker/build/debian11/Dockerfile.cb b/scripts/docker/build/debian11/Dockerfile.cb
index 88a1d0ad6e455a9019b8637acc30f87b3f6994eb..0894139590541b831accfc4907e6de7217e4b720 100644 (file)
--- a/scripts/docker/build/debian11/Dockerfile.cb
+++ b/scripts/docker/build/debian11/Dockerfile.cb
@@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
         gdb \
         less \
         lldb \
-        vim
+        vim \
+        oathtool
 
 
 #
@@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/build/debian12/Dockerfile.cb b/scripts/docker/build/debian12/Dockerfile.cb
index 526630adbaba7a30d550b1ba01e7def5df2f54dc..172eda282499d7645fe51ec126cbd7a2a283ccb9 100644 (file)
--- a/scripts/docker/build/debian12/Dockerfile.cb
+++ b/scripts/docker/build/debian12/Dockerfile.cb
@@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
         gdb \
         less \
         lldb \
-        vim
+        vim \
+        oathtool
 
 
 #
@@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/build/debiansid/Dockerfile.cb b/scripts/docker/build/debiansid/Dockerfile.cb
index 39cd37638047b9860b141bdd0041b54db4185f3e..d67d730b7426215657a4de4a5d025f42e115f6db 100644 (file)
--- a/scripts/docker/build/debiansid/Dockerfile.cb
+++ b/scripts/docker/build/debiansid/Dockerfile.cb
@@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
         gdb \
         less \
         lldb \
-        vim
+        vim \
+        oathtool
 
 
 #
@@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/build/rocky8/Dockerfile.cb b/scripts/docker/build/rocky8/Dockerfile.cb
index 0cf07cb36e5fc9f25f975ed721fff536a9db70ea..6a6b03e977055a93487983bf57f97a742b24c6ed 100644 (file)
--- a/scripts/docker/build/rocky8/Dockerfile.cb
+++ b/scripts/docker/build/rocky8/Dockerfile.cb
@@ -89,19 +89,13 @@ RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin
        done
 
 #
-#  Tests require extra Yubikey libraries
+#  A few extra packages needed for tests
 #
-RUN yum install -y libyubikey-devel
-
-#
-#  Which is required by fixture setup utilities
-#
-RUN yum install -y which
-
-#
-#  Explicitly install libnl3-devel which is required for the EAP tests
-#
-RUN yum install -y libnl3-devel
+RUN yum install -y \
+    libnl3-devel \
+    libyubikey-devel \
+    oathtool \
+    which
 
 #
 #  We test with TLS1.1, but that is disabled by default on some

diff --git a/scripts/docker/build/rocky9/Dockerfile.cb b/scripts/docker/build/rocky9/Dockerfile.cb
index 7c3c6ff44a92b7f6d85fbcb91dcf6a1185e13909..1bb069cf268d65d46c88cb69f97e9d93dd6e0250 100644 (file)
--- a/scripts/docker/build/rocky9/Dockerfile.cb
+++ b/scripts/docker/build/rocky9/Dockerfile.cb
@@ -72,19 +72,13 @@ RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin
        done
 
 #
-#  Tests require extra Yubikey libraries
+#  A few extra packages needed for tests
 #
-RUN yum install -y libyubikey-devel
-
-#
-#  Which is required by fixture setup utilities
-#
-RUN yum install -y which
-
-#
-#  Explicitly install libnl3-devel which is required for the EAP tests
-#
-RUN yum install -y libnl3-devel
+RUN yum install -y \
+    libnl3-devel \
+    libyubikey-devel \
+    oathtool \
+    which
 
 #
 #  We test with TLS1.1, but that is disabled by default on some

diff --git a/scripts/docker/build/ubuntu20/Dockerfile.cb b/scripts/docker/build/ubuntu20/Dockerfile.cb
index a13d9769b0d185cccf10342266acb3a8646df601..4de16a747e03543e9cdcbe2703514268d3401ec6 100644 (file)
--- a/scripts/docker/build/ubuntu20/Dockerfile.cb
+++ b/scripts/docker/build/ubuntu20/Dockerfile.cb
@@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
         gdb \
         less \
         lldb \
-        vim
+        vim \
+        oathtool
 
 
 #
@@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/build/ubuntu22/Dockerfile.cb b/scripts/docker/build/ubuntu22/Dockerfile.cb
index 15c674d26e09e2e2919fb5f1da64a64e18835b9b..173e1227e902bbd77ce62d241a398616261720e7 100644 (file)
--- a/scripts/docker/build/ubuntu22/Dockerfile.cb
+++ b/scripts/docker/build/ubuntu22/Dockerfile.cb
@@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
         gdb \
         less \
         lldb \
-        vim
+        vim \
+        oathtool
 
 
 #
@@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/build/ubuntu24/Dockerfile.cb b/scripts/docker/build/ubuntu24/Dockerfile.cb
index f6b2feb6b42d8ea717d6d50818e0361d498bd4fe..7907bbf626b502b89c48c01f117021753f64056c 100644 (file)
--- a/scripts/docker/build/ubuntu24/Dockerfile.cb
+++ b/scripts/docker/build/ubuntu24/Dockerfile.cb
@@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
         gdb \
         less \
         lldb \
-        vim
+        vim \
+        oathtool
 
 
 #
@@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/m4/crossbuild.deb.m4 b/scripts/docker/m4/crossbuild.deb.m4
index ccb93aeb04fd1e7c26d845ba4a667c356518e527..267480ae8fec3aab43857d13a2955eac2a259ff2 100644 (file)
--- a/scripts/docker/m4/crossbuild.deb.m4
+++ b/scripts/docker/m4/crossbuild.deb.m4
@@ -71,21 +71,22 @@ RUN update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-CLANG_VER 60
 
 
 #
-#  Install eapol_test dependencies
+#  Install some extra packages
 #
 RUN apt-get install $APT_OPTS \
+dnl
+dnl for eapol_test:
         libnl-3-dev \
-        libnl-genl-3-dev
-
-
-#
-#  Install debugging utilities
-#
-RUN apt-get install $APT_OPTS \
+        libnl-genl-3-dev \
+dnl
+dnl for debugging:
         gdb \
         less \
         lldb \
-        vim
+        vim \
+dnl
+dnl for tests:
+        oathtool
 
 
 #
@@ -134,10 +135,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git
 RUN git clone --depth 1 --no-single-branch ${source}
 
 #
-#  Install build dependencies for all branches from v3 onwards
+#  Install build dependencies for all branches from v4 onwards
 #
 WORKDIR freeradius-server
-RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
+RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \

diff --git a/scripts/docker/m4/crossbuild.rpm.m4 b/scripts/docker/m4/crossbuild.rpm.m4
index 1783fbfe67e5671f1389ef1a10108959423add93..1c7465fb526ab156faf09d1683c633ce1ad5fd88 100644 (file)
--- a/scripts/docker/m4/crossbuild.rpm.m4
+++ b/scripts/docker/m4/crossbuild.rpm.m4
@@ -111,27 +111,19 @@ RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin
        done
 
 #
-#  Tests require extra Yubikey libraries
+#  A few extra packages needed for tests
 #
-RUN yum install -y libyubikey-devel
+RUN yum install -y \
+    libnl3-devel \
+    libyubikey-devel \
+    oathtool \
+    which
 
-#
-#  Which is required by fixture setup utilities
-#
-RUN yum install -y which
-
-#
-#  Explicitly install libnl3-devel which is required for the EAP tests
-#
-RUN yum install -y libnl3-devel
-
-ifelse(OS_VER, 7,, `dnl
 #
 #  We test with TLS1.1, but that is disabled by default on some
 #  newer systems.
 #
 RUN update-crypto-policies --set LEGACY
-')dnl
 
 #
 #  Create the RPM build tree