From 7ce9b255de686e4ea10aab6d119de29302409619 Mon Sep 17 00:00:00 2001
From: Aex Aey <aexaey@gmail.com>
Date: Sat, 27 Aug 2016 02:50:44 +0200
Subject: [PATCH] Use version 2016.74

---
 build                  | 11 ++++++-----
 dropbear-android.patch | 21 ---------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/build b/build
index 04f4e5a..c2a4dde 100755
--- a/build
+++ b/build
@@ -9,10 +9,11 @@ export PATH=$PATH:$HOME/droid/bin
 export ANDROID_NDK=~/droid/android-ndk
 export TARGET=/target
 export PROGRAMS="dropbear dropbearkey dbclient scp"
+export VERSION=2016.74
 
 # Download the latest version of dropbear SSH
-if [ ! -f ~/dropbear-2015.67.tar.bz2 ]; then
-    wget -O ~/dropbear-2015.67.tar.bz2 https://matt.ucc.asn.au/dropbear/dropbear-2015.67.tar.bz2
+if [ ! -f ~/dropbear-$VERSION.tar.bz2 ]; then
+    wget -O ~/dropbear-$VERSION.tar.bz2 https://matt.ucc.asn.au/dropbear/dropbear-$VERSION.tar.bz2
 fi
 
 #if [ ! -f ~/config.sub ]; then
@@ -32,9 +33,9 @@ for ARCH_NAME in mips arm x86; do
 
         # Start each build with a fresh source copy
         cd ~
-        rm -rf ~/dropbear-2015.67
-        tar xjf dropbear-2015.67.tar.bz2
-        cd dropbear-2015.67
+        rm -rf ~/dropbear-$VERSION
+        tar xjf dropbear-$VERSION.tar.bz2
+        cd dropbear-$VERSION
 
 	# Apply the new config.guess and config.sub
 	cp ~/config.guess ~/config.sub .
diff --git a/dropbear-android.patch b/dropbear-android.patch
index f903e4d..e8c6911 100644
--- a/dropbear-android.patch
+++ b/dropbear-android.patch
@@ -41,15 +41,6 @@ diff -rup dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
  
  /* The MOTD file path */
  #ifndef MOTD_FILENAME
-@@ -174,7 +174,7 @@ much traffic. */
-  * PAM challenge/response.
-  * You can't enable both PASSWORD and PAM. */
- 
--#define ENABLE_SVR_PASSWORD_AUTH
-+#undef ENABLE_SVR_PASSWORD_AUTH
- /* PAM requires ./configure --enable-pam */
- //#define ENABLE_SVR_PAM_AUTH
- #define ENABLE_SVR_PUBKEY_AUTH
 @@ -241,7 +241,7 @@ much traffic. */
  /* The default file to store the daemon's process ID, for shutdown
     scripts etc. This can be overridden with the -P flag */
@@ -68,18 +59,6 @@ diff -rup dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
  
  /* Some other defines (that mostly should be left alone) are defined
   * in sysoptions.h */
-diff -rup dropbear-2013.58.orig/scp.c dropbear-2013.58/scp.c
---- dropbear-2013.58.orig/scp.c	2013-07-03 14:57:58.000000000 +0200
-+++ dropbear-2013.58/scp.c	2013-07-03 14:58:43.000000000 +0200
-@@ -992,7 +992,7 @@ sink(int argc, char **argv)
- 			continue;
- 		}
- 		omode = mode;
--		mode |= S_IWRITE;
-+		mode |= S_IWUSR;
- 		if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) {
- bad:			run_err("%s: %s", np, strerror(errno));
- 			continue;
 diff -rup dropbear-2013.58.orig/svr-auth.c dropbear-2013.58/svr-auth.c
 --- dropbear-2013.58.orig/svr-auth.c	2013-07-03 14:57:58.000000000 +0200
 +++ dropbear-2013.58/svr-auth.c	2013-07-03 14:59:46.000000000 +0200