diff options
| author | Ryo Nakamura <upa@haeena.net> | 2023-03-10 20:11:44 +0900 |
|---|---|---|
| committer | Ryo Nakamura <upa@haeena.net> | 2023-03-10 20:11:44 +0900 |
| commit | b3b7299990a48d89acc04c746554f41daf310bd5 (patch) | |
| tree | 4a7f04d5936344f7a18fa089bd7c9fc2caa31012 /patch | |
| parent | d766b3a99e1606629c5ce4a817c3fa9fd9b5c15c (diff) | |
| parent | ca94d77e4544862e4c43cfddde69050bdc08fd35 (diff) | |
merge main into lib
Diffstat (limited to 'patch')
| -rw-r--r-- | patch/libssh-0.10.4.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/patch/libssh-0.10.4.patch b/patch/libssh-0.10.4.patch index d90b647..a8a9628 100644 --- a/patch/libssh-0.10.4.patch +++ b/patch/libssh-0.10.4.patch @@ -1,48 +1,3 @@ -diff --git a/DefineOptions.cmake b/DefineOptions.cmake -index 068db988..5fc3c8fc 100644 ---- a/DefineOptions.cmake -+++ b/DefineOptions.cmake -@@ -1,7 +1,7 @@ - option(WITH_GSSAPI "Build with GSSAPI support" ON) - option(WITH_ZLIB "Build with ZLIB support" ON) - option(WITH_SFTP "Build with SFTP support" ON) --option(WITH_SERVER "Build with SSH server support" ON) -+option(WITH_SERVER "Build with SSH server support" OFF) - option(WITH_DEBUG_CRYPTO "Build with cryto debug output" OFF) - option(WITH_DEBUG_PACKET "Build with packet debug output" OFF) - option(WITH_DEBUG_CALLTRACE "Build with calltrace debug output" ON) -@@ -11,13 +11,13 @@ option(WITH_MBEDTLS "Compile against libmbedtls" OFF) - option(WITH_BLOWFISH_CIPHER "Compile with blowfish support" OFF) - option(WITH_PCAP "Compile with Pcap generation support" ON) - option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF) --option(BUILD_SHARED_LIBS "Build shared libraries" ON) -+option(BUILD_SHARED_LIBS "Build shared libraries" OFF) - option(WITH_PKCS11_URI "Build with PKCS#11 URI support" OFF) - option(UNIT_TESTING "Build with unit tests" OFF) - option(CLIENT_TESTING "Build with client tests; requires openssh" OFF) - option(SERVER_TESTING "Build with server tests; requires openssh and dropbear" OFF) - option(WITH_BENCHMARKS "Build benchmarks tools" OFF) --option(WITH_EXAMPLES "Build examples" ON) -+option(WITH_EXAMPLES "Build examples" OFF) - option(WITH_NACL "Build with libnacl (curve25519)" ON) - option(WITH_SYMBOL_VERSIONING "Build with symbol versioning" ON) - option(WITH_ABI_BREAK "Allow ABI break" OFF) -@@ -25,6 +25,7 @@ option(WITH_GEX "Enable DH Group exchange mechanisms" ON) - option(WITH_INSECURE_NONE "Enable insecure none cipher and MAC algorithms (not suitable for production!)" OFF) - option(FUZZ_TESTING "Build with fuzzer for the server and client (automatically enables none cipher!)" OFF) - option(PICKY_DEVELOPER "Build with picky developer flags" OFF) -+option(WITH_STATIC_LIB "Build static library" ON) - - if (WITH_ZLIB) - set(WITH_LIBZ ON) -@@ -60,3 +61,7 @@ endif (NOT GLOBAL_CLIENT_CONFIG) - if (FUZZ_TESTING) - set(WITH_INSECURE_NONE ON) - endif (FUZZ_TESTING) -+ -+if (WITH_STATIC_LIB) -+ set(BUILD_STATIC_LIB ON) -+endif() diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h index a55a1b40..e34e075c 100644 --- a/include/libssh/buffer.h |