Merge pull request #261 from ecsv/batmand-git

batman: Switch maintainers and get batmand/vis packages from git

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 8c75f318e9001d7853145232060057d664931aae..1b2399fc0ba6fecb8b9dd7c1abf3a0d791ae4621 100644 (file)
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -32,4 +32,4 @@ config KMOD_BATMAN_ADV_NC
 config KMOD_BATMAN_ADV_BATMAN_V
        bool "enable batman v routing algorithm"
        depends on PACKAGE_kmod-batman-adv
-       default n
+       default y

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index a363b3d15b7f984e469fd5f8e884fd78b3120319..10314fa023058921caf4b6c8841886bbaeac24c4 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -11,17 +11,15 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.5
-PKG_RELEASE:=0
+PKG_RELEASE:=1
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/batman-adv
   URL:=https://www.open-mesh.org/

diff --git a/nat46/Makefile b/nat46/Makefile
index 0283dd4f6e55aa9a92b0ae7a396eaa68c3330904..47b5a5bbdeeb1f295bb698db5b9fc575368ea8d3 100644 (file)
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=7
+PKG_VERSION:=8
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8ff2ae59ec9840a7b8b45f976c51cae80abe0226
+PKG_SOURCE_VERSION:=1cd9fc7025906e1825767b05615d2cf02e1528da
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

diff --git a/ndppd/patches/0002-upstream-cast-fix.patch b/ndppd/patches/0002-upstream-cast-fix.patch
new file mode 100644 (file)
index 0000000..555a198
--- /dev/null
+++ b/ndppd/patches/0002-upstream-cast-fix.patch
@@ -0,0 +1,22 @@
+From f19fa4be6ac87032c01f2db57ccb484f83c62604 Mon Sep 17 00:00:00 2001
+From: Daniel Adolfsson <daniel@priv.nu>
+Date: Fri, 8 Apr 2016 13:32:22 +0200
+Subject: [PATCH] Fix a cast so it can be compiled with gcc-6
+
+---
+ src/iface.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/iface.cc b/src/iface.cc
+index 3ce893f..5f165eb 100644
+--- a/src/iface.cc
++++ b/src/iface.cc
+@@ -147,7 +147,7 @@ ptr<iface> iface::open_pfd(const std::string& name)
+         // Bail if it's* not* ND_NEIGHBOR_SOLICIT.
+         BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, ND_NEIGHBOR_SOLICIT, 0, 1),
+         // Keep packet.
+-        BPF_STMT(BPF_RET | BPF_K, -1),
++        BPF_STMT(BPF_RET | BPF_K, (u_int32_t)-1),
+         // Drop packet.
+         BPF_STMT(BPF_RET | BPF_K, 0)
+     };

diff --git a/olsrd/Makefile b/olsrd/Makefile
index cce17b9e2e181ae5cdc2adaf4aa515e5b9b7bd6f..aa5de7a8d7e907c2ec5493cb6ba23349c99cfe99 100644 (file)
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.9.5
+PKG_VERSION:=0.9.6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=v0.9.5
+PKG_SOURCE_VERSION:=v0.9.6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_MD5SUM:=
 

diff --git a/olsrd/files/olsrd.config b/olsrd/files/olsrd.config
index f4ddfd0d06322345cb8c51931857951a058f0695..15ea80a41867e7e5a3f3c4c0de7a3c4676bddd4c 100644 (file)
--- a/olsrd/files/olsrd.config
+++ b/olsrd/files/olsrd.config
@@ -14,10 +14,10 @@ config LoadPlugin
        list Net '0.0.0.0 0.0.0.0'
 
 config LoadPlugin
-       option library 'olsrd_nameservice.so.0.3'
+       option library 'olsrd_nameservice.so.0.4'
 
 config LoadPlugin
-       option library 'olsrd_txtinfo.so.0.1'
+       option library 'olsrd_txtinfo.so.1.1'
        option accept '0.0.0.0'
 
 config Interface

diff --git a/olsrd/files/olsrd6.config b/olsrd/files/olsrd6.config
index 37349e4e1173e1ed7addb22a8542144f86908614..7a03f28de70f15a183a5910661ea3fa7240393d7 100644 (file)
--- a/olsrd/files/olsrd6.config
+++ b/olsrd/files/olsrd6.config
@@ -3,7 +3,7 @@ config olsrd
        #option config_file '/etc/olsrd6.conf'
 
 config LoadPlugin
-       option library 'olsrd_txtinfo.so.0.1'
+       option library 'olsrd_txtinfo.so.1.1'
        option accept '::'
        option port '2007'
 

diff --git a/olsrd/patches/.gitignore b/olsrd/patches/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/olsrd/patches/missing-include-dirs-warning.patch b/olsrd/patches/missing-include-dirs-warning.patch
deleted file mode 100644 (file)
index 2bf0895..0000000
--- a/olsrd/patches/missing-include-dirs-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc olsrd-0.9.5/lib/pud/nmealib/Makefile.inc
---- olsrd-0.9.5_orig/lib/pud/nmealib/Makefile.inc      2016-12-22 12:23:42.175283967 +0100
-+++ olsrd-0.9.5/lib/pud/nmealib/Makefile.inc   2016-12-22 12:24:24.591015066 +0100
-@@ -63,7 +63,7 @@
-                 -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wendif-labels -Wwrite-strings \
-                 -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wshadow -Wformat -Wsequence-point -Wcast-align \
-                 -Wnested-externs -Winline -Wdisabled-optimization -funit-at-a-time -fPIC -ggdb -Wformat=2 -Winit-self \
--                -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
-+                -Wswitch-default -Wswitch-enum -Wconversion -Wdouble-promotion \
-                 -Werror=format-security -Wformat-security -Wformat-y2k -Wredundant-decls -Wundef -Wunreachable-code \
-                 -Wunused-parameter
- 

diff --git a/poprouting/Makefile b/poprouting/Makefile
new file mode 100644 (file)
index 0000000..6a88905
--- /dev/null
+++ b/poprouting/Makefile
@@ -0,0 +1,46 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=prince
+PKG_VERSION:=v0.2
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/prince-$(PKG_VERSION)
+PKG_USE_MIPS16:=0
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=prince-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/gabri94/poprouting.git
+PKG_SOURCE_VERSION:=v0.2
+PKG_SOURCE_SUBDIR:=prince-v0.2
+include $(INCLUDE_DIR)/package.mk
+
+define Package/prince
+       SECTION :=net
+       CATEGORY :=Network
+       SUBMENU :=Routing and Redirection
+       Mantainer :=Gabriele Gemmi <gabriel@autistici.org>
+       TITLE :=PopRouting daemon
+       URL :=https://github.com/gabri94/poprouting
+       MENU :=0
+       DEPENDS := +libjson-c +libpthread
+endef
+
+define Package/prince/description
+Prince is an open source implementation of the PopRouting Algorithm.
+It has been developed as a Google Summer of Code Project in collaboration with Freifunk and the University of Trento.
+
+It work by fetching topology data from a Link State routing demon(OONF, OLSR, OSPF, etc),
+calculating the betweenness centrality using the topology, then using these data
+the timer's value are optimized. Finally the timers are pushed back to the routing demon.
+Currently it only supports OLSRd2 (aka OONF).
+endef
+
+define Package/prince/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/graph-parser_c/build/lib/libgraphcparser.so $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/prince/build/prince_c $(1)/usr/sbin/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/prince/build/libprince_oonf.so $(1)/usr/lib/
+endef
+
+
+$(eval $(call BuildPackage,prince))