change -- let's just include all binaries and not as a multi binary; this is less brittle and matches our goal of being NOT brittle better

Author: williamstein

.github/workflows/release.yml

@@ -75,12 +75,11 @@ jobs:
             set -eu
             apk add --no-cache file >/dev/null 2>&1 || true
             echo "== file =="
-            file /out/dropbearmulti || true
+            file /out/dropbear || true
             echo "== ldd =="
-            ldd /out/dropbearmulti || true
+            ldd /out/dropbear || true
             echo "== execute =="
             /out/dropbear -h >/dev/null
-            /out/dropbearkey -h >/dev/null
           '
 
       - name: Upload artifact (tarballs)

README.md

@@ -20,18 +20,17 @@ Extracting one yields:
 
 ```
 dropbear-x86_64-linux-musl/
-  dropbearmulti
-  dropbear -> dropbearmulti
-  dropbearkey -> dropbearmulti
+  dropbear
+  dropbearkey
+  dropbearconvert
+  dbclient
+  scp
 ```
 
-`dropbearmulti` is a multi-call binary. Depending on `argv[0]`, it runs as
-either `dropbear` (the server) or `dropbearkey` (key generator).
-
-To install, copy the three files somewhere on your `PATH`, e.g.:
+To install, copy the two files somewhere on your `PATH`, e.g.:
 
 ```sh
-sudo cp dropbearmulti dropbear dropbearkey /usr/local/bin/
+sudo cp dropbear* /usr/local/bin/
 ```
 
 ## Basic Dropbear Tutorial
@@ -68,3 +67,4 @@ this repo. You can rerun the same process yourself to verify results.
   resource-constrained environments.
 * **Security:** As with any SSH server, configure carefully (authorized\_keys,
   permissions, etc.).
+

build.sh

@@ -60,18 +60,17 @@ LDFLAGS="-static -no-pie" \
   --enable-bundled-libtom \
   --enable-static
 
-echo "Building dropbearmulti…"
-make -j "${JOBS}" PROGRAMS="dropbear dropbearkey" STATIC=1 MULTI=1
+echo "Building dropbear…"
+make -j "${JOBS}" PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" STATIC=1
 
 # --- Package ----------------------------------------------------------------
-[[ -x ./dropbearmulti ]] || { echo "Build failed: dropbearmulti missing"; exit 1; }
-strip ./dropbearmulti || true
+[[ -x ./dropbear ]] || { echo "Build failed: dropbear missing"; exit 1; }
+strip ./drop* dbclient scp || true
 
 # Stage files (with symlinks) inside dropbear-${TARGET}/
 stage_dir="${builddir}/stage/dropbear-${TARGET}"
 mkdir -p "${stage_dir}"
-cp ./dropbearmulti "${stage_dir}/"
-( cd "${stage_dir}" && ln -sf dropbearmulti dropbear && ln -sf dropbearmulti dropbearkey )
+cp ./dropbear* dbclient scp "${stage_dir}/"
 
 # Produce dropbear-${TARGET}.tar.xz in the original working dir
 out_tar="${workdir}/dropbear-${TARGET}.tar.xz"