Merge pull request #197 from ecsv/batman-adv-speedyjoin

batman-adv: Fix speedy join in gateway client mode

diff --git a/ahcpd/Makefile b/ahcpd/Makefile
index 96b84753486399a9f4c0de2fc86edde1893903ea..043c60997fcb86475c3c9dc567d28fd21f3dbd9b 100644 (file)
--- a/ahcpd/Makefile
+++ b/ahcpd/Makefile
@@ -25,7 +25,7 @@ define Package/ahcpd
   TITLE:=Ad-Hoc Configuration Protocol daemon
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6 +ip +librt
+  DEPENDS:=@IPV6 +ip +librt
 endef
 
 define Package/ahcpd/description

diff --git a/alfred/Makefile b/alfred/Makefile
index f2ebe2c64f88d6df81cce4e429c0602e50b371f2..8d651a5cfc4697a6fd05ea2e3bcc83ad0d3011ac 100644 (file)
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +kmod-ipv6 +librt \
+  DEPENDS:= +libc @IPV6 +librt \
          +ALFRED_NEEDS_lua:lua \
          +ALFRED_NEEDS_libgps:libgps
 endef

diff --git a/babeld/Makefile b/babeld/Makefile
index 88a7886cf53629bc041ceead07925f1d16f8fb8b..69fb1e924ea99de6c237266e6078c25675d545e0 100644 (file)
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -25,7 +25,7 @@ define Package/babeld
   TITLE:=A loop-free distance-vector routing protocol
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6
+  DEPENDS:=@IPV6
 endef
 
 define Package/babeld/description

diff --git a/bmx7/Makefile b/bmx7/Makefile
index b626bcec537a4ce3e0e734a2402a0d78ea83d889..b015eeff56449e028f95240f3a2a8fa356823db5 100644 (file)
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -28,12 +28,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
+PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 #PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
 
-PKG_REV:=b2e3f4439a4b676c2b9c13b82706907fabb67059
-PKG_VERSION:=r2016050108
+PKG_REV:=67329597c7444540f91debc74d037d4642161c4d
+PKG_VERSION:=r2016070104
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -82,7 +82,7 @@ endef
 define Package/bmx7-iwinfo
   $(call Package/bmx7/Default)
   DEPENDS:=bmx7 +libiwinfo
-  TITLE:=link characteristics plugin based on libiwinfo
+  TITLE:=link characteristics plugin based on libiwinfo (recommended!)
 endef
 
 define Package/bmx7-topology

diff --git a/bmx7/files/etc/config/bmx7 b/bmx7/files/etc/config/bmx7
index 7593ede634328aeac0b5f21a41bbc02eff5b3ebe..b92f52578ee15ad5126775933a96166046308cc1 100644 (file)
--- a/bmx7/files/etc/config/bmx7
+++ b/bmx7/files/etc/config/bmx7
@@ -16,6 +16,9 @@ config 'bmx7' 'general'
 #config 'plugin'
 #        option 'plugin' 'bmx7_sms.so'
 
+#config 'plugin'
+#        option 'plugin' 'bmx7_iwinfo.so'
+
 
 config 'dev' 'mesh_1'
         option 'dev' 'br-lan'

diff --git a/hnetd/Makefile b/hnetd/Makefile
index ebba0e7317923064efd4197bb47af2e6d48b9329..6390f1375acba07c000787dadb7fb4843225b18d 100644 (file)
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=9ab71adbf0a7ad2a0964e48641b19b016b37df16
-PKG_VERSION:=2016-05-16-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=606d7e904603ad8792ac1a7ba825618df97b5a4e
+PKG_VERSION:=2016-06-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -38,7 +38,7 @@ define Package/hnetd/Default
   TITLE:=HNCP Homenet daemon - $(2)
   URL:=https://github.com/sbyx/hnetd
   DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
-  DEPENDS+=+@IPV6
+  DEPENDS+=@IPV6
   VARIANT:=$1
 endef
 

diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config
index a79dd3c5f48dc64c3886c1ec2767ec89da04b93b..f2a7ab78e7feb3dd1a0898589214f83a52f45c16 100644 (file)
--- a/hnetd/files/hnet.config
+++ b/hnetd/files/hnet.config
@@ -11,6 +11,7 @@ config security security
 
 config pa pa
 #      option ip4prefix 10.0.0.0/8
+#      option ip4mode ifuplink
 #      option ulaprefix fd12:3456:789A::/48
 #      option ulamode off
        option persistent_store /etc/hnet-pa.store

diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 3ca2c2e063cfe7a10f011cb2b33f2096550b33c8..94cd6b8ff1756ffdf6557473359a49c786909b1f 100644 (file)
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -83,6 +83,9 @@ start_service() {
     config_get val pa ip4prefix
     [ -n "$val" ] && procd_append_param command --ip4prefix $val
 
+    config_get val pa ip4mode
+    [ -n "$val" ] && procd_append_param command --ip4mode $val
+
     config_get val pa ulaprefix
     [ -n "$val" ] && procd_append_param command --ulaprefix $val
 

diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile
index d0c2f06a41b5785f62d534c0833626e17b482cd5..36faa8d802e40f1ddc0a64722fcc66c4104b0805 100644 (file)
--- a/minimalist-pcproxy/Makefile
+++ b/minimalist-pcproxy/Makefile
@@ -27,7 +27,7 @@ define Package/minimalist-pcproxy
   CATEGORY:=Network
   TITLE:=Lightweight PCP proxy
   URL:=https://github.com/fingon/minimalist-pcproxy
-  DEPENDS:=+libubox +@IPV6
+  DEPENDS:=+libubox @IPV6
 endef
 
 define Package/minimalist-pcproxy/description

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 1000929e04fc772d086bb0c5f33cc32a034ec493..fbbcfee4828b713da549d6f4b0456db7afcbffae 100644 (file)
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9.20151212
+PKG_VERSION:=2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=86465b35f711ca9982d48b34c094033a
+PKG_MD5SUM:=1c07a215dd9b362e75a9efc05e2fb3b4
 
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=BSD-3-Clause
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/miniupnpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables
+  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libuuid
   TITLE:=Lightweight UPnP IGD, NAT-PMP & PCP daemon
   SUBMENU:=Firewall
   URL:=http://miniupnp.free.fr/
@@ -50,9 +50,10 @@ define Build/Prepare
 endef
 
 MAKE_FLAGS += \
-       TEST=0 \
+       TARGET_OPENWRT=1 TEST=0 \
        LIBS="" \
-       CC="$(TARGET_CC) -DIPTABLES_143 -lip4tc $(if $(CONFIG_IPV6),-lip6tc)" \
+       CC="$(TARGET_CC) -DIPTABLES_143 \
+               -lip4tc $(if $(CONFIG_IPV6),-lip6tc) -luuid" \
        CONFIG_OPTIONS="$(if $(CONFIG_IPV6),--ipv6) --leasefile" \
        -f Makefile.linux \
        miniupnpd

diff --git a/miniupnpd/patches/100-no-ssl.patch b/miniupnpd/patches/100-no-ssl.patch
deleted file mode 100644 (file)
index 343e615..0000000
--- a/miniupnpd/patches/100-no-ssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static
- LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
- endif # ($(TEST),1)
- 
--LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
-+# n/a - we don't enable https server for IGD v2 anyway
-+#LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
- 
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
- 

diff --git a/miniupnpd/patches/101-no-ssl-uuid.patch b/miniupnpd/patches/101-no-ssl-uuid.patch
new file mode 100644 (file)
index 0000000..03a4966
--- /dev/null
+++ b/miniupnpd/patches/101-no-ssl-uuid.patch
@@ -0,0 +1,25 @@
+We do not need to autodetect SSL/UUID; SSL we do not support, UUID we always do.
+
+diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux
+index 2d28126..01daeea 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -153,14 +153,18 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
+ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
+ endif # ($(TEST),1)
+ 
++ifeq ($(TARGET_OPENWRT),)
++# n/a - we don't enable https server for IGD v2 anyway in OpenWrt
+ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
+ 
++# n/a - we hardcodedly support libuuid
+ TEST := $(shell $(PKG_CONFIG) --exists uuid && echo 1)
+ ifeq ($(TEST),1)
+ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l uuid)
+ else
+ $(info please install uuid-dev package / libuuid)
+ endif # ($(TEST),1)
++endif
+ 
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
+ 

diff --git a/miniupnpd/patches/104-always-libuuid.patch b/miniupnpd/patches/104-always-libuuid.patch
new file mode 100644 (file)
index 0000000..d6c0770
--- /dev/null
+++ b/miniupnpd/patches/104-always-libuuid.patch
@@ -0,0 +1,20 @@
+As it turns out, the 'magic' libuuid/bsd uuid check just checks
+outside buildtree altogether for the uuid_generate. So we just
+hardcode it.
+
+--- a/genconfig.sh
++++ b/genconfig.sh
+@@ -367,12 +367,7 @@ case $FW in
+ esac
+ 
+ # UUID API
+-if grep uuid_create /usr/include/uuid.h > /dev/null 2>&1 ; then
+-      echo "#define BSD_UUID" >> ${CONFIGFILE}
+-fi
+-if grep uuid_generate /usr/include/uuid/uuid.h > /dev/null 2>&1 ; then
+-      echo "#define LIB_UUID" >> ${CONFIGFILE}
+-fi
++echo "#define LIB_UUID" >> ${CONFIGFILE}
+ 
+ # set V6SOCKETS_ARE_V6ONLY to 0 if it was not set above
+ if [ -z "$V6SOCKETS_ARE_V6ONLY" ] ; then

diff --git a/ndppd/Makefile b/ndppd/Makefile
index ebc764c2fad8b5e7c611d79290836b4a489362ba..b19edeba6f33dc46140283722fcfb98922b3dfaf 100644 (file)
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -32,7 +32,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
+  DEPENDS:=@IPV6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description

diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index fd99c3e9947f29835d22d3fe9fbe907ae27b5e3b..7d88f5d862ec619a8f9fccc01d361c496310a3bb 100644 (file)
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ohybridproxy
-PKG_SOURCE_VERSION:=b14767d48225aad9ea56ff3e5d6883550e0cf249
-PKG_VERSION:=2015-09-29-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=8a28ae92c97099e771c9ede5641e3782ae809c27
+PKG_VERSION:=2016-06-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index c632158f33c41f935315434e1dffc4de10ad82bf..454bbbe15b6c8614dbdcb8986af3cca3b7bdf48e 100644 (file)
--- a/oonf-dlep-proxy/Makefile
+++ b/oonf-dlep-proxy/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-proxy
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.1
+PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_proxy" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \

diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index b95e75da2b51c4640c809eeab2d07d57b1224567..fbc0435212a49adfeac2e6ed9854670cf92eea19 100644 (file)
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.1
+PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -21,7 +21,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;interface;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \

diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 7f2219c90641e2f92d04849b3aec11841f69ae55..3873c7fefdc4d3adda72a2ff8dd8e087e77fca4e 100644 (file)
--- a/oonf-olsrd2/Makefile
+++ b/oonf-olsrd2/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-olsrd2
-PKG_VERSION:=0.11.7
-PKG_REV:=ef7a89aadbfbe6318b2ad1dc2c32423bd1970918
+PKG_VERSION:=0.12.1
+PKG_REV:=e4cb9a3ab52352ecee0da09ab4ccae32461f5f44
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -31,7 +31,7 @@ CMAKE_OPTIONS=-D OONF_NO_WERROR:Bool=true \
               -D OONF_NO_TESTING:Bool=true \
               -D UCI:Bool=true \
               -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
-              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \

diff --git a/pimbd/Makefile b/pimbd/Makefile
index 55aec74dc390051632e41f713337c5fa17a406f4..9f971071b23434f842f72810d8962109f556f12c 100644 (file)
--- a/pimbd/Makefile
+++ b/pimbd/Makefile
@@ -24,7 +24,7 @@ define Package/pimbd
   CATEGORY:=Network
   TITLE:=PIM BIDIR daemon
   URL:=https://github.com/Oryon/pimbd.git
-  DEPENDS+=+@IPV6
+  DEPENDS+=@IPV6
   DEPENDS+=netifd
 endef