project: Update for 0.10.6 merge.

ShiftMediaProject · Apr 6, 2024 · b261f56 · b261f56
1 parent 3781913
commit b261f56
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -1,5 +1,5 @@
 diff --git a/src/connect.c b/src/connect.c
-index 57e37e63..6f5440b2 100644
+index 15cae644..840f3c36 100644
 --- a/src/connect.c
 +++ b/src/connect.c
 @@ -37,6 +37,7 @@
@@ -101,10 +101,10 @@ index e516c331..6de564a1 100644
  static int _ssh_init(unsigned constructor) {
 
 diff --git a/src/libgcrypt.c b/src/libgcrypt.c
-index 2e44a53c..474fa4f8 100644
+index f410d997..ebb0e90b 100644
 --- a/src/libgcrypt.c
 +++ b/src/libgcrypt.c
-@@ -198,12 +198,12 @@ static int blowfish_set_key(struct ssh_cipher_struct *cipher, void *key, void *I
+@@ -145,12 +145,12 @@ static int blowfish_set_key(struct ssh_cipher_struct *cipher, void *key, void *I
  }
 
  static void blowfish_encrypt(struct ssh_cipher_struct *cipher, void *in,
@@ -119,7 +119,7 @@ index 2e44a53c..474fa4f8 100644
    gcry_cipher_decrypt(cipher->key[0], out, len, in, len);
  }
  #endif /* WITH_BLOWFISH_CIPHER */
-@@ -469,12 +469,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
+@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
  }
 
  static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in,
@@ -135,10 +135,10 @@ index 2e44a53c..474fa4f8 100644
  }
 
 diff --git a/src/misc.c b/src/misc.c
-index 7c478a77..cc2110dc 100644
+index 7081f12a..a4a1e2ed 100644
 --- a/src/misc.c
 +++ b/src/misc.c
-@@ -51,8 +51,10 @@
+@@ -52,8 +52,10 @@
 
  #ifdef _WIN32
 
@@ -151,7 +151,7 @@ index 7c478a77..cc2110dc 100644
  #endif
 
  #include <winsock2.h> // Must be the first to include
-@@ -106,6 +108,9 @@
+@@ -110,6 +112,9 @@
  #ifdef _WIN32
  char *ssh_get_user_home_dir(void)
  {
@@ -161,15 +161,15 @@ index 7c478a77..cc2110dc 100644
    char tmp[PATH_MAX] = {0};
    char *szPath = NULL;
 
-@@ -120,6 +125,7 @@ char *ssh_get_user_home_dir(void)
+@@ -124,6 +129,7 @@ char *ssh_get_user_home_dir(void)
    }
 
    return NULL;
 +#endif
  }
 
  /* we have read access on file */
-@@ -176,22 +182,26 @@ int ssh_gettimeofday(struct timeval *__p, void *__t)
+@@ -180,22 +186,26 @@ int ssh_gettimeofday(struct timeval *__p, void *__t)
 
  char *ssh_get_local_username(void)
  {

diff --git a/SMP/libssh.vcxproj b/SMP/libssh.vcxproj
@@ -16,7 +16,7 @@
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlibd.lib;libgcryptd.lib;libgpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlibd.lib;libgcryptd.lib;libgpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -62,7 +62,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlibd.lib;libgcryptd.lib;libgpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlibd.lib;libgcryptd.lib;libgpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -107,7 +107,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlibd.lib;gcryptd.lib;gpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlibd.lib;gcryptd.lib;gpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -153,7 +153,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlibd.lib;gcryptd.lib;gpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlibd.lib;gcryptd.lib;gpg-errord.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -200,7 +200,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -246,7 +246,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -291,7 +291,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlib.lib;gcrypt.lib;gpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlib.lib;gcrypt.lib;gpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -337,7 +337,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -383,7 +383,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlib.lib;gcrypt.lib;gpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlib.lib;gcrypt.lib;gpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -429,7 +429,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib.lib;libgcrypt.lib;libgpg-error.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>

diff --git a/SMP/libssh/libssh_version.h b/SMP/libssh/libssh_version.h
@@ -29,7 +29,7 @@
 /* libssh version */
 #define LIBSSH_VERSION_MAJOR  0
 #define LIBSSH_VERSION_MINOR  10
-#define LIBSSH_VERSION_MICRO  5
+#define LIBSSH_VERSION_MICRO  6
 
 #define LIBSSH_VERSION_INT SSH_VERSION_INT(LIBSSH_VERSION_MAJOR, \
                                            LIBSSH_VERSION_MINOR, \

diff --git a/SMP/libssh_winrt.vcxproj b/SMP/libssh_winrt.vcxproj
@@ -16,7 +16,7 @@
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlibd_winrt.lib;libgcryptd_winrt.lib;libgpg-errord_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlibd_winrt.lib;libgcryptd_winrt.lib;libgpg-errord_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -62,7 +62,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlibd_winrt.lib;libgcryptd_winrt.lib;libgpg-errord_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlibd_winrt.lib;libgcryptd_winrt.lib;libgpg-errord_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -107,7 +107,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlibd_winrt.lib;gcryptd_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlibd_winrt.lib;gcryptd_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -153,7 +153,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlibd_winrt.lib;gcryptd_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlibd_winrt.lib;gcryptd_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -200,7 +200,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -246,7 +246,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
     </ClCompile>
     <Lib>
       <AdditionalOptions>/IGNORE:4006,4221,4264  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>mkdir "$(OutDir)"\include
@@ -291,7 +291,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlib_winrt.lib;gcrypt_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlib_winrt.lib;gcrypt_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -337,7 +337,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -383,7 +383,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>zlib_winrt.lib;gcrypt_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;zlib_winrt.lib;gcrypt_winrt.lib;gpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
@@ -429,7 +429,7 @@ del /f /q $(OutDir)\licenses\libssh.txt
       <DisableSpecificWarnings>4146;4244;4267;4018;4028;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;libzlib_winrt.lib;libgcrypt_winrt.lib;libgpg-error_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>