From da88988ca1b0a36d3eb7ae584593c4ab8c11ccfb Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Wed, 23 Nov 2022 14:35:02 +0900
Subject: [PATCH] libssh: Bump to 0.10.4

---
 packages/libssh/build.sh        | 15 ++++++++++-----
 packages/libssh/fix-paths.patch | 18 +++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/libssh/build.sh b/packages/libssh/build.sh
index 5cf1d43d92..58612d36fe 100644
--- a/packages/libssh/build.sh
+++ b/packages/libssh/build.sh
@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://www.libssh.org/
 TERMUX_PKG_DESCRIPTION="Tiny C SSH library"
-TERMUX_PKG_LICENSE="LGPL-2.0"
+TERMUX_PKG_LICENSE="LGPL-2.1, BSD 2-Clause"
+TERMUX_PKG_LICENSE_FILE="BSD, COPYING"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.9.6
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://www.libssh.org/files/${TERMUX_PKG_VERSION:0:3}/libssh-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b
+_MAJOR_VERSION=0.10
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4
+TERMUX_PKG_SRCURL=https://www.libssh.org/files/${_MAJOR_VERSION}/libssh-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_SHA256=07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d
 TERMUX_PKG_DEPENDS="openssl, zlib"
 TERMUX_PKG_BREAKS="libssh-dev"
 TERMUX_PKG_REPLACES="libssh-dev"
@@ -13,3 +14,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DHAVE_ARGP_H=OFF
 -DWITH_GSSAPI=OFF
 "
+
+termux_step_pre_configure() {
+	CPPFLAGS+=" -D__USE_GNU"
+}
diff --git a/packages/libssh/fix-paths.patch b/packages/libssh/fix-paths.patch
index 47c6be6bf5..5a19920ac9 100644
--- a/packages/libssh/fix-paths.patch
+++ b/packages/libssh/fix-paths.patch
@@ -34,12 +34,12 @@ diff -uNr libssh-0.9.0/src/options.c libssh-0.9.0.mod/src/options.c
 diff -uNr libssh-0.9.0/src/socket.c libssh-0.9.0.mod/src/socket.c
 --- libssh-0.9.0/src/socket.c	2019-06-27 11:34:16.000000000 +0300
 +++ libssh-0.9.0.mod/src/socket.c	2019-06-29 17:26:21.278467080 +0300
-@@ -838,7 +838,7 @@
- void
- ssh_execute_command(const char *command, socket_t in, socket_t out)
- {
--    const char *args[] = {"/bin/sh", "-c", command, NULL};
-+    const char *args[] = {"@TERMUX_PREFIX@/bin/sh", "-c", command, NULL};
-     /* Prepare /dev/null socket for the stderr redirection */
-     int devnull = open("/dev/null", O_WRONLY);
-     if (devnull == -1) {
+@@ -908,7 +908,7 @@
+     if (shell == NULL || shell[0] == '\0') {
+         /* Fall back to bash. There are issues with dash or
+          * whatever people tend to link to /bin/sh */
+-        shell = "/bin/bash";
++        shell = "@TERMUX_PREFIX@/bin/bash";
+     }
+     args[0] = shell;
+