From: Axel Neumann <neumann@cgws.de>
Date: Wed, 11 Jan 2017 00:17:33 +0000 (+0100)
Subject: bmx7: bump src code including mbedtls.2.4.0 support and compatibility CV21
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=308df74448d5bc14d6a8356b42d3b466d9ec9508;p=feed%2Frouting.git

bmx7: bump src code including mbedtls.2.4.0 support and compatibility CV21
---

diff --git a/bmx7/Makefile b/bmx7/Makefile
index e1eb36b..215ec72 100644
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -1,4 +1,3 @@
-#    Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -32,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=379110ae442f80755b5788c527e722f9551b14eb
-PKG_VERSION:=r2016072001
+PKG_REV:=589ee21b49d370056a24d8931d663626608f3c12
+PKG_VERSION:=r2017011101
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -46,8 +45,10 @@ include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS += $(FPIC)
 
+#MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
+MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=MBEDTLS_2_4_0 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
+
 MAKE_ARGS += \
-        EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO" \
         EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib -liwinfo" \
         GIT_REV="$(PKG_REV)" \
         CC="$(TARGET_CC)" \
@@ -61,7 +62,8 @@ define Package/bmx7/Default
   TITLE:=BMX7 layer 3 routing daemon
   URL:=http://bmx6.net/
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-  DEPENDS:=+zlib +libpolarssl +libiwinfo
+#  DEPENDS:=+zlib +libpolarssl +libiwinfo
+  DEPENDS:=+zlib +libmbedtls +libiwinfo
 endef
 
 define Package/bmx7/description