[libssh] Fix Android build (again) (microsoft#29577)

* Fix libssh patch for Android * Update versions * Update versions
FtZPetruska · Feb 13, 2023 · 45e1df3 · 45e1df3
1 parent b2b3650
commit 45e1df3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ports/libssh/0004-file-permissions-constants.patch b/ports/libssh/0004-file-permissions-constants.patch
@@ -1,12 +1,13 @@
 diff --git a/src/misc.c b/src/misc.c
 --- a/src/misc.c	(revision 9941e89f307e73352d887cac14e4e26b481a0a82)
 +++ b/src/misc.c	(date 1675868320486)
-@@ -24,6 +24,10 @@
+@@ -24,6 +24,11 @@
 
  #include "config.h"
 
 +#ifdef __ANDROID__
 +#define _S_IWRITE S_IWUSR
++#define S_IWRITE S_IWUSR
 +#endif
 +
  #ifndef _WIN32

diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libssh",
   "version": "0.10.4+20221123",
-  "port-version": 2,
+  "port-version": 3,
   "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side",
   "homepage": "https://www.libssh.org/",
   "license": "LGPL-2.1-only",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4414,7 +4414,7 @@
     },
     "libssh": {
       "baseline": "0.10.4+20221123",
-      "port-version": 2
+      "port-version": 3
     },
     "libssh2": {
       "baseline": "1.10.0",

diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e15d10eb435fbd46abba95b50c8d47d2ff166603",
+      "version": "0.10.4+20221123",
+      "port-version": 3
+    },
     {
       "git-tree": "4c7fcb482d4861f5656bfbedcfdab39b67a7813f",
       "version": "0.10.4+20221123",