From e0de429982408d599141ab51615bc60844b33dd4 Mon Sep 17 00:00:00 2001 From: Bastian Bittorf Date: Fri, 12 Jun 2015 21:34:01 +0200 Subject: [PATCH 1/6] olsrd: bump to new release 0.9.0 see: https://lists.olsr.org/pipermail/olsr-dev/2015-June/007598.html "Everyone using olsrd v1 is strongly urged to upgrade, especially people using Smart-Gateway. In this release the Multi-Smart-Gateway additions are declared stable. Also, Smart-Gateway timeouts are now implemented, which is a major fix to the Smart-Gateway system. These timeouts were missing ever since its first implementation." (Ferry Huberts) --- olsrd/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index 32c5be5..adaebac 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,14 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.6.6.2 -PKG_RELEASE:=4 +PKG_VERSION:=0.9.0 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 +PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9 -PKG_MD5SUM:=e4e04bb033cffd99b3be397fa9063a54 +PKG_MD5SUM:=65376afff4fc4963fcaf1aa0ad8185d4 PKG_BUILD_PARALLEL:=1 +PKG_LICENSE:=BSD-3-Clause include $(INCLUDE_DIR)/package.mk From c8aa5cd2713a2940ee08cf12ff34609fa251fd52 Mon Sep 17 00:00:00 2001 From: Axel Neumann Date: Tue, 16 Jun 2015 15:19:15 +0200 Subject: [PATCH 2/6] bmx6: bump to latest (auto tunOutTimeout) version --- bmx6/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bmx6/Makefile b/bmx6/Makefile index 7154484..d215f1b 100644 --- a/bmx6/Makefile +++ b/bmx6/Makefile @@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git #PKG_SOURCE_URL:=git://bmx6.net/bmx6.git PKG_SOURCE_URL:=git://github.com/axn/bmx6.git -PKG_REV:=b6107880b5460625b7ce9359dbeac0cfe863f58c -PKG_VERSION:=r2015060501 +PKG_REV:=8f26909e8808ed7fab0359afc15a3e44563fbd40 +PKG_VERSION:=r2015061604 PKG_RELEASE:=4 PKG_SOURCE_VERSION:=$(PKG_REV) @@ -48,7 +48,7 @@ TARGET_CFLAGS += $(FPIC) MAKE_ARGS += \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ - REVISION_VERSION="$(PKG_REV)" \ + GIT_REV="$(PKG_REV)" \ CC="$(TARGET_CC)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ STRIP="/bin/false" \ From 212640f11df243df26c307ac50caabc4f0578bb0 Mon Sep 17 00:00:00 2001 From: Bastian Bittorf Date: Thu, 18 Jun 2015 20:11:01 +0200 Subject: [PATCH 3/6] olsrd: 14.07-branch: bump to new version 0.9.1 (bugfixes) We did a bug-fix release of olsrd v1. It fixes a route-recalculation issue and at least one crash. Everyone using olsrd v1 is strongly urged to upgrade, especially people using Smart-Gateway. The shortlog is appended. 0.9.0.1 ------------------------------------------------------------------- Ferry Huberts (3): neighbors: signal link changes when deleting a neighbor jsoninfo: do not output smart-gateway info when not enabled. txtinfo: do not output smart-gateway info when not enabled. Henning Rogge (2): Update version after release of v0.9.0 Release v0.9.0.1 --- olsrd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index adaebac..dbc52eb 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.9.0 -PKG_RELEASE:=5 +PKG_VERSION:=0.9.1 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9 -PKG_MD5SUM:=65376afff4fc4963fcaf1aa0ad8185d4 +PKG_MD5SUM:=5dec2c08e7bbec6789af7279e7aafc6c PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=BSD-3-Clause From 4a5132cc66f6afff4f750b270a1ce383cd15ce5d Mon Sep 17 00:00:00 2001 From: Bastian Bittorf Date: Fri, 19 Jun 2015 13:20:36 +0200 Subject: [PATCH 4/6] olsrd: Makefile version typo: 0.9.1 -> 0.9.0.1 --- olsrd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index dbc52eb..b877a72 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.9.1 +PKG_VERSION:=0.9.0.1 PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From 00e5c8184168f4b4c4f2750367854c5fb78cd48f Mon Sep 17 00:00:00 2001 From: Bastian Bittorf Date: Wed, 1 Jul 2015 21:34:13 +0200 Subject: [PATCH 5/6] olsrd: for14.07: 0.9.0.1 -> 0.9.0.2 (bugfix-release) --- olsrd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index b877a72..aef3ec5 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.9.0.1 +PKG_VERSION:=0.9.0.2 PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.9 -PKG_MD5SUM:=5dec2c08e7bbec6789af7279e7aafc6c +PKG_MD5SUM:=8a2675c33990706cc291b59934024783 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=BSD-3-Clause From 87d52fc40d0fc2946a2d4e1bca7a6082ec3a0f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Gaul?= Date: Sat, 3 Jan 2015 15:24:46 +0100 Subject: [PATCH 6/6] [olsrd] adapt init script for 0.6.8 (PingCmd option) olsrd 0.6.8 accepts a PingCmd parameter as of http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=0a26c52af3941eb9060b193cae5552f8d13fd28e. The PingCmd is a string of the form "ping -c 1 -q %s" where %s is replaced with an IP. This commit allows for '%' characters in an olsrd option. --- olsrd/files/olsrd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init index 887a4a2..5bee27a 100644 --- a/olsrd/files/olsrd.init +++ b/olsrd/files/olsrd.init @@ -38,7 +38,7 @@ validate_varname() { validate_olsrd_option() { local str="$1" - [ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z./|:_-]*}" ] && return 1 + [ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z.%/|:_-]*}" ] && return 1 return 0 }