diff --git a/make/target-tools.mk b/make/target-tools.mk index 22b81eeb..06909e54 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1063,23 +1063,23 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ + --disable-lastlog \ --disable-pututxline \ --disable-wtmp \ --disable-wtmpx \ --disable-loginfunc \ --disable-pam \ - --disable-zlib \ --disable-harden \ --enable-bundled-libtom \ ; \ # Ensure that dropbear doesn't use crypt() when it's not available; \ - echo '#if !HAVE_CRYPT' >> localoptions.h; \ - echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h; \ - echo '#endif' >> localoptions.h; \ + echo '#if !HAVE_CRYPT' >> localoptions.h; \ + echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h; \ + echo '#endif' >> localoptions.h; \ # disable SMALL_CODE define; \ - sed -i 's|^\(#define DROPBEAR_SMALL_CODE\).*|\1 0|' default_options.h; \ + echo '#define DROPBEAR_SMALL_CODE 0' >> localoptions.h; \ # fix PATH define; \ - sed -i 's|^\(#define DEFAULT_PATH\).*|\1 "/sbin:/bin:/var/bin"|' default_options.h; \ + echo '#define DEFAULT_PATH "/sbin:/bin:/var/bin"' >> localoptions.h; \ # remove /usr prefix; \ sed -i 's|/usr/|/|g' default_options.h; \ $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1; \ diff --git a/skel-root/general/scripts/dropbear.init b/skel-root/general/scripts/dropbear.init index a7e536f1..26be09cc 100644 --- a/skel-root/general/scripts/dropbear.init +++ b/skel-root/general/scripts/dropbear.init @@ -5,7 +5,7 @@ ETCDIR=/etc/dropbear genkeys() { - for keytype in dss rsa; do + for keytype in dss rsa ecdsa; do keyfile=$ETCDIR/dropbear_${keytype}_host_key test -e $keyfile && continue /bin/dropbearkey -t $keytype -f $keyfile