dropbear: Fix path to sftp-server (fixes #2059)

packages/dropbear/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
 TERMUX_PKG_DESCRIPTION="Small SSH server and client"
 TERMUX_PKG_DEPENDS="libutil"
 TERMUX_PKG_VERSION=2017.75
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --disable-utmp --disable-utmpx --disable-wtmp"

packages/dropbear/options.h.patch

@@ -1,6 +1,6 @@
-diff -u -r ../dropbear-2015.71/options.h ./options.h
---- ../dropbear-2015.71/options.h	2015-12-03 08:24:00.000000000 -0500
-+++ ./options.h	2015-12-03 11:48:59.745257140 -0500
+diff -u -r ../dropbear-2017.75/options.h ./options.h
+--- ../dropbear-2017.75/options.h	2017-05-18 16:47:02.000000000 +0200
++++ ./options.h	2018-01-24 11:01:37.013064455 +0100
 @@ -11,7 +11,7 @@
  /* IMPORTANT: Many options will require "make clean" after changes */
  
@@ -36,7 +36,7 @@ diff -u -r ../dropbear-2015.71/options.h ./options.h
  
  /* Enable X11 Forwarding - server only */
  #define ENABLE_X11FWD
-@@ -193,7 +193,7 @@
+@@ -198,7 +198,7 @@
  
  /* The MOTD file path */
  #ifndef MOTD_FILENAME
@@ -45,7 +45,7 @@ diff -u -r ../dropbear-2015.71/options.h ./options.h
  #endif
  
  /* Authentication Types - at least one required.
-@@ -208,7 +208,7 @@
+@@ -213,7 +213,7 @@
  
  /* This requires crypt() */
  #ifdef HAVE_CRYPT
@@ -54,7 +54,7 @@ diff -u -r ../dropbear-2015.71/options.h ./options.h
  #endif
  /* PAM requires ./configure --enable-pam */
  /*#define ENABLE_SVR_PAM_AUTH */
-@@ -282,7 +282,7 @@
+@@ -287,25 +287,25 @@
  /* The default file to store the daemon's process ID, for shutdown
     scripts etc. This can be overridden with the -P flag */
  #ifndef DROPBEAR_PIDFILE
@@ -63,12 +63,33 @@ diff -u -r ../dropbear-2015.71/options.h ./options.h
  #endif
  
  /* The command to invoke for xauth when using X11 forwarding.
-@@ -342,7 +342,7 @@
+  * "-q" for quiet */
+ #ifndef XAUTH_COMMAND
+-#define XAUTH_COMMAND "/usr/bin/xauth -q"
++#define XAUTH_COMMAND "@TERMUX_PREFIX@/bin/xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with
+  * OpenSSH), set the path below. If the path isn't defined, sftp will not
+  * be enabled */
+ #ifndef SFTPSERVER_PATH
+-#define SFTPSERVER_PATH "/usr/libexec/sftp-server"
++#define SFTPSERVER_PATH "@TERMUX_PREFIX@/libexec/sftp-server"
+ #endif
+ 
+ /* This is used by the scp binary when used as a client binary. If you're
+  * not using the Dropbear client, you'll need to change it */
+-#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
++#define DROPBEAR_PATH_SSH_PROGRAM "@TERMUX_PREFIX@/bin/dbclient"
+ 
+ /* Whether to log commands executed by a client. This only logs the 
+  * (single) command sent to the server, not what a user did in a 
+@@ -347,7 +347,7 @@
  #define DEFAULT_IDLE_TIMEOUT 0
  
  /* The default path. This will often get replaced by the shell */
 -#define DEFAULT_PATH "/usr/bin:/bin"
-+#define DEFAULT_PATH "@TERMUX_PREFIX@/bin:/system/bin"
++#define DEFAULT_PATH "@TERMUX_PREFIX@/bin"
  
  /* Some other defines (that mostly should be left alone) are defined
   * in sysoptions.h */