From: Gabriel Kerneis <kerneis@pps.jussieu.fr>
Date: Mon, 29 Aug 2011 12:53:22 +0000 (+0000)
Subject: [packages] babel: upstream release 1.1.99.1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d35b102b339b2e18c47c8b1fa488fbe4a0198879;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] babel: upstream release 1.1.99.1

* INCOMPATIBLE CHANGE: default port changed to 6696
* New option: 'diversity'

SVN-Revision: 28119
---

diff --git a/net/babel/Makefile b/net/babel/Makefile
index 41ef1dc92f..08e4914da2 100644
--- a/net/babel/Makefile
+++ b/net/babel/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.99.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
-PKG_MD5SUM:=673a813e7e8fe0818fbb062a896646d2
+PKG_MD5SUM:=e1a801aa48fe26401c29d2152c1a1887
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/babel/files/babeld.config b/net/babel/files/babeld.config
index 52b5833427..d21a22b163 100644
--- a/net/babel/files/babeld.config
+++ b/net/babel/files/babeld.config
@@ -2,13 +2,14 @@ package babeld
 
 config general
 	# option 'multicast_address' 'ff02:0:0:0:0:0:1:6'
-	# option 'port' '6697'
+	# option 'port' '6696'
 	# option 'state_file' '/var/lib/babel-state'
 	# option 'hello_interval' '4'
 	# option 'wired_hello_interval' '20'
 	# Enable  detection of idle networks.  This functonality is
 	# experimental, don't use it unless you know what you are doing.
 	## option 'idle_hello_interval' '0'
+	# option 'diversity' '0,128'
 	# option 'kernel_priority' '0'
 	# Do not use this option unless you know what you are doing, as it can
 	# cause persistent route flapping.
diff --git a/net/babel/files/babeld.init b/net/babel/files/babeld.init
index 3aeb7342f1..321f979ff7 100755
--- a/net/babel/files/babeld.init
+++ b/net/babel/files/babeld.init
@@ -105,6 +105,7 @@ babel_config() {
 	append_parm "$cfg" 'hello_interval' '-h'
 	append_parm "$cfg" 'wired_hello_interval' '-H'
 	append_parm "$cfg" 'idle_hello_interval' '-i'
+	append_parm "$cfg" 'diversity' '-z'
 	append_parm "$cfg" 'kernel_priority' '-k'
 	append_parm "$cfg" 'duplication_priority' '-A'
 	append_parm "$cfg" 'debug' '-d'