From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 26 Mar 2010 14:28:14 +0000 (+0000)
Subject: package/dropbear: refresh patches
X-Git-Tag: reboot~20476
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a346b400c63e5490aad00c39bf121ee5b8e4d68c;p=openwrt%2Fopenwrt.git

package/dropbear: refresh patches

SVN-Revision: 20460
---

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_