From 4bc42cd533b79fdc7e8a542acdda51d1eee01932 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <rasm@oceanscan-mst.com>
Date: Thu, 5 Feb 2015 13:44:46 +0000
Subject: [PATCH] dropbear: upgraded to v2015.67.

---
 rules/dropbear/default.bash                   |  6 ++--
 .../dropbear/patches/000-cryptlib-link.patch  | 30 -------------------
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 rules/dropbear/patches/000-cryptlib-link.patch

diff --git a/rules/dropbear/default.bash b/rules/dropbear/default.bash
index a1fe5fb..9190084 100644
--- a/rules/dropbear/default.bash
+++ b/rules/dropbear/default.bash
@@ -1,6 +1,6 @@
 version=\
 (
-    '2012.55'
+    '2015.67'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '8c784baec3054cdb1bb4bfa792c87812'
+    'e967e320344cd4bfebe321e3ab8514d6'
 )
 
 maintainer=\
@@ -43,7 +43,7 @@ configure()
         --target="$cfg_target_canonical" \
         --host="$cfg_target_canonical" \
         --build="$cfg_host_canonical" \
-        --with-zlib="$cfg_dir_toolchain"
+        --with-zlib="$cfg_dir_toolchain_sysroot/usr"
 }
 
 build()
diff --git a/rules/dropbear/patches/000-cryptlib-link.patch b/rules/dropbear/patches/000-cryptlib-link.patch
deleted file mode 100644
index 79194a5..0000000
--- a/rules/dropbear/patches/000-cryptlib-link.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index cec35f1..46a9365 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
- 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
- 		listener.h fake-rfc2553.h
- 
--dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
-+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) 
- dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
- dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
- dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
-@@ -169,14 +169,14 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
- # multi-binary compilation.
- MULTIOBJS=
- ifeq ($(MULTI),1)
--	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 
-+	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) 
- 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
- endif
- 
- dropbearmulti: multilink 
- 
- multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
--	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@
- 
- multilink: multibinary $(addprefix link, $(PROGRAMS))
-