From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Tue, 12 Sep 2017 09:21:32 +0000 (+0300)
Subject: libssh: fix path to file 'ssh_config'
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/03b4c3fed0c69f827a2d64b93a3b16fb58f0c56e

libssh: fix path to file 'ssh_config'
---

diff --git a/packages/libssh/build.sh b/packages/libssh/build.sh
index 94a4d18e..4b9821e6 100644
--- a/packages/libssh/build.sh
+++ b/packages/libssh/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.libssh.org/
 TERMUX_PKG_DESCRIPTION="Tiny C SSH library"
 TERMUX_PKG_VERSION=0.7.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://git.libssh.org/projects/libssh.git/snapshot/libssh-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=ff914e2ec6596badec453efaa63ef68c82c60074466f951167a4c60e49903336
 TERMUX_PKG_DEPENDS="openssl"
diff --git a/packages/libssh/fix-ssh_config-path.patch b/packages/libssh/fix-ssh_config-path.patch
new file mode 100644
index 00000000..e5292e96
--- /dev/null
+++ b/packages/libssh/fix-ssh_config-path.patch
@@ -0,0 +1,12 @@
+diff -uNr libssh-0.7.5/src/options.c libssh-0.7.5.mod/src/options.c
+--- libssh-0.7.5/src/options.c	2017-04-13 17:33:04.000000000 +0300
++++ libssh-0.7.5.mod/src/options.c	2017-09-12 11:16:10.212992453 +0300
+@@ -1232,7 +1232,7 @@
+       goto out;
+   }
+   if (filename == NULL) {
+-      r = ssh_config_parse_file(session, "/etc/ssh/ssh_config");
++      r = ssh_config_parse_file(session, "@TERMUX_PREFIX@/etc/ssh/ssh_config");
+   }
+ 
+ out: