batman-adv: verify tt len does not exceed packet len

[feed/routing.git] / Makefile

diff --git a/Makefile b/Makefile
index 50f8a574efa6d04adf47ad83a296b0fcb75908d4..efe7ed64c74a3759031f289a713ad9f306d6e342 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2012.4.0
-BATCTL_VERSION:=2012.4.0
+PKG_VERSION:=2013.1.0
+BATCTL_VERSION:=2013.1.0
 PKG_RELEASE:=2
-PKG_MD5SUM:=24e922a64a507b146c32c585538407f2
-BATCTL_MD5SUM:=79d5aa796ae8b008a9fa42c27d4da2c1
+PKG_MD5SUM:=fe1fd32eddde1f91575d7a7ec21d5782
+BATCTL_MD5SUM:=767bf36c77c517e1d321169bf9a7fae5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@@ -29,7 +29,7 @@ define KernelPackage/batman-adv
   URL:=http://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
   SUBMENU:=Network Support
-  DEPENDS:=+kmod-lib-crc16 +libc
+  DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
@@ -56,6 +56,7 @@ MAKE_BATMAN_ADV_ARGS += \
        LINUX_VERSION="$(LINUX_VERSION)" \
        CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
        CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
+       CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \
        REVISION="" all
 
 MAKE_BATCTL_ARGS += \
@@ -109,12 +110,11 @@ define Build/Clean
 endef
 
 define KernelPackage/batman-adv/install
-       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto
        $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
        $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
        $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net
-       $(INSTALL_BIN) ./files/etc/hotplug.d/iface/99-batman-adv $(1)/etc/hotplug.d/iface
-       $(INSTALL_BIN) ./files/usr/sbin/batman-adv $(1)/usr/sbin
+       $(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto
        $(BATCTL_INSTALL)
 endef