From f789112125413c26ce6658be66e86ebecd609b10 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 9 Jun 2015 08:43:56 +0200 Subject: [PATCH 01/14] hnetd: stability improvements Signed-off-by: Steven Barth --- hnetd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hnetd/Makefile b/hnetd/Makefile index 03c2db4..bc69dc8 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hnetd -PKG_SOURCE_VERSION:=86da3551277dc5b21e9382233c3ce66a154ab670 -PKG_VERSION:=2015-05-28-$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=161577ac28741f70794f67539d8994ff0fbd713e +PKG_VERSION:=2015-06-09-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git From a8ec8f672ee2b022ba043d75dc28a3f663c87bf8 Mon Sep 17 00:00:00 2001 From: Markus Stenberg Date: Mon, 15 Jun 2015 11:12:41 +0300 Subject: [PATCH 02/14] miniupnpd: Bump to 1.9.20150609. --- miniupnpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index 1eac6c1..0abe480 100644 --- a/miniupnpd/Makefile +++ b/miniupnpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd -PKG_VERSION:=1.9.20150430 +PKG_VERSION:=1.9.20150609 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=996ccae8aa2535a83ed4618c63080978 +PKG_MD5SUM:=01ee891286683891240a29b7272d790e PKG_MAINTAINER:=Markus Stenberg PKG_LICENSE:=BSD-3-Clause From ebcfa6325402bbd549db860d3223947eac646ff2 Mon Sep 17 00:00:00 2001 From: Axel Neumann Date: Tue, 16 Jun 2015 15:19:15 +0200 Subject: [PATCH 03/14] 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 ab91310..4ac6af4 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_LICENSE:=GPL-2.0 @@ -49,7 +49,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 5d29a1116170c8e9a610ac37fccb0a56a31e5f02 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 17 Jun 2015 10:47:00 +0200 Subject: [PATCH 04/14] hnetd: stability improvements Signed-off-by: Steven Barth --- hnetd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hnetd/Makefile b/hnetd/Makefile index bc69dc8..ec29487 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hnetd -PKG_SOURCE_VERSION:=161577ac28741f70794f67539d8994ff0fbd713e -PKG_VERSION:=2015-06-09-$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=18ee17f3d18a4c0159e53e0716831bf2fbe506cd +PKG_VERSION:=2015-06-17-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git From 2f6ed8abd19d3c60142fb1ca65828e06e7545e0b Mon Sep 17 00:00:00 2001 From: Gabriel Kerneis Date: Wed, 17 Jun 2015 10:56:44 +0200 Subject: [PATCH 05/14] babeld: bump to 1.6.1 16 June 2015: babeld-1.6.1. * Fixed a buffer overflow in zone_equal. This is probably not exploitable, but might cause incorrect routing tables in the presence of source-specific routing. * Added support for defaulting ipv6-subtrees automatically based on the kernel version. * Fixed compilation under musl. Signed-off-by: Gabriel Kerneis --- babeld/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/babeld/Makefile b/babeld/Makefile index 4247d91..ec1d247 100644 --- a/babeld/Makefile +++ b/babeld/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld -PKG_VERSION:=1.6.0 -PKG_RELEASE:=3 +PKG_VERSION:=1.6.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/ -PKG_MD5SUM:=b0602a6124ddafb37225bd1a2d8abb13 +PKG_MD5SUM:=74290f6c3678f314c79bdc0ab99d9f22 PKG_LICENSE:=MIT include $(INCLUDE_DIR)/package.mk From f5eab926d75396d5e95d7b7eebcac34aab30f6f7 Mon Sep 17 00:00:00 2001 From: Bastian Bittorf Date: Wed, 24 Jun 2015 22:57:37 +0200 Subject: [PATCH 06/14] olsrd: bump to version 0.9.0.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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index 362e922..fe4f633 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.6.8 -PKG_RELEASE:=2 +PKG_VERSION:=0.9.0.1 +PKG_RELEASE:=3 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:=feabdd611391dcb30af5795e834cc258 +PKG_MD5SUM:=5dec2c08e7bbec6789af7279e7aafc6c PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=BSD-3-Clause From aeb176d81884c79893d75fbc9986e984cbc62644 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 30 Jun 2015 15:55:54 +0200 Subject: [PATCH 07/14] nat46: fix leak of conntrack entries, fix checksum calculation Signed-off-by: Steven Barth --- nat46/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nat46/Makefile b/nat46/Makefile index f30fbc9..24ecbef 100644 --- a/nat46/Makefile +++ b/nat46/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=nat46 -PKG_VERSION:=4 +PKG_VERSION:=5 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:=ccbba8595d7ccbc2ccb1e7d81b420e9587f07fe5 +PKG_SOURCE_VERSION:=ead1fb8e1b9064f750a128e2d5a05244bb41c01d PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0 From 4d8398f4eca0799f56d4e6a4fcd949d4691ba6c5 Mon Sep 17 00:00:00 2001 From: Bastian Bittorf Date: Wed, 1 Jul 2015 21:33:04 +0200 Subject: [PATCH 08/14] olsrd: for15.05: 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 fe4f633..63e83e6 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:=3 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 4e0fa4f572fbb925fc5d6d8b759202a7f024a14e Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 2 Jul 2015 20:53:38 +0200 Subject: [PATCH 09/14] nat46: fix netfilter references Signed-off-by: Steven Barth --- nat46/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nat46/Makefile b/nat46/Makefile index 24ecbef..65b92c2 100644 --- a/nat46/Makefile +++ b/nat46/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=nat46 -PKG_VERSION:=5 +PKG_VERSION:=6 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:=ead1fb8e1b9064f750a128e2d5a05244bb41c01d +PKG_SOURCE_VERSION:=8ff2ae59ec9840a7b8b45f976c51cae80abe0226 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0 From 8636d0d8946866948b92130198911e90fd48bf6f Mon Sep 17 00:00:00 2001 From: Markus Stenberg Date: Fri, 3 Jul 2015 07:22:40 +0300 Subject: [PATCH 10/14] hnetd: Bump. Some corner case fixes + dncp-07/hncp-07 compatibility (more or less). --- hnetd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hnetd/Makefile b/hnetd/Makefile index ec29487..fe53c21 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hnetd -PKG_SOURCE_VERSION:=18ee17f3d18a4c0159e53e0716831bf2fbe506cd -PKG_VERSION:=2015-06-17-$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=23d6a843f9960c4777ad42909611bec526513d61 +PKG_VERSION:=2015-07-02-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git From dea54bb9f3734f63deabb3432232bd6aaaca3aa5 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 10 Jul 2015 08:26:12 +0200 Subject: [PATCH 11/14] hnetd: fix issues on 32-bit platforms Signed-off-by: Steven Barth --- hnetd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hnetd/Makefile b/hnetd/Makefile index fe53c21..b9fe825 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hnetd -PKG_SOURCE_VERSION:=23d6a843f9960c4777ad42909611bec526513d61 -PKG_VERSION:=2015-07-02-$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9 +PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git From 14204998ea0dbb3216fc81e6bbdae343331b1a34 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 10 Jul 2015 08:26:25 +0200 Subject: [PATCH 12/14] minimalist-pcpproxy: fix uci call in default-script Signed-off-by: Steven Barth --- minimalist-pcproxy/files/minimalist-pcproxy.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minimalist-pcproxy/files/minimalist-pcproxy.defaults b/minimalist-pcproxy/files/minimalist-pcproxy.defaults index a29d7b3..7537f8a 100644 --- a/minimalist-pcproxy/files/minimalist-pcproxy.defaults +++ b/minimalist-pcproxy/files/minimalist-pcproxy.defaults @@ -1,6 +1,6 @@ #!/bin/sh -if [ `uci get -q upnpd.config._pcproxy_configured` = "1" ] +if [ `uci -q get upnpd.config._pcproxy_configured` = "1" ] then exit fi From 0a514a34e7a371df99e7b48d831001130efbdbda Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 15 Jul 2015 08:28:32 +0200 Subject: [PATCH 13/14] miniupnpd: shorten OS name to silence SSDP warnings Signed-off-by: Steven Barth --- miniupnpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index 0abe480..1822926 100644 --- a/miniupnpd/Makefile +++ b/miniupnpd/Makefile @@ -46,7 +46,7 @@ endef define Build/Prepare $(call Build/Prepare/Default) - echo "OpenWrt/$(OPENWRTVERSION)" | tr \(\)\ _ >$(PKG_BUILD_DIR)/os.openwrt + echo "OpenWrt" | tr \(\)\ _ >$(PKG_BUILD_DIR)/os.openwrt endef MAKE_FLAGS += \ From c2871131b4bdd69ad9e658d9ddf295757bd09e4b Mon Sep 17 00:00:00 2001 From: Axel Neumann Date: Fri, 7 Aug 2015 20:42:49 +0200 Subject: [PATCH 14/14] [bmx6] update to latest bmx6-master branch (fix rule corruption on the fly) --- bmx6/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bmx6/Makefile b/bmx6/Makefile index 4ac6af4..425c298 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:=8f26909e8808ed7fab0359afc15a3e44563fbd40 -PKG_VERSION:=r2015061604 +PKG_REV:=2a87b770d3f9c254e3927dc159e2f425f2e0e83a +PKG_VERSION:=r2015080701 PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0