From 43f61a67b835cb2619a4905e7baf23f819665b2f Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 14 May 2022 05:29:56 -0500
Subject: [PATCH] Fix dropbear build (it was looking for $CROSS_COMPILE-gcc not
 -cc, and wasn't returning to the right directory so moving its build before
 the toybox build broke the latter), and update to current dropbear version.

---
 scripts/mkroot.sh     |  2 ++
 scripts/root/dropbear | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh
index 3774cb09..e52f74ba 100755
--- a/scripts/mkroot.sh
+++ b/scripts/mkroot.sh
@@ -145,7 +145,9 @@ echo -e 'root:x:0:\nguest:x:500:\nnobody:x:65534:' > "$ROOT"/etc/group || exit 1
 
 # Build any packages listed on command line
 for i in ${PKG:+plumbing $PKG}; do
+  pushd .
   announce "$i"; PATH="$PKGDIR:$PATH" source $i || die $i
+  popd
 done
 
 # Build static toybox with existing .config if there is one, else defconfig+sh
diff --git a/scripts/root/dropbear b/scripts/root/dropbear
index 75839c34..8d1bed7a 100755
--- a/scripts/root/dropbear
+++ b/scripts/root/dropbear
@@ -7,8 +7,8 @@ echo === download source
 download e6d119755acdf9104d7ba236b1242696940ed6dd \
   http://downloads.sf.net/libpng/zlib-1.2.11.tar.gz
 
-download c3d4fe27fa17ec8217dbedbd33dd73a1ca6cda2c \
-  https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2
+download 9719ea91b5ce8d93ee9a50b5c3a5bcd628736181 \
+  https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.82.tar.bz2
 
 echo === Native build static zlib
 
@@ -19,7 +19,6 @@ CC=${CROSS_COMPILE}cc LD=${CROSS_COMPILE}ld AS=${CROSS_COMPILE}as ./configure &&
 make -j $(nproc) || exit 1
 
 # do _not_ cleanup zlib, we need the files we just built for dropbear
-cd ..
 
 echo === $HOST Native build static dropbear
 
@@ -27,7 +26,7 @@ setupfor dropbear
 # Repeat after me: "autoconf is useless"
 echo 'echo "$@"' > config.sub &&
 ZLIB="$(echo ../zlib*)" &&
-CFLAGS="-I $ZLIB -O2" LDFLAGS="-L $ZLIB" ./configure --enable-static \
+CC="$CROSS_COMPILE"cc CFLAGS="-I $ZLIB -O2" LDFLAGS="-L $ZLIB" ./configure --enable-static \
   --disable-wtmp --host="$(basename "$CROSS_COMPILE" | sed 's/-$//')" &&
 sed -i 's@/usr/bin/dbclient@ssh@' options.h &&
 sed -i 's@\(#define NON_INETD_MODE\) 1@\1 0@' default_options.h &&
@@ -40,10 +39,12 @@ for i in "$ROOT"/bin/{ssh,dropbear,scp,dropbearkey}
 do
   ln -s dropbearmulti $i || exit 1
 done
+# We didn't cleanup zlib
+unset ZLIB
+rm -rf ../zlib-*
+# cleanup dropbear
 cleanup
 
-rm -rf zlib-*
-
 # user root password root, user guest no password
 echo -e 'root:$1$939UTPzb$/PfVYAsF2Hqi/AQ3UBjbK/:::::::\nguest::::::::' > "$ROOT"/etc/shadow &&
 chmod 600 "$ROOT"/etc/shadow &&
-- 
2.39.2