olsrd: update to v0.9.6

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

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
-