diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-15 11:24:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-15 11:24:09 +0000 |
| commit | 64c23711ea10de53c49b4a16f1e1fefbcc23c56c (patch) | |
| tree | b4aa16bbccc9725288af48bcabe9a73fd8a7cd08 /package/network/services/dropbear/patches | |
| parent | 708bbe9382ab5833228d3cac407e72034e768c6d (diff) | |
| download | upstream-64c23711ea10de53c49b4a16f1e1fefbcc23c56c.tar.gz upstream-64c23711ea10de53c49b4a16f1e1fefbcc23c56c.tar.bz2 upstream-64c23711ea10de53c49b4a16f1e1fefbcc23c56c.zip | |
dropbear: update version to 2015.71
Update dropbear to version 2015.71, released on 3 Dec 2015.
Refresh patches.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
SVN-Revision: 48243
Diffstat (limited to 'package/network/services/dropbear/patches')
4 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch index 87118ef4ba..f020208090 100644 --- a/package/network/services/dropbear/patches/120-openwrt_options.patch +++ b/package/network/services/dropbear/patches/120-openwrt_options.patch @@ -70,7 +70,7 @@ /* The MOTD file path */ #ifndef MOTD_FILENAME -@@ -231,7 +231,7 @@ Homedir is prepended unless path begins +@@ -237,7 +237,7 @@ Homedir is prepended unless path begins * note that it will be provided for all "hidden" client-interactive * style prompts - if you want something more sophisticated, use * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/ diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch index edb29093ae..bf1641b8bf 100644 --- a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch @@ -1,6 +1,6 @@ --- a/cli-runopts.c +++ b/cli-runopts.c -@@ -315,6 +315,10 @@ void cli_getopts(int argc, char ** argv) +@@ -284,6 +284,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -11,7 +11,7 @@ case 'F': case 'e': #ifndef ENABLE_USER_ALGO_LIST -@@ -332,7 +336,6 @@ void cli_getopts(int argc, char ** argv) +@@ -301,7 +305,6 @@ void cli_getopts(int argc, char ** argv) print_version(); exit(EXIT_SUCCESS); break; diff --git a/package/network/services/dropbear/patches/500-set-default-path.patch b/package/network/services/dropbear/patches/500-set-default-path.patch index f6880ef77d..648c391ced 100644 --- a/package/network/services/dropbear/patches/500-set-default-path.patch +++ b/package/network/services/dropbear/patches/500-set-default-path.patch @@ -1,6 +1,6 @@ --- a/options.h +++ b/options.h -@@ -341,7 +341,7 @@ be overridden at runtime with -I. 0 disa +@@ -347,7 +347,7 @@ be overridden at runtime with -I. 0 disa #define DEFAULT_IDLE_TIMEOUT 0 /* The default path. This will often get replaced by the shell */ diff --git a/package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch b/package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch index ee6d273344..f6453a4626 100644 --- a/package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch +++ b/package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch @@ -1,6 +1,6 @@ --- a/svr-runopts.c +++ b/svr-runopts.c -@@ -475,6 +475,7 @@ void load_all_hostkeys() { +@@ -488,6 +488,7 @@ void load_all_hostkeys() { m_free(hostkey_file); } @@ -8,7 +8,7 @@ #ifdef DROPBEAR_RSA loadhostkey(RSA_PRIV_FILENAME, 0); #endif -@@ -486,6 +487,7 @@ void load_all_hostkeys() { +@@ -499,6 +500,7 @@ void load_all_hostkeys() { #ifdef DROPBEAR_ECDSA loadhostkey(ECDSA_PRIV_FILENAME, 0); #endif |