From 83d3ffc0fc0f5e4473ab43f0d42a1cf9497ce0b5 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Sun, 29 Jun 2025 05:35:00 +0000 Subject: [PATCH] upstream: Check dropbear server version for required features. Dropbear added the '-D' flag in version 2025.87. We need that for the dropbear-server test, so skip on older versions. OpenBSD-Regress-ID: 9db0b84edd54d3c00ab17db1dc6d62af4644c550 --- regress/dropbear-server.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/regress/dropbear-server.sh b/regress/dropbear-server.sh index d3ea6dcc5..c72c86bfd 100644 --- a/regress/dropbear-server.sh +++ b/regress/dropbear-server.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dropbear-server.sh,v 1.1 2025/06/28 13:34:08 dtucker Exp $ +# $OpenBSD: dropbear-server.sh,v 1.2 2025/06/29 05:35:00 dtucker Exp $ # Placed in the Public Domain. tid="dropbear server" @@ -7,6 +7,20 @@ if test "x$REGRESS_INTEROP_DROPBEAR" != "xyes" ; then skip "dropbear interop tests not enabled" fi +ver="`$DROPBEAR -V 2>&1 | sed 's/Dropbear v//'`" +if [ -z "$ver" ]; then + skip "can't determine dropbear version" +fi + +major=`echo $ver | cut -f1 -d.` +minor=`echo $ver | cut -f2 -d.` + +if [ "$major" -lt "2025" ] || [ "$minor" -lt "87" ]; then + skip "dropbear version $ver (${major}.${minor}) does not support '-D'" +else + trace "dropbear version $ver (${major}.${minor}) ok" +fi + if [ -z "$SUDO" -a ! -w /var/run ]; then skip "need SUDO to create dir in /var/run, test won't work without" fi -- 2.47.2