- dropbear: bump version to 2018.76; remove obsolete patch; fix build

archive-patches/dropbear-fix-paths.patch

@@ -1,20 +0,0 @@
---- a/options.h	2011-03-02 14:23:36.000000000 +0100
-+++ b/options.h	2013-11-12 08:50:53.000000000 +0100
-@@ -305,7 +305,7 @@
- 
- /* This is used by the scp binary when used as a client binary. If you're
-  * not using the Dropbear client, you'll need to change it */
--#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
-+#define DROPBEAR_PATH_SSH_PROGRAM "/bin/dbclient"
- 
- /* Whether to log commands executed by a client. This only logs the 
-  * (single) command sent to the server, not what a user did in a 
-@@ -347,7 +347,7 @@
- #define DEFAULT_IDLE_TIMEOUT 0
- 
- /* The default path. This will often get replaced by the shell */
--#define DEFAULT_PATH "/usr/bin:/bin"
-+#define DEFAULT_PATH "/sbin:/bin:/var/bin"
- 
- /* Some other defines (that mostly should be left alone) are defined
-  * in sysoptions.h */

make/archives.mk

@@ -171,7 +171,7 @@ LIBCURL_VER=7.59.0
 $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2:
 	$(WGET) http://curl.haxx.se/download/curl-$(LIBCURL_VER).tar.bz2
 
-DROPBEAR_VER=2017.75
+DROPBEAR_VER=2018.76
 $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2:
 	$(WGET) http://matt.ucc.asn.au/dropbear/releases/dropbear-$(DROPBEAR_VER).tar.bz2
 

make/system-tools.mk

@@ -615,9 +615,9 @@ $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGET_DIR)
 	touch $@
 
 $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGET_DIR)
+	$(REMOVE)/dropbear-$(DROPBEAR_VER)
 	$(UNTAR)/dropbear-$(DROPBEAR_VER).tar.bz2
 	cd $(BUILD_TMP)/dropbear-$(DROPBEAR_VER) && \
-		$(PATCH)/dropbear-fix-paths.patch && \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
@@ -627,8 +627,12 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGET_
 			--disable-loginfunc \
 			--disable-pam \
 			&& \
-		sed -i 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' options.h && \
+		# disable SMALL_CODE define && \
-		sed -i 's:^#define DROPBEAR_SMALL_CODE::' options.h && \
+		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 && \
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1 && \
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR)
 	install -D -m 0755 $(IMAGEFILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear