浏览代码

dropbear: bump to version 2015.67

Switch sed options around since defaults have changed.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Gustavo Zacarias 10 年之前
父节点
当前提交
1e48670167
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      package/dropbear/dropbear.hash
  2. 4 4
      package/dropbear/dropbear.mk

+ 2 - 2
package/dropbear/dropbear.hash

@@ -1,2 +1,2 @@
-# From https://matt.ucc.asn.au/dropbear/releases/SHA1SUM.asc
-sha1	793f5f1bb465b3c55e795d607932e8b21c130e95	dropbear-2014.66.tar.bz2
+# From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
+sha256	7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5	dropbear-2015.67.tar.bz2

+ 4 - 4
package/dropbear/dropbear.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DROPBEAR_VERSION = 2014.66
+DROPBEAR_VERSION = 2015.67
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
@@ -30,14 +30,14 @@ define DROPBEAR_ENABLE_REVERSE_DNS
 endef
 
 define DROPBEAR_BUILD_SMALL
-	$(SED) 's:.*\(#define DROPBEAR_SMALL_CODE\).*:\1:' $(@D)/options.h
 	$(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
 endef
 
 define DROPBEAR_BUILD_FEATURED
+	$(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
 	$(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_SHA2_256_HMAC\).*:\1:' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_SHA2_512_HMAC\).*:\1:' $(@D)/options.h
+	$(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
+	$(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
 endef
 
 define DROPBEAR_DISABLE_STANDALONE