use dropbear current git

diff --git a/make/archives.mk b/make/archives.mk
index 4eaf70976d1135e158e1cc6116406734ee516678..6e3c9014dd9c7f379327c24bff75091026960cbb 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -67,6 +67,9 @@ $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.xz:
 $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2:
        $(WGET) https://matt.ucc.asn.au/dropbear/releases/dropbear-$(DROPBEAR_VER).tar.bz2
 
+$(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2: | $(HOSTPREFIX)/bin/get-git-archive.sh
+       get-git-archive.sh https://github.com/mkj/dropbear.git master $(notdir $@) $(ARCHIVE)
+
 $(ARCHIVE)/libdvdread-$(LIBDVDREAD_VER).tar.xz:
        $(WGET) http://dvdnav.mplayerhq.hu/releases/libdvdread-$(LIBDVDREAD_VER).tar.xz
 

diff --git a/make/extras.mk b/make/extras.mk
index 8007a30966243dc8d88a81d6414f65205998daaa..432586b8238d0bf1b210f3b292daddfaa24abc2d 100644 (file)
--- a/make/extras.mk
+++ b/make/extras.mk
@@ -41,6 +41,7 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(BUILD_T
        $(UNTAR)/dropbear-$(DROPBEAR_VER).tar.bz2
        pushd $(BUILD_TMP)/dropbear-$(DROPBEAR_VER); \
                ac_cv_lib_z_deflate=yes; \
+               echo '#define DROPBEAR_VERSION "2022.83 git 910af60"' >> localoptions.h && \
                echo '#if !HAVE_CRYPT'                          >> localoptions.h && \
                echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0'     >> localoptions.h && \
                echo '#endif'                                   >> localoptions.h && \

diff --git a/make/versions.mk b/make/versions.mk
index 8dc5ee42176b85f6d9f991ccf2c98d5635e6ba02..efd3132768220f40df3b5d98f11a50e88537f729 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -32,7 +32,8 @@ GCC_VER_HD2 = gcc-13.2.0
 GCC_VER_ARM = gcc-13.2.0
 
 # Dropbear is a relatively small SSH server and client
-DROPBEAR_VER=2022.83
+#DROPBEAR_VER=2022.83
+DROPBEAR_VER = 910af60
 
 # libgd2; an open source code library for the dynamic creation of images
 GD_VER = 2.2.5