Termux/termux-packages
1
0
Fork 0
mirror of https://github.com/termux/termux-packages synced 2024-06-16 00:36:38 +00:00
Code Issues Releases Wiki Activity

dropbear: Update from 2015.68 to 2015.71

Browse Source
This commit is contained in:
Fredrik Fornwall 2015-12-03 11:50:40 -05:00
parent 02b1e70ea5
commit 651173d642
3 changed files with 20 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/dropbear/build.sh
View File

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
TERMUX_PKG_DESCRIPTION="Small SSH server and client" TERMUX_PKG_DESCRIPTION="Small SSH server and client"
TERMUX_PKG_DEPENDS="libutil" TERMUX_PKG_DEPENDS="libutil"
TERMUX_PKG_VERSION=2015.68 TERMUX_PKG_VERSION=2015.71
TERMUX_PKG_BUILD_REVISION=1
# Using mirror since main site was down 2015-06-13: # Using mirror since main site was down 2015-06-13:
# TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 # TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SRCURL=https://dropbear.nl/mirror/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://dropbear.nl/mirror/dropbear-${TERMUX_PKG_VERSION}.tar.bz2

59
packages/dropbear/options.h.patch
View File

@ -1,19 +1,16 @@
diff -u -r ../dropbear-2015.68/options.h ./options.h diff -u -r ../dropbear-2015.71/options.h ./options.h
--- ../dropbear-2015.68/options.h 2015-08-08 08:35:34.000000000 -0400 --- ../dropbear-2015.71/options.h 2015-12-03 08:24:00.000000000 -0500
+++ ./options.h 2015-11-08 00:49:34.079208221 -0500 +++ ./options.h 2015-12-03 11:48:59.745257140 -0500
@@ -10,8 +10,10 @@ @@ -11,7 +11,7 @@
/* IMPORTANT: Many options will require "make clean" after changes */ /* IMPORTANT: Many options will require "make clean" after changes */
+
+
#ifndef DROPBEAR_DEFPORT #ifndef DROPBEAR_DEFPORT
-#define DROPBEAR_DEFPORT "22" -#define DROPBEAR_DEFPORT "22"
+#define DROPBEAR_DEFPORT "8022" +#define DROPBEAR_DEFPORT "8022"
#endif #endif
#ifndef DROPBEAR_DEFADDRESS #ifndef DROPBEAR_DEFADDRESS
@@ -21,13 +23,13 @@ @@ -21,13 +21,13 @@
/* Default hostkey paths - these can be specified on the command line */ /* Default hostkey paths - these can be specified on the command line */
#ifndef DSS_PRIV_FILENAME #ifndef DSS_PRIV_FILENAME
@ -30,25 +27,16 @@ diff -u -r ../dropbear-2015.68/options.h ./options.h
#endif #endif
/* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens
@@ -41,7 +43,7 @@ @@ -52,7 +52,7 @@
* Both of these flags can be defined at once, don't compile without at least several kB in binary size however will make the symmetrical ciphers and hashes
* one of them. */ slower, perhaps by 50%. Recommended for small systems that aren't doing
#define NON_INETD_MODE much traffic. */
-#define INETD_MODE -#define DROPBEAR_SMALL_CODE
+#undef INETD_MODE +#undef DROPBEAR_SMALL_CODE
/* 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
/* Enable X11 Forwarding - server only */ /* Enable X11 Forwarding - server only */
-#define ENABLE_X11FWD #define ENABLE_X11FWD
+#undef ENABLE_X11FWD @@ -193,7 +193,7 @@
/* Enable TCP Fowarding */
/* 'Local' is "-L" style (client listening port forwarded via server)
@@ -193,7 +195,7 @@
/* The MOTD file path */ /* The MOTD file path */
#ifndef MOTD_FILENAME #ifndef MOTD_FILENAME
@ -57,16 +45,16 @@ diff -u -r ../dropbear-2015.68/options.h ./options.h
#endif #endif
/* Authentication Types - at least one required. /* Authentication Types - at least one required.
@@ -206,7 +208,7 @@ @@ -208,7 +208,7 @@
* PAM challenge/response.
* You can't enable both PASSWORD and PAM. */
/* This requires crypt() */
#ifdef HAVE_CRYPT
-#define ENABLE_SVR_PASSWORD_AUTH -#define ENABLE_SVR_PASSWORD_AUTH
+#undef ENABLE_SVR_PASSWORD_AUTH +#undef ENABLE_SVR_PASSWORD_AUTH
#endif
/* PAM requires ./configure --enable-pam */ /* PAM requires ./configure --enable-pam */
/*#define ENABLE_SVR_PAM_AUTH */ /*#define ENABLE_SVR_PAM_AUTH */
#define ENABLE_SVR_PUBKEY_AUTH @@ -282,7 +282,7 @@
@@ -276,7 +278,7 @@
/* The default file to store the daemon's process ID, for shutdown /* The default file to store the daemon's process ID, for shutdown
scripts etc. This can be overridden with the -P flag */ scripts etc. This can be overridden with the -P flag */
#ifndef DROPBEAR_PIDFILE #ifndef DROPBEAR_PIDFILE
@ -75,16 +63,7 @@ diff -u -r ../dropbear-2015.68/options.h ./options.h
#endif #endif
/* The command to invoke for xauth when using X11 forwarding. /* The command to invoke for xauth when using X11 forwarding.
@@ -294,7 +296,7 @@ @@ -342,7 +342,7 @@
/* 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
@@ -336,7 +338,7 @@
#define DEFAULT_IDLE_TIMEOUT 0 #define DEFAULT_IDLE_TIMEOUT 0
/* The default path. This will often get replaced by the shell */ /* The default path. This will often get replaced by the shell */

14
packages/dropbear/scp-uses-deprecated-S_IWRITE.patch
View File

@ -1,14 +0,0 @@
S_IWRITE is an obsolete synonym for S_IWUSR, which Android does not define.
diff -u -r ../dropbear-2013.62/scp.c ./scp.c
--- ../dropbear-2013.62/scp.c 2013-12-03 14:39:15.000000000 +0100
+++ ./scp.c 2014-01-05 21:21:37.930812382 +0100
@@ -992,7 +992,7 @@
continue;
}
omode = mode;
- mode |= S_IWRITE;
+ mode |= S_IWUSR;
if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) {
bad: run_err("%s: %s", np, strerror(errno));
continue;