Bump Dropbear SSH to 2024.85 (#35)

Author: viren-nadkarni

ssh-server/Dockerfile

@@ -1,13 +1,10 @@
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
 RUN apt-get update
 RUN apt-get install -y autoconf automake gcc git gzip libssl-dev libz-dev make openssl
 
 RUN cd /tmp; \
-    git clone https://github.com/mkj/dropbear; \
+    git clone https://github.com/mkj/dropbear -b DROPBEAR_2024.85; \
     cd dropbear; \
     ./configure --enable-static; \
-    make
-
-RUN apt-get install openssh-client
-RUN which scp
+    make PROGRAMS="dropbear scp" SCPPROGRESS=1

ssh-server/Makefile

@@ -11,6 +11,6 @@ amd64 arm64:
 	docker run --platform linux/$@ -it --rm -d --name $(CONTAINER_NAME) $(IMAGE_NAME) bash
 	docker cp $(CONTAINER_NAME):/tmp/dropbear/dropbear $@/dropbear
 	chmod +x $@/dropbear
-	docker cp $(CONTAINER_NAME):/usr/bin/scp $@/scp
+	docker cp $(CONTAINER_NAME):/tmp/dropbear/scp $@/scp
 	chmod +x $@/scp
 	docker stop $(CONTAINER_NAME)

ssh-server/README.md

@@ -4,7 +4,15 @@ To cross-build on x86\_64, following QEMU packages are required:
 sudo apt-get install -y gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static qemu-system-i386
 ```
 
-The following files exist to maintain backward compatibility in released LocalStack versions.
+Then you can simply run this to re-build the binaries:
 
-- [./dropbear](./dropbear)
-- [./scp](./dropbear)
+```
+make all
+```
+
+> [!NOTE]
+> The following files are used by older versions of LocalStack where the download URL is hardcoded.
+> Removing them will break these releases.
+> 
+> - [./dropbear](./dropbear)
+> - [./scp](./dropbear)