diff options
| author | Steven Barth <cyrus@openwrt.org> | 2014-08-11 13:02:43 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2014-08-11 13:02:43 +0000 |
| commit | ff6363dc19cd2a02d76f854442415ac7e26f644f (patch) | |
| tree | 10e66e60592da90a5e323b9d5f37af00928191a4 /package/network/services/dropbear/patches | |
| parent | ecba34a3eed3dc747b5e2588dc138dee178ebed2 (diff) | |
| download | upstream-ff6363dc19cd2a02d76f854442415ac7e26f644f.tar.gz upstream-ff6363dc19cd2a02d76f854442415ac7e26f644f.tar.bz2 upstream-ff6363dc19cd2a02d76f854442415ac7e26f644f.zip | |
dropbear: update to 2014.65
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 42131
Diffstat (limited to 'package/network/services/dropbear/patches')
4 files changed, 8 insertions, 8 deletions
diff --git a/package/network/services/dropbear/patches/110-change_user.patch b/package/network/services/dropbear/patches/110-change_user.patch index 48228ead96..44bfe14c3d 100644 --- a/package/network/services/dropbear/patches/110-change_user.patch +++ b/package/network/services/dropbear/patches/110-change_user.patch @@ -1,6 +1,6 @@ --- a/svr-chansession.c +++ b/svr-chansession.c -@@ -889,12 +889,12 @@ static void execchild(void *user_data) { +@@ -902,12 +902,12 @@ static void execchild(void *user_data) { /* We can only change uid/gid as root ... */ if (getuid() == 0) { 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 6de652b4e2..0a5e8ba9a0 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 -@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv) +@@ -312,6 +312,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -11,10 +11,10 @@ case 'F': case 'e': #ifndef ENABLE_USER_ALGO_LIST -@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv) - #ifndef ENABLE_CLI_LOCALTCPFWD - case 'L': - #endif +@@ -329,7 +333,6 @@ void cli_getopts(int argc, char ** argv) + print_version(); + exit(EXIT_SUCCESS); + break; - case 'o': case 'b': next = &dummy; diff --git a/package/network/services/dropbear/patches/140-disable_assert.patch b/package/network/services/dropbear/patches/140-disable_assert.patch index edc7547dd0..0717228ef3 100644 --- a/package/network/services/dropbear/patches/140-disable_assert.patch +++ b/package/network/services/dropbear/patches/140-disable_assert.patch @@ -1,6 +1,6 @@ --- a/dbutil.h +++ b/dbutil.h -@@ -92,7 +92,11 @@ int m_str_to_uint(const char* str, unsig +@@ -101,7 +101,11 @@ int m_str_to_uint(const char* str, unsig #define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL} /* Dropbear assertion */ 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 4eea57d5ce..f4cbdeea44 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 -@@ -318,7 +318,7 @@ be overridden at runtime with -I. 0 disa +@@ -323,7 +323,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 */ |