fix target dropbear for HD2

diff --git a/make/extras.mk b/make/extras.mk
index 9fef8368810de12a81f32c510bff9d80370ee813..8e0c429bc52e6a2f1a4d26dc4c70b1b9e83ffe11 100644 (file)
--- a/make/extras.mk
+++ b/make/extras.mk
@@ -32,18 +32,35 @@ $(D)/inadyn-mt: $(ARCHIVE)/inadyn-mt.v.$(INADYN_VER).tar.gz | $(BUILD_TMP)/extra
        $(REMOVE)/inadyn-mt.v.$(INADYN_VER)
 #      $(TOUCH)
 
-$(D)/dropbear: $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(BUILD_TMP)/extras
+$(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(BUILD_TMP)/extras
        $(START_BUILD)
        $(UNTAR)/dropbear-$(DROPBEAR_VER).tar.bz2
        pushd $(BUILD_TMP)/dropbear-$(DROPBEAR_VER); \
+               ac_cv_lib_z_deflate=yes; \
+               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 && \
+               # fix PATH define && \
+               sed -i 's|^\(#define DEFAULT_PATH\).*|\1 "/sbin:/bin:/var/bin"|' default_options.h && \
+               # remove /usr prefix && \
+               sed -i 's|/usr/|/|g' default_options.h && \
                $(BUILDENV) \
                ./configure $(CONFIGURE_OPTS) \
                        --prefix=/var \
-                       --mandir=/.remove && \
+                       --mandir=/.remove \
+                       --disable-pututxline \
+                       --disable-wtmp \
+                       --disable-wtmpx \
+                       --disable-loginfunc \
+                       --disable-pam \
+                       --disable-harden \
+                       --enable-bundled-libtom && \
                $(MAKE) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" MULTI=1 SCPPROGRESS=1 && \
                $(MAKE) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" MULTI=1 SCPPROGRESS=1 install DESTDIR=$(BUILD_TMP)/extras
                $(TARGET)-strip $(BUILD_TMP)/extras/var/bin/dropbearmulti
        $(REMOVE)/extras/.remove
-       $(REMOVE)/dropbear-$(DROPBEAR_VER)
+#      $(REMOVE)/dropbear-$(DROPBEAR_VER)
 #      $(TOUCH)