3 files changed, 13 insertions, 28 deletions
diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in
index 3e6783b64..890900ee5 100644
--- a/package/dropbear/patches/patch-Makefile_in
+++ b/package/dropbear/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
---- dropbear-2012.55.orig/Makefile.in	2012-02-23 14:47:05.000000000 +0100
-+++ dropbear-2012.55/Makefile.in	2012-10-05 17:24:16.000000000 +0200
+--- dropbear-2013.58.orig/Makefile.in	2013-04-18 16:58:14.000000000 +0200
++++ dropbear-2013.58/Makefile.in	2013-08-13 14:33:37.000000000 +0200
 @@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
  		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
  		listener.h fake-rfc2553.h
@@ -9,28 +9,21 @@
  dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
  dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
  dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
-@@ -75,9 +75,8 @@ AR=@AR@
+@@ -75,10 +75,9 @@ AR=@AR@
  RANLIB=@RANLIB@
  STRIP=@STRIP@
  INSTALL=@INSTALL@
 -CPPFLAGS=@CPPFLAGS@
 -CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
 -LIBS+=@LIBS@
+-LDFLAGS=@LDFLAGS@
 +CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)
 +LIBS+=@LIBS@ @CRYPTLIB@
- LDFLAGS=@LDFLAGS@
++LDFLAGS+=@LDFLAGS@
  
  EXEEXT=@EXEEXT@
-@@ -159,7 +158,7 @@ dropbearkey: $(dropbearkeyobjs)
- dropbearconvert: $(dropbearconvertobjs)
  
- dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
--	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
-+	$(CC) $(LDFLAGS) -static-libgcc -o $@$(EXEEXT) $($@objs) $(LIBS)
- 
- # scp doesn't use the libs so is special.
- scp: $(SCPOBJS)  $(HEADERS) Makefile
-@@ -169,14 +168,14 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
+@@ -169,7 +168,7 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
  # multi-binary compilation.
  MULTIOBJS=
  ifeq ($(MULTI),1)
@@ -39,11 +32,3 @@
  	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
  endif
  
- dropbearmulti: multilink 
- 
- multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
--	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -static-libgcc -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
- 
- multilink: multibinary $(addprefix link, $(PROGRAMS))
- 
diff --git a/package/dropbear/patches/patch-cli-runopts_c b/package/dropbear/patches/patch-cli-runopts_c
index b2f98da81..5a8297b87 100644
--- a/package/dropbear/patches/patch-cli-runopts_c
+++ b/package/dropbear/patches/patch-cli-runopts_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-0.53.1.orig/cli-runopts.c	2011-03-02 14:23:35.000000000 +0100
-+++ dropbear-0.53.1/cli-runopts.c	2011-08-02 20:03:12.000000000 +0200
-@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv)
+--- dropbear-2013.58.orig/cli-runopts.c	2013-04-18 16:58:14.000000000 +0200
++++ dropbear-2013.58/cli-runopts.c	2013-08-13 14:29:15.000000000 +0200
+@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv)
  					debug_trace = 1;
  					break;
  #endif
@@ -11,8 +11,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 +					break;
  				case 'F':
  				case 'e':
- 				case 'c':
-@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv)
+ #ifndef ENABLE_USER_ALGO_LIST
+@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv)
  #ifndef ENABLE_CLI_LOCALTCPFWD
  				case 'L':
  #endif
diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h
index 68a8b2a1b..88a081624 100644
--- a/package/dropbear/patches/patch-options_h
+++ b/package/dropbear/patches/patch-options_h
@@ -1,7 +1,7 @@
 diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
 --- dropbear-2013.58.orig/options.h	2013-04-18 16:58:14.000000000 +0200
-+++ dropbear-2013.58/options.h	2013-04-29 14:28:47.000000000 +0200
-@@ -247,7 +247,7 @@
++++ dropbear-2013.58/options.h	2013-08-13 14:29:15.000000000 +0200
+@@ -247,7 +247,7 @@ much traffic. */
  /* The command to invoke for xauth when using X11 forwarding.
   * "-q" for quiet */
  #ifndef XAUTH_COMMAND