From 59a4ad8820e8ef395d4c9568d6b62931b5c224e3 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 25 Nov 2011 00:53:19 +0000
Subject: [PATCH] package/dropbear: update to 2011.54

SVN-Revision: 29330
---
 package/dropbear/Makefile                     |  8 ++--
 .../dropbear/patches/110-change_user.patch    |  2 +-
 .../patches/120-openwrt_options.patch         |  2 +-
 .../patches/160-segfault_fwd_localhost.patch  | 40 -------------------
 .../dropbear/patches/200-lcrypt_bsdfix.patch  | 16 ++++----
 5 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 package/dropbear/patches/160-segfault_fwd_localhost.patch

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index f0f3cad6dc..cbfa0ee3da 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
-PKG_VERSION:=0.53.1
-PKG_RELEASE:=6
+PKG_VERSION:=2011.54
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
 	http://matt.ucc.asn.au/dropbear/releases/ \
 	http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
-PKG_MD5SUM:=6b8d901859d9b8a18e2f6bfe0a892a03
+PKG_MD5SUM:=c627ffe09570fad7aa94d8eac2b9320c
 
 PKG_BUILD_PARALLEL:=1
 
diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch
index f003c276cf..55747bc4d7 100644
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,6 +1,6 @@
 --- a/svr-chansession.c
 +++ b/svr-chansession.c
-@@ -881,12 +881,12 @@ static void execchild(void *user_data) {
+@@ -884,12 +884,12 @@ static void execchild(void *user_data) {
  	/* We can only change uid/gid as root ... */
  	if (getuid() == 0) {
  
diff --git a/package/dropbear/patches/120-openwrt_options.patch b/package/dropbear/patches/120-openwrt_options.patch
index d1745e1e8d..42204aa646 100644
--- a/package/dropbear/patches/120-openwrt_options.patch
+++ b/package/dropbear/patches/120-openwrt_options.patch
@@ -56,7 +56,7 @@
  
  /* The MOTD file path */
  #ifndef MOTD_FILENAME
-@@ -185,7 +185,7 @@ much traffic. */
+@@ -192,7 +192,7 @@ much traffic. */
   * note that it will be provided for all "hidden" client-interactive
   * style prompts - if you want something more sophisticated, use 
   * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/
diff --git a/package/dropbear/patches/160-segfault_fwd_localhost.patch b/package/dropbear/patches/160-segfault_fwd_localhost.patch
deleted file mode 100644
index 05ae844c19..0000000000
--- a/package/dropbear/patches/160-segfault_fwd_localhost.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://wl500g.googlecode.com/svn/trunk/dropbear/011-fwd-all-segfault.patch
-https://dev.openwrt.org/ticket/10339
-
---- a/svr-tcpfwd.c
-+++ b/svr-tcpfwd.c
-@@ -210,15 +210,13 @@ static int svr_remotetcpreq() {
- 	tcpinfo->chantype = &svr_chan_tcpremote;
- 	tcpinfo->tcp_type = forwarded;
- 
--	if (!opts.listen_fwd_all 
--			|| (strcmp(tcpinfo->listenaddr, "localhost") == 0) ) {
--        // NULL means "localhost only"
--        tcpinfo->listenaddr = NULL;
--	}
--    else
--    {
--        tcpinfo->listenaddr = bindaddr;
--    }
-+	if (!opts.listen_fwd_all || (strcmp(bindaddr, "localhost") == 0) ) {
-+		// NULL means "localhost only"
-+		tcpinfo->listenaddr = NULL;
-+	}
-+	else {
-+		tcpinfo->listenaddr = bindaddr;
-+	}
- 
- 	ret = listen_tcpfwd(tcpinfo);
- 
---- a/tcp-accept.c
-+++ b/tcp-accept.c
-@@ -80,6 +80,9 @@ static void tcp_acceptor(struct Listener
- 			addr = tcpinfo->listenaddr;
- 			port = tcpinfo->listenport;
- 		}
-+		if (!addr) {
-+			addr = "localhost";
-+		}
- 
- 		buf_putstring(ses.writepayload, addr, strlen(addr));
- 		buf_putint(ses.writepayload, port);
diff --git a/package/dropbear/patches/200-lcrypt_bsdfix.patch b/package/dropbear/patches/200-lcrypt_bsdfix.patch
index bbd6644dd9..1d141780c7 100644
--- a/package/dropbear/patches/200-lcrypt_bsdfix.patch
+++ b/package/dropbear/patches/200-lcrypt_bsdfix.patch
@@ -1,14 +1,14 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \
- 		queue.o \
- 		atomicio.o compat.o  fake-rfc2553.o 
+@@ -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
  
--SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \
-+SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \
- 		svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
- 		svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
- 		svr-tcpfwd.o svr-authpam.o
+-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
+ dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
+ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
+ dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
 @@ -77,7 +77,7 @@ STRIP=@STRIP@
  INSTALL=@INSTALL@
  CPPFLAGS=@CPPFLAGS@
-- 
2.25.1