Merge pull request #42 from AlwinEsch/depends/libssh

[depends] libssh: bump to 0.9.0

depends/common/libssh/02-build-static.patch

@@ -1,14 +1,14 @@
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -293,6 +293,7 @@
+@@ -312,6 +312,7 @@
      )
  endif (WITH_SYMBOL_VERSIONING AND HAVE_LD_VERSION_SCRIPT AND ABIMAP_FOUND)
 
 +if(OFF)
  add_library(${LIBSSH_SHARED_LIBRARY} SHARED ${libssh_SRCS})
- target_compile_options(${LIBSSH_SHARED_LIBRARY} PRIVATE ${DEFAULT_C_COMPILE_FLAGS})
-
-@@ -339,6 +340,7 @@
+ target_compile_options(${LIBSSH_SHARED_LIBRARY}
+                        PRIVATE
+@@ -361,6 +362,7 @@
    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
    COMPONENT libraries
  )

depends/common/libssh/03-md5.patch

@@ -1,37 +1,17 @@
 --- a/include/libssh/wrapper.h
 +++ b/include/libssh/wrapper.h
-@@ -63,7 +63,7 @@
- struct ssh_cipher_struct;
+@@ -74,7 +74,7 @@
+ struct ssh_crypto_struct;
 
  typedef struct ssh_mac_ctx_struct *ssh_mac_ctx;
 -MD5CTX md5_init(void);
 +MD5CTX ssh_md5_init(void);
  void md5_update(MD5CTX c, const void *data, unsigned long len);
  void md5_final(unsigned char *md,MD5CTX c);
 
---- a/src/dh.c
-+++ b/src/dh.c
-@@ -1196,7 +1196,7 @@
-         return SSH_ERROR;
-     }
-
--    ctx = md5_init();
-+    ctx = ssh_md5_init();
-     if (ctx == NULL) {
-         SAFE_FREE(h);
-         return SSH_ERROR;
-@@ -1407,7 +1407,7 @@
-                 goto out;
-             }
-
--            ctx = md5_init();
-+            ctx = ssh_md5_init();
-             if (ctx == NULL) {
-                 free(h);
-                 rc = -1;
 --- a/src/libcrypto.c
 +++ b/src/libcrypto.c
-@@ -313,7 +313,7 @@
+@@ -316,7 +316,7 @@
      }
  }
 
@@ -42,7 +22,7 @@
      MD5CTX c = EVP_MD_CTX_create();
 --- a/src/libgcrypt.c
 +++ b/src/libgcrypt.c
-@@ -202,7 +202,7 @@
+@@ -198,7 +198,7 @@
    gcry_md_hash_buffer(GCRY_MD_SHA512, hash, digest, len);
  }
 
@@ -64,7 +44,7 @@
      int rc;
 --- a/src/pki_gcrypt.c
 +++ b/src/pki_gcrypt.c
-@@ -255,7 +255,7 @@
+@@ -256,7 +256,7 @@
    unsigned int md_not_empty;
 
    for (j = 0, md_not_empty = 0; j < keylen; ) {
@@ -73,3 +53,23 @@
      if (md == NULL) {
        return -1;
      }
+--- a/src/session.c
++++ b/src/session.c
+@@ -987,7 +987,7 @@
+         return SSH_ERROR;
+     }
+
+-    ctx = md5_init();
++    ctx = ssh_md5_init();
+     if (ctx == NULL) {
+         SAFE_FREE(h);
+         return SSH_ERROR;
+@@ -1177,7 +1177,7 @@
+                 goto out;
+             }
+
+-            ctx = md5_init();
++            ctx = ssh_md5_init();
+             if (ctx == NULL) {
+                 free(h);
+                 rc = -1;

depends/common/libssh/04-stack-protector.patch

@@ -1,6 +1,6 @@
 --- a/CompilerChecks.cmake
 +++ b/CompilerChecks.cmake
-@@ -62,13 +62,13 @@
+@@ -66,20 +66,20 @@
          endif()
      endif()
 
@@ -9,12 +9,21 @@
      if (WITH_STACK_PROTECTOR_STRONG)
 -        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
 +        list(APPEND SUPPORTED_COMPILER_FLAGS "-fno-stack-protector-strong")
+         # This is needed as Solaris has a seperate libssp
+         if (SOLARIS)
+-            list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
++            list(APPEND SUPPORTED_LINKER_FLAGS "-fno-stack-protector-strong")
+         endif()
      else (WITH_STACK_PROTECTOR_STRONG)
 -        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
 +        check_c_compiler_flag_ssp("-fno-stack-protector" WITH_STACK_PROTECTOR)
          if (WITH_STACK_PROTECTOR)
 -            list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
 +            list(APPEND SUPPORTED_COMPILER_FLAGS "-fno-stack-protector")
+             # This is needed as Solaris has a seperate libssp
+             if (SOLARIS)
+-                list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector")
++                list(APPEND SUPPORTED_LINKER_FLAGS "-fno-stack-protector")
+             endif()
          endif()
      endif (WITH_STACK_PROTECTOR_STRONG)
-

depends/common/libssh/05-android.patch

@@ -2,26 +2,26 @@
 +++ b/src/misc.c
 @@ -215,6 +215,9 @@
 
- char *ssh_get_user_home_dir(void) {
-   char *szPath = NULL;
+ char *ssh_get_user_home_dir(void)
+ {
 +#ifdef ANDROID
 +  return strdup(getenv("HOME"));
 +#else
-   struct passwd pwd;
-   struct passwd *pwdbuf;
-   char buf[NSS_BUFLEN_PASSWD] = {0};
-@@ -232,6 +235,7 @@
-   }
+     char *szPath = NULL;
+     struct passwd pwd;
+     struct passwd *pwdbuf = NULL;
+@@ -235,6 +238,7 @@
+     szPath = strdup(pwd.pw_dir);
 
-   szPath = strdup(pwd.pw_dir);
+     return szPath;
 +#endif
-
-   return szPath;
- }
-@@ -246,6 +250,17 @@
  }
 
- char *ssh_get_local_username(void) {
+ /* we have read access on file */
+@@ -249,6 +253,17 @@
+
+ char *ssh_get_local_username(void)
+ {
 +#ifdef ANDROID
 +    char *name = NULL;
 +    struct passwd *pwd = NULL;
@@ -34,9 +34,9 @@
 +
 +#else
      struct passwd pwd;
-     struct passwd *pwdbuf;
+     struct passwd *pwdbuf = NULL;
      char buf[NSS_BUFLEN_PASSWD];
-@@ -259,6 +274,7 @@
+@@ -262,6 +277,7 @@
 
      name = strdup(pwd.pw_name);
 

depends/common/libssh/06-windows.patch

@@ -1,18 +1,18 @@
 --- a/include/libssh/sftp.h
 +++ b/include/libssh/sftp.h
-@@ -54,7 +54,7 @@
- #endif /* gid_t */
- #ifdef _MSC_VER
- #ifndef ssize_t
--  typedef _W64 SSIZE_T ssize_t;
-+  typedef intptr_t ssize_t;
- #endif /* ssize_t */
- #endif /* _MSC_VER */
- #endif /* _WIN32 */
+@@ -57,7 +57,7 @@
+ # ifndef _SSIZE_T_DEFINED
+ #  undef ssize_t
+ #  include <BaseTsd.h>
+-   typedef _W64 SSIZE_T ssize_t;
++   typedef intptr_t ssize_t;
+ #  define _SSIZE_T_DEFINED
+ # endif /* _SSIZE_T_DEFINED */
+
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -347,7 +347,7 @@
-   target_compile_options(${LIBSSH_STATIC_LIBRARY} PRIVATE ${DEFAULT_C_COMPILE_FLAGS})
+@@ -372,7 +372,7 @@
+                             -D_GNU_SOURCE)
 
    if (MSVC)
 -    set(OUTPUT_SUFFIX static)

depends/common/libssh/07-windowsstore.patch

@@ -1,6 +1,6 @@
 --- a/CompilerChecks.cmake
 +++ b/CompilerChecks.cmake
-@@ -91,6 +91,7 @@
+@@ -105,6 +105,7 @@
      add_c_compiler_flag("/D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1" SUPPORTED_COMPILER_FLAGS)
      add_c_compiler_flag("/D _CRT_NONSTDC_NO_WARNINGS=1" SUPPORTED_COMPILER_FLAGS)
      add_c_compiler_flag("/D _CRT_SECURE_NO_WARNINGS=1" SUPPORTED_COMPILER_FLAGS)
@@ -104,7 +104,7 @@
  }
 --- a/src/options.c
 +++ b/src/options.c
-@@ -1491,7 +1491,7 @@
+@@ -1667,7 +1667,7 @@
            int key_type;
            ssh_key key;
            ssh_key *bind_key_loc = NULL;

depends/common/libssh/08-static-openssl.patch

@@ -1,6 +1,6 @@
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -76,6 +76,15 @@
+@@ -77,6 +77,15 @@
  endif (WIN32)
 
  if (OPENSSL_FOUND)
@@ -16,7 +16,7 @@
      set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
      check_include_file(openssl/des.h HAVE_OPENSSL_DES_H)
      if (NOT HAVE_OPENSSL_DES_H)
-@@ -101,27 +110,27 @@
+@@ -104,35 +113,35 @@
      check_include_file(openssl/ecdsa.h HAVE_OPENSSL_ECDSA_H)
 
      set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
@@ -31,6 +31,11 @@
 
      set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
 -    set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
++    set(CMAKE_REQUIRED_LIBRARIES ${LIBSSH_LINK_LIBRARIES})
+     check_function_exists(EVP_aes_128_gcm HAVE_OPENSSL_EVP_AES_GCM)
+
+     set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+-    set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
 +    set(CMAKE_REQUIRED_LIBRARIES ${LIBSSH_LINK_LIBRARIES})
      check_function_exists(CRYPTO_THREADID_set_callback HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK)
 
@@ -46,7 +51,12 @@
 
      set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
 -    set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
++    set(CMAKE_REQUIRED_LIBRARIES ${LIBSSH_LINK_LIBRARIES})
+     check_function_exists(EVP_KDF_CTX_new_id HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID)
+
+     set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+-    set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
 +    set(CMAKE_REQUIRED_LIBRARIES ${LIBSSH_LINK_LIBRARIES})
      check_function_exists(RAND_priv_bytes HAVE_OPENSSL_RAND_PRIV_BYTES)
 
-     unset(CMAKE_REQUIRED_INCLUDES)
+     check_function_exists(OPENSSL_ia32cap_loc HAVE_OPENSSL_IA32CAP_LOC)

depends/common/libssh/09-werror.patch

@@ -1,18 +1,18 @@
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -361,6 +361,9 @@
-     return 0;
- }" HAVE_GCC_NARG_MACRO)
+@@ -380,6 +380,9 @@
+     }" HAVE_UNUSED_ATTRIBUTE)
+ endif()
 
 +# Stop treating warnings as errors
 +unset(CMAKE_REQUIRED_FLAGS)
 +
  check_c_source_compiles("
- #include <stdio.h>
- int main(void) {
-@@ -384,9 +387,6 @@
-     return 0;
+ #include <string.h>
+
+@@ -418,9 +421,6 @@
  }" HAVE_GCC_BOUNDED_ATTRIBUTE)
+ endif(OPENBSD)
 
 -# Stop treating warnings as errors
 -unset(CMAKE_REQUIRED_FLAGS)

depends/common/libssh/12-tvos.patch → depends/common/libssh/10-tvos.patch

@@ -13,7 +13,7 @@
  /* socket.c */
 
 @@ -37,9 +42,11 @@
- socket_t ssh_socket_get_fd_in(ssh_socket s);
+ socket_t ssh_socket_get_fd(ssh_socket s);
  #ifndef _WIN32
  int ssh_socket_unix(ssh_socket s, const char *path);
 +#if !defined(TARGET_OS_TV)
@@ -26,7 +26,7 @@
  int ssh_socket_is_open(ssh_socket s);
 --- a/src/client.c
 +++ b/src/client.c
-@@ -44,6 +44,10 @@
+@@ -47,6 +47,10 @@
  #include "libssh/pki.h"
  #include "libssh/kex.h"
 
@@ -37,7 +37,7 @@
  #define set_status(session, status) do {\
          if (session->common.callbacks && session->common.callbacks->connect_status_function) \
              session->common.callbacks->connect_status_function(session->common.callbacks->userdata, status); \
-@@ -536,7 +540,7 @@
+@@ -563,7 +567,7 @@
      session->session_state=SSH_SESSION_STATE_SOCKET_CONNECTED;
      ssh_socket_set_fd(session->socket, session->opts.fd);
      ret=SSH_OK;
@@ -59,8 +59,8 @@
  /**
   * @internal
   *
-@@ -871,7 +875,7 @@
- 	return SSH_OK;
+@@ -832,7 +836,7 @@
+     return SSH_OK;
  }
 
 -#ifndef _WIN32

depends/common/libssh/libssh.sha256

@@ -1 +1 @@
-6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b
+25303c2995e663cd169fdd902bae88106f48242d7e96311d74f812023482c7a5

depends/common/libssh/libssh.txt

@@ -1 +1 @@
-libssh http://mirrors.kodi.tv/build-deps/sources/libssh-0.8.4.tar.xz
+libssh http://mirrors.kodi.tv/build-deps/sources/libssh-0.9.0.tar.xz