Merge pull request #108 from HRogge/master

Pull OONF v0.8.3

diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile
index d84eeb3dbae31548aa4009d0454daa1cd6505369..115380c14ca333f5ecb680381e99890742a42384 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.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index 72d8721b2b033a5b61d14e9debd8c5986dc756f0..4eb6328ee905a0c5ad4f8b187bbdfd6694f28128 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.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
 PKG_RELEASE:=$(PKG_REV)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile
index 005905e2a46561eb37160039039a8f075b0e24ea..27174413ed2fed68bd463efda711918a7084f5b7 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.8.2
-PKG_REV:=3ff448e33f1ea9dde8c74397028067caf3c65406
+PKG_VERSION:=0.8.3
+PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08
 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;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;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;json_for_networks" \
+              -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;interface;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_socket;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" \
               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
               -D OONF_VERSION:String=$(PKG_VERSION) \
               -D INSTALL_LIB_DIR:Path=lib/oonf \