From: Paul Howarth <paul@city-fan.org>
Date: Sun, 6 Mar 2022 13:13:34 +0000 (+0000)
Subject: runtests: make 'oldlibssh' be before 0.9.4
X-Git-Tag: curl-7_83_0~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b01a57c95fd4c041dfa4a41834c761658ea89ee;p=thirdparty%2Fcurl.git

runtests: make 'oldlibssh' be before 0.9.4

The 'oldlibssh' feature indicates that the error code returned by libssh
for a broken known_hosts file should be 67 rather than 60 (test1459).
This feature was added as part of #8444 with 'oldlibssh' mapping to
libssh versions prior to 0.9.6, and then refined as part of #8511 to map
to versions prior to 0.9.5.

In Red Hat Enterprise Linux 8.5 there is a patched version of libssh
version 0.9.4 (https://git.centos.org/rpms/libssh/blob/c8/f/SOURCES) in
which test1459 fails because it returns the "new" value rather than the
"old" one. It's plausible that one of the patches is responsible for
this rather than the underlying code but I don't think so.

This change therefore drops the 'oldlibssh' version check to map to
libssh versions older than 0.9.4, which fixes builds on RHEL-8.

Closes #8548
---

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index c1fbc5705b..291c944c96 100644
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -395,7 +395,7 @@ Features testable here are:
 - `ld_preload`
 - `libssh2`
 - `libssh`
-- `oldlibssh` (versions before 0.9.6)
+- `oldlibssh` (versions before 0.9.4)
 - `libz`
 - `manual`
 - `Mime`
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 72a99892f0..8b8d6d80b3 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -271,7 +271,7 @@ my $has_mingw;      # set if built with MinGW (as opposed to MinGW-w64)
 my $has_hyper = 0;  # set if built with Hyper
 my $has_libssh2;    # set if built with libssh2
 my $has_libssh;     # set if built with libssh
-my $has_oldlibssh;  # set if built with libssh < 0.9.6
+my $has_oldlibssh;  # set if built with libssh < 0.9.4
 my $has_wolfssh;    # set if built with wolfssh
 my $has_unicode;    # set if libcurl is built with Unicode support
 
@@ -3047,8 +3047,8 @@ sub checksystem {
                 $has_libssh=1;
                 if($1 =~ /(\d+)\.(\d+).(\d+)/) {
                     my $v = $1 * 100 + $2 * 10 + $3;
-                    if($v < 95) {
-                        # before 0.9.5
+                    if($v < 94) {
+                        # before 0.9.4
                         $has_oldlibssh = 1;
                     }
                 }