From c7c4ed5fbefc64a2b8e79da47b0c675de8fee656 Mon Sep 17 00:00:00 2001
From: Trammell Hudson <hudson@trmm.net>
Date: Thu, 25 Oct 2018 16:00:33 -0400
Subject: [PATCH] bump dropbear version to 2018.76

---
 modules/dropbear               |  4 ++--
 patches/dropbear-2016.74.patch | 16 ---------------
 patches/dropbear-2018.76.patch | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 18 deletions(-)
 delete mode 100644 patches/dropbear-2016.74.patch
 create mode 100644 patches/dropbear-2018.76.patch

diff --git a/modules/dropbear b/modules/dropbear
index b9e4f4a1..2bffcf98 100644
--- a/modules/dropbear
+++ b/modules/dropbear
@@ -1,11 +1,11 @@
 # dropbear is a tiny ssh client
 modules-$(CONFIG_DROPBEAR) += dropbear
 
-dropbear_version := 2016.74
+dropbear_version := 2018.76
 dropbear_dir := dropbear-$(dropbear_version)
 dropbear_tar := dropbear-$(dropbear_version).tar.bz2
 dropbear_url := http://matt.ucc.asn.au/dropbear/releases/$(dropbear_tar)
-dropbear_hash := 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891
+dropbear_hash := f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
 
 dropbear_configure := ./configure \
 	$(CROSS_TOOLS) \
diff --git a/patches/dropbear-2016.74.patch b/patches/dropbear-2016.74.patch
deleted file mode 100644
index f9d69260..00000000
--- a/patches/dropbear-2016.74.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --recursive -u ../clean/dropbear-2016.74/svr-chansession.c ./dropbear-2016.74/svr-chansession.c
---- ../clean/dropbear-2016.74/svr-chansession.c	2016-07-21 11:17:09.000000000 -0400
-+++ dropbear-2016.74/svr-chansession.c	2017-09-19 11:01:34.889121503 -0400
-@@ -925,10 +925,10 @@
- 		if ((setgid(ses.authstate.pw_gid) < 0) ||
- 			(initgroups(ses.authstate.pw_name, 
- 						ses.authstate.pw_gid) < 0)) {
--			dropbear_exit("Error changing user group");
-+			//dropbear_exit("Error changing user group");
- 		}
- 		if (setuid(ses.authstate.pw_uid) < 0) {
--			dropbear_exit("Error changing user");
-+			//dropbear_exit("Error changing user");
- 		}
- 	} else {
- 		/* ... but if the daemon is the same uid as the requested uid, we don't
diff --git a/patches/dropbear-2018.76.patch b/patches/dropbear-2018.76.patch
new file mode 100644
index 00000000..8f4d6008
--- /dev/null
+++ b/patches/dropbear-2018.76.patch
@@ -0,0 +1,37 @@
+diff -u --recursive clean/dropbear-2018.76/configure dropbear-2018.76/configure
+--- clean/dropbear-2018.76/configure	2018-02-27 09:25:13.000000000 -0500
++++ dropbear-2018.76/configure	2018-10-25 15:55:37.785000000 -0400
+@@ -3302,7 +3302,7 @@
+ 	fi # non-static
+ 	# stack protector. -strong is good but only in gcc 4.9 or later
+ 	OLDCFLAGS="$CFLAGS"
+-	TESTFLAGS="-fstack-protector-strong"
++	TESTFLAGS=""
+ 	CFLAGS="$CFLAGS $TESTFLAGS"
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -3321,7 +3321,7 @@
+ else
+ 
+ 			CFLAGS="$OLDCFLAGS"
+-			TESTFLAGS="-fstack-protector --param=ssp-buffer-size=4"
++			TESTFLAGS=""
+ 			CFLAGS="$CFLAGS $TESTFLAGS"
+ 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+diff -u --recursive clean/dropbear-2018.76/svr-chansession.c dropbear-2018.76/svr-chansession.c
+--- clean/dropbear-2018.76/svr-chansession.c	2018-02-27 09:25:12.000000000 -0500
++++ dropbear-2018.76/svr-chansession.c	2018-10-25 15:57:18.002000000 -0400
+@@ -938,10 +938,10 @@
+ 		if ((setgid(ses.authstate.pw_gid) < 0) ||
+ 			(initgroups(ses.authstate.pw_name, 
+ 						ses.authstate.pw_gid) < 0)) {
+-			dropbear_exit("Error changing user group");
++			//dropbear_exit("Error changing user group");
+ 		}
+ 		if (setuid(ses.authstate.pw_uid) < 0) {
+-			dropbear_exit("Error changing user");
++			//dropbear_exit("Error changing user");
+ 		}
+ 	} else {
+ 		/* ... but if the daemon is the same uid as the requested uid, we don't