projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
17b8b81
)
package/dropbear: refresh patches
author
Gabor Juhos
<juhosg@openwrt.org>
Fri, 26 Mar 2010 14:28:14 +0000
(14:28 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Fri, 26 Mar 2010 14:28:14 +0000
(14:28 +0000)
SVN-Revision: 20460
package/dropbear/patches/100-pubkey_path.patch
patch
|
blob
|
history
package/dropbear/patches/110-change_user.patch
patch
|
blob
|
history
package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
patch
|
blob
|
history
package/dropbear/patches/150-dbconvert_standalone.patch
patch
|
blob
|
history
diff --git
a/package/dropbear/patches/100-pubkey_path.patch
b/package/dropbear/patches/100-pubkey_path.patch
index 25a81614caab3ee173f64aeac9a175c9a2657086..c1802f51e519bd28a5169d4e3236680f83f6f537 100644
(file)
--- 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;
}
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;
}
if (authfile == NULL) {
goto out;
}
-@@ -372,26 +376,35 @@
+@@ -372,26 +376,35 @@
static int checkpubkeyperms() {
goto out;
}
goto out;
}
diff --git
a/package/dropbear/patches/110-change_user.patch
b/package/dropbear/patches/110-change_user.patch
index eb1db52db07240f9204f8fc94b120b7608622377..964229bd747d6e7d55c34d958bf80b65f6a96498 100644
(file)
--- 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) {
/* 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 17ea4e75589fe13e21d4a4b2eb520ae3b05274bb..7c4306c368d94dc37e857d97934acea2c20a9036 100644
(file)
--- 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
debug_trace = 1;
break;
#endif
@@
-13,7
+11,7
@@
Index: dropbear-0.52/cli-runopts.c
case 'F':
case 'e':
case '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
#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 4b46ddfdbc195e83d8e33076773efc71790c6a83..3e0b00855230ebcb8589e3b7acddbe494899a8d2 100644
(file)
--- 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_
@@ -5,6 +5,11 @@
#ifndef _OPTIONS_H_
#define _OPTIONS_H_