Attachment 14080 Details for Bug 31905 – patch to allow build with ssh2-1.10.0

[patch] patch to allow build with ssh2-1.10.0

Relax_dependency_on_libssh2_version.patch (text/plain), 1.05 KB, created by Philippe Didier on 2023-10-22 17:43:16 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2023-10-22 17:43:16 CEST

Size: 1.05 KB

patch

obsolete

>diff --git a/libssh2/libssh2_wrap.h b/libssh2/libssh2_wrap.h
>index fcb4985..e3ce334 100644
>--- a/libssh2/libssh2_wrap.h
>+++ b/libssh2/libssh2_wrap.h
>@@ -171,11 +171,17 @@ std::wstring formatSshStatusCode(int sc)
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_ENCRYPT);
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_BAD_SOCKET);
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KNOWN_HOSTS);
>+#if LIBSSH2_VERSION_NUM >= 0x010900 // 1.9.0
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_CHANNEL_WINDOW_FULL);
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KEYFILE_AUTH_FAILED);
>+#endif
>+#if LIBSSH2_VERSION_NUM >= 0x010A00 // 1.10.0
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_RANDGEN);
>+#endif
>+#if LIBSSH2_VERSION_NUM >= 0x010B00 // 1.11.0
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_MISSING_USERAUTH_BANNER);
>             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_ALGO_UNSUPPORTED);
>+#endif
> 
>         default:
>             return replaceCpy<std::wstring>(L"SSH status %x", L"%x", numberTo<std::wstring>(sc));

diff --git a/libssh2/libssh2_wrap.h b/libssh2/libssh2_wrap.h
index fcb4985..e3ce334 100644
--- a/libssh2/libssh2_wrap.h
+++ b/libssh2/libssh2_wrap.h
@@ -171,11 +171,17 @@ std::wstring formatSshStatusCode(int sc)
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_ENCRYPT);
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_BAD_SOCKET);
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KNOWN_HOSTS);
+#if LIBSSH2_VERSION_NUM >= 0x010900 // 1.9.0
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_CHANNEL_WINDOW_FULL);
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_KEYFILE_AUTH_FAILED);
+#endif
+#if LIBSSH2_VERSION_NUM >= 0x010A00 // 1.10.0
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_RANDGEN);
+#endif
+#if LIBSSH2_VERSION_NUM >= 0x010B00 // 1.11.0
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_MISSING_USERAUTH_BANNER);
             ZEN_CHECK_CASE_FOR_CONSTANT(LIBSSH2_ERROR_ALGO_UNSUPPORTED);
+#endif
 
         default:
             return replaceCpy<std::wstring>(L"SSH status %x", L"%x", numberTo<std::wstring>(sc));

Actions: View | Diff

Attachments on bug 31905: 14080 | 14094 | 14095 | 14096 | 14097 | 14098 | 14099 | 14100 | 14101 | 14102 | 14103 | 14104 | 14105