-diff -u -r ../dropbear-2015.68/options.h ./options.h
---- ../dropbear-2015.68/options.h 2015-08-08 08:35:34.000000000 -0400
-+++ ./options.h 2015-11-08 00:49:34.079208221 -0500
-@@ -10,8 +10,10 @@
-
+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 */
-+
-+
#ifndef DROPBEAR_DEFPORT
-#define DROPBEAR_DEFPORT "22"
+#define DROPBEAR_DEFPORT "8022"
#endif
#ifndef DROPBEAR_DEFADDRESS
-@@ -21,13 +23,13 @@
+@@ -21,13 +21,13 @@
/* Default hostkey paths - these can be specified on the command line */
#ifndef DSS_PRIV_FILENAME
#endif
/* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens
-@@ -41,7 +43,7 @@
- * Both of these flags can be defined at once, don't compile without at least
- * one of them. */
- #define NON_INETD_MODE
--#define INETD_MODE
-+#undef INETD_MODE
-
- /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is
- * perhaps 20% slower for pubkey operations (it is probably worth experimenting
-@@ -55,7 +57,7 @@
- #define DROPBEAR_SMALL_CODE
+@@ -52,7 +52,7 @@
+ several kB in binary size however will make the symmetrical ciphers and hashes
+ slower, perhaps by 50%. Recommended for small systems that aren't doing
+ much traffic. */
+-#define DROPBEAR_SMALL_CODE
++#undef DROPBEAR_SMALL_CODE
/* Enable X11 Forwarding - server only */
--#define ENABLE_X11FWD
-+#undef ENABLE_X11FWD
-
- /* Enable TCP Fowarding */
- /* 'Local' is "-L" style (client listening port forwarded via server)
-@@ -193,7 +195,7 @@
+ #define ENABLE_X11FWD
+@@ -198,7 +198,7 @@
/* The MOTD file path */
#ifndef MOTD_FILENAME
#endif
/* Authentication Types - at least one required.
-@@ -206,7 +208,7 @@
- * PAM challenge/response.
- * You can't enable both PASSWORD and PAM. */
+@@ -213,7 +213,7 @@
+ /* This requires crypt() */
+ #ifdef HAVE_CRYPT
-#define ENABLE_SVR_PASSWORD_AUTH
+#undef ENABLE_SVR_PASSWORD_AUTH
+ #endif
/* PAM requires ./configure --enable-pam */
/*#define ENABLE_SVR_PAM_AUTH */
- #define ENABLE_SVR_PUBKEY_AUTH
-@@ -276,7 +278,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
#endif
/* The command to invoke for xauth when using X11 forwarding.
-@@ -294,7 +296,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 */
/* 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
-@@ -336,7 +338,7 @@
+@@ -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 */
~mdw / termux-packages / blobdiff