ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-03 12:34:19 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

dropbear: make ssh compression support configurable

Browse Source 
Adds config option to enable compression support which is usefull
when using a terminal sessions over a slow link. Impact on binary
size is negligible but additional 60 kB (uncompressed) is needed for
a shared zlib library.

Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
(cherry picked from commit a816e1eac7)
This commit is contained in:
Marcin Jurkowski 2017-06-30 13:13:50 +02:00 committed by Jo-Philipp Wich
parent ed4f4f1a8e
commit 9d1bfb8f4d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/network/services/dropbear/Config.in
View File

@ -32,6 +32,15 @@ config DROPBEAR_ECC
Increases binary size by about 23 kB (MIPS). Increases binary size by about 23 kB (MIPS).
config DROPBEAR_ZLIB
bool "Enable compression"
default n
help
Enables compression using shared zlib library.
Increases binary size by about 0.1 kB (MIPS) and requires additional 62 kB (MIPS)
for a shared zlib library.
config DROPBEAR_UTMP config DROPBEAR_UTMP
bool "Utmp support" bool "Utmp support"
default n default n

7
package/network/services/dropbear/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear PKG_NAME:=dropbear
PKG_VERSION:=2017.75 PKG_VERSION:=2017.75
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_CONFIG_DEPENDS:=CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC CONFIG_DROPBEAR_CURVE25519 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC CONFIG_DROPBEAR_CURVE25519 CONFIG_DROPBEAR_ZLIB
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -44,6 +44,7 @@ define Package/dropbear
SECTION:=net SECTION:=net
CATEGORY:=Base system CATEGORY:=Base system
TITLE:=Small SSH2 client/server TITLE:=Small SSH2 client/server
DEPENDS:= +DROPBEAR_ZLIB:zlib
endef endef
define Package/dropbear/description define Package/dropbear/description
@ -74,7 +75,7 @@ CONFIGURE_ARGS += \
--disable-loginfunc \ --disable-loginfunc \
$(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \ $(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \
--disable-pututxline \ --disable-pututxline \
--disable-zlib \ $(if $(CONFIG_DROPBEAR_ZLIB),,--disable-zlib) \
--enable-bundled-libtom --enable-bundled-libtom
TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections