diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-12-04 16:40:17 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-12-04 16:40:17 +0000 |
| commit | 9e355444a65cbde194e6a404d16d09eab3fe2fd6 (patch) | |
| tree | 02fcab26904b3841225a61337ada19d5705ab52e /package/network/services/dropbear/Makefile | |
| parent | 4f78be25e1dcfdd16cbd3e58e2dc8d2e6f8dfa24 (diff) | |
| download | upstream-9e355444a65cbde194e6a404d16d09eab3fe2fd6.tar.gz upstream-9e355444a65cbde194e6a404d16d09eab3fe2fd6.tar.bz2 upstream-9e355444a65cbde194e6a404d16d09eab3fe2fd6.zip | |
dropbear: update to 2012.55 and refresh patches
Upstream has a few code cleanups, more eagerly burns sensitive memory and
includes the fix for CVE-2012-0920. Full changelog:
https://matt.ucc.asn.au/dropbear/CHANGES
Local changes:
- Removed PKG_MULTI which is no longer in options.h (even before 2011.54)
- Merged DO_HOST_LOOKUP into 120-openwrt_options.patch
- Removed LD from make opts (now included in TARGET_CONFIGURE_OPTS)
- Removed 400-CVE-2012-0920.patch which is included in 2012.55
Signed-off-by: Catalin Patulea <cat@vv.carleton.ca>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 34496
Diffstat (limited to 'package/network/services/dropbear/Makefile')
| -rw-r--r-- | package/network/services/dropbear/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index cd5b368256..b7708b1d05 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2011.54 +PKG_VERSION:=2012.55 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ -PKG_MD5SUM:=c627ffe09570fad7aa94d8eac2b9320c +PKG_MD5SUM:=8c784baec3054cdb1bb4bfa792c87812 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE @@ -72,21 +72,13 @@ CONFIGURE_ARGS += \ TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections -define Build/Configure - $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h - $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h - $(call Build/Configure/Default) -endef - define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - LD="$(TARGET_CC)" \ PROGRAMS="dropbear dbclient dropbearkey scp" \ MULTI=1 SCPPROGRESS=1 +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - LD="$(TARGET_CC)" \ PROGRAMS="dropbearconvert" endef |