From baa8b69303a3f05b75fa183d62847bc97160cd2e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 4 Mar 2011 11:22:26 -0300 Subject: [PATCH] dropbear: bump to version 0.53.1 Changelog @ http://matt.ucc.asn.au/dropbear/CHANGES Since some build-time defaults have changed that make dropbear somewhat bigger we introduce a new option to optimize dropbear for size. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/dropbear/Config.in | 10 ++++++++++ package/dropbear/dropbear.mk | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index e47ba45457..4bc0e3e1b0 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -13,3 +13,13 @@ config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS Disable reverse DNS lookups on connection. This can be handy on systems without working DNS, as connections otherwise stall until DNS times out. + +config BR2_PACKAGE_DROPBEAR_SMALL + bool "optimize for size" + default y + depends on BR2_PACKAGE_DROPBEAR + help + Compile dropbear for the smallest possible binary size. + + Tradeoffs are slower hashes and ciphers, and disabling of the + blowfish cipher. diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index b07cb6333c..fab7c96789 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ############################################################# -DROPBEAR_VERSION = 0.52 +DROPBEAR_VERSION = 0.53.1 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_DEPENDENCIES = zlib @@ -27,10 +27,25 @@ define DROPBEAR_DISABLE_REVERSE_DNS $(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h endef +define DROPBEAR_BUILD_SMALL + echo "#define DROPBEAR_SMALL_CODE" >>$(@D)/options.h + echo "#define NO_FAST_EXPTMOD" >>$(@D)/options.h +endef + +define DROPBEAR_BUILD_FEATURED + echo "#define DROPBEAR_BLOWFISH" >>$(@D)/options.h +endef + ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS endif +ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL +else +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED +endif + define DROPBEAR_INSTALL_TARGET_CMDS $(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear for f in $(DROPBEAR_TARGET_BINS); do \ -- 2.30.2