diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-03-26 14:28:14 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-03-26 14:28:14 +0000 |
| commit | 8a93e26fd167001ae5b4723602ce9096dde9ed42 (patch) | |
| tree | 5d1de09482c903cb3dee6811c19e7a91cb4e6cce /package | |
| parent | b097e81ce2091823e635608d61f5ebc8610cf827 (diff) | |
| download | upstream-8a93e26fd167001ae5b4723602ce9096dde9ed42.tar.gz upstream-8a93e26fd167001ae5b4723602ce9096dde9ed42.tar.bz2 upstream-8a93e26fd167001ae5b4723602ce9096dde9ed42.zip | |
package/dropbear: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20460 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
4 files changed, 13 insertions, 20 deletions
diff --git a/package/dropbear/patches/100-pubkey_path.patch b/package/dropbear/patches/100-pubkey_path.patch index 25a81614ca..c1802f51e5 100644 --- a/package/dropbear/patches/100-pubkey_path.patch +++ b/package/dropbear/patches/100-pubkey_path.patch @@ -1,7 +1,6 @@ -diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c ---- dropbear-0.52.orig/svr-authpubkey.c 2009-04-08 00:32:16.000000000 +0200 -+++ dropbear-0.52/svr-authpubkey.c 2009-04-08 00:44:11.000000000 +0200 -@@ -209,17 +209,21 @@ +--- a/svr-authpubkey.c ++++ b/svr-authpubkey.c +@@ -209,17 +209,21 @@ static int checkpubkey(unsigned char* al goto out; } @@ -34,7 +33,7 @@ diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c if (authfile == NULL) { goto out; } -@@ -372,26 +376,35 @@ +@@ -372,26 +376,35 @@ static int checkpubkeyperms() { goto out; } diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch index eb1db52db0..964229bd74 100644 --- a/package/dropbear/patches/110-change_user.patch +++ b/package/dropbear/patches/110-change_user.patch @@ -1,8 +1,6 @@ -Index: dropbear-0.52/svr-chansession.c -=================================================================== ---- dropbear-0.52.orig/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700 -+++ dropbear-0.52/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700 -@@ -852,12 +852,12 @@ +--- a/svr-chansession.c ++++ b/svr-chansession.c +@@ -852,12 +852,12 @@ static void execchild(void *user_data) { /* We can only change uid/gid as root ... */ if (getuid() == 0) { diff --git a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch index 17ea4e7558..7c4306c368 100644 --- a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch @@ -1,8 +1,6 @@ -Index: dropbear-0.52/cli-runopts.c -=================================================================== ---- dropbear-0.52.orig/cli-runopts.c 2008-04-22 17:29:49.000000000 -0700 -+++ dropbear-0.52/cli-runopts.c 2008-04-22 17:29:50.000000000 -0700 -@@ -271,6 +271,10 @@ +--- a/cli-runopts.c ++++ b/cli-runopts.c +@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -13,7 +11,7 @@ Index: dropbear-0.52/cli-runopts.c case 'F': case 'e': case 'c': -@@ -282,7 +286,6 @@ +@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv) #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif diff --git a/package/dropbear/patches/150-dbconvert_standalone.patch b/package/dropbear/patches/150-dbconvert_standalone.patch index 4b46ddfdbc..3e0b008552 100644 --- a/package/dropbear/patches/150-dbconvert_standalone.patch +++ b/package/dropbear/patches/150-dbconvert_standalone.patch @@ -1,7 +1,5 @@ -Index: dropbear-0.52/options.h -=================================================================== ---- dropbear-0.52.orig/options.h 2008-04-22 17:29:49.000000000 -0700 -+++ dropbear-0.52/options.h 2008-04-22 17:29:50.000000000 -0700 +--- a/options.h ++++ b/options.h @@ -5,6 +5,11 @@ #ifndef _OPTIONS_H_ #define _OPTIONS_H_ |