New upstream release of babeld

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.9.1
 
 Package: re6stnet
 Architecture: all
-Depends: ${misc:Depends}, python (>= 2.6.6-3), python (<< 2.8), python-argparse, python-openssl (>= 0.13), openvpn (>= 2.1.3), babeld (= 1.6.0~1.g8950d3b-nxd1), iproute2 | iproute, openssl
+Depends: ${misc:Depends}, python (>= 2.6.6-3), python (<< 2.8), python-argparse, python-openssl (>= 0.13), openvpn (>= 2.1.3), babeld (= 1.6.0-nxd1), iproute2 | iproute, openssl
 Recommends: ${python:Recommends}, logrotate
 Suggests: ndisc6
 Description: resilient, scalable, IPv6 network application

re6st/plib.py

@@ -71,6 +71,12 @@ def router(ip, ip4, src, hello_interval, log_path, state_path,
             '-S', state_path,
             '-I', pidfile,
             '-s',
+            # Force use of ipv6 subtrees because:
+            # - even Linux 2.6.32 has them
+            # - the fallback implementation using a separate table
+            #   is not equivalent, at least not the way we use babeld
+            #   (and we don't need RTA_SRC for ipv4).
+            '-C', 'ipv6-subtrees true',
             '-C', 'default ' + default,
             '-C', 'redistribute local deny',
             '-C', 'redistribute ip %s/%s eq %s' % (ip, n, n)]

re6stnet.spec

@@ -8,7 +8,7 @@ Release:   %(set %ver; echo ${1#*-})
 License:   GPLv2+
 Group:     Applications/Internet
 BuildArch: noarch
-Requires:  babeld = 1.6-git0.8950d3b.nxd1
+Requires:  babeld = 1.6.0-nxd1
 Requires:  iproute
 Requires:  openssl
 Requires:  openvpn