From 4db96dcc31c2cddb831e0d3b8be56ce97060f04b Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 9 Jul 2015 11:32:56 +0200 Subject: [PATCH 01/10] nat46: Remove unnecessary 464xlat wan forwarding firewall rule Remove unnecessary 464xlat wan forwarding firewall rule with as outgoing interface the 464xlat interface and as destination the local IPv6 464xlat address as it's never hit due to statefull firewall Signed-off-by: Hans Dedecker --- nat46/files/464xlat.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh index 8154f7f..c549cc5 100755 --- a/nat46/files/464xlat.sh +++ b/nat46/files/464xlat.sh @@ -67,16 +67,6 @@ proto_464xlat_setup() { json_add_string src_ip $ip6addr json_add_string target ACCEPT json_close_object - json_add_object "" - json_add_string type rule - json_add_string family inet6 - json_add_string proto all - json_add_string direction out - json_add_string dest "$zone" - json_add_string src "$zone" - json_add_string dest_ip $ip6addr - json_add_string target ACCEPT - json_close_object json_close_array proto_close_data From 7939337aa7d11bced0b598f41e6db488a43832b0 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 10 Jul 2015 08:26:12 +0200 Subject: [PATCH 02/10] 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 c1a09857dce3eb312ddcf5fde85f0b57edc6c621 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 10 Jul 2015 08:26:25 +0200 Subject: [PATCH 03/10] 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 34b6cc7dff35a05825e1ff2faa7ad643db944a4f Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 15 Jul 2015 08:28:32 +0200 Subject: [PATCH 04/10] 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 40cad6868b7148e2360a81db20d5d7f9acae94cf Mon Sep 17 00:00:00 2001 From: Axel Neumann Date: Tue, 21 Jul 2015 14:24:09 +0200 Subject: [PATCH 05/10] initial BMX7 package --- bmx7/Makefile | 156 ++++++++++++++++++++++++++++++++++ bmx7/files/etc/config/bmx6 | 48 +++++++++++ bmx7/files/etc/init.d/bmx6 | 41 +++++++++ bmx7/patches/001-json-c.patch | 13 +++ 4 files changed, 258 insertions(+) create mode 100644 bmx7/Makefile create mode 100644 bmx7/files/etc/config/bmx6 create mode 100755 bmx7/files/etc/init.d/bmx6 create mode 100644 bmx7/patches/001-json-c.patch diff --git a/bmx7/Makefile b/bmx7/Makefile new file mode 100644 index 0000000..e611ffa --- /dev/null +++ b/bmx7/Makefile @@ -0,0 +1,156 @@ +# Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# The full GNU General Public License is included in this distribution in +# the file called "COPYING". +# +# Contibutors: +# Axel Neumann, Simó Albert i Beltran, Pau Escrich +# + + +include $(TOPDIR)/rules.mk + +PKG_NAME:=bmx7 + +PKG_SOURCE_PROTO:=git + +#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git +PKG_SOURCE_URL:=git://github.com/axn/bmx6.git +#PKG_SOURCE_URL:=file:///home/neumann/bmx6/bmx6.git + +PKG_REV:=2865a2fe21e6dae00b43b3b91ba0625af9757c09 +PKG_VERSION:=r2015072121 +PKG_RELEASE:=4 +PKG_LICENSE:=GPL-2.0 + +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) + +include $(INCLUDE_DIR)/package.mk + +TARGET_CFLAGS += $(FPIC) + +MAKE_ARGS += \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DDEBUG_MALLOC" \ + EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib " \ + GIT_REV="$(PKG_REV)" \ + CC="$(TARGET_CC)" \ + INSTALL_DIR="$(PKG_INSTALL_DIR)" \ + STRIP="/bin/false" \ + build_all + +define Package/bmx7/Default + SECTION:=net + CATEGORY:=Network + SUBMENU:=Routing and Redirection + TITLE:=BMX7 layer 3 routing daemon + URL:=http://bmx6.net/ + MAINTAINER:=Axel Neumann + DEPENDS:=+zlib +libpolarssl +kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun @!bmx6 +endef + +define Package/bmx7/description +BMX7 layer 3 routing daemon supporting IPv6, and IPv4 over IPv6 +endef + +define Package/bmx7 + $(call Package/bmx7/Default) + MENU:=1 +endef + +define Package/bmx7-uci-config + $(call Package/bmx7/Default) + DEPENDS:=bmx7 +libuci + TITLE:=configuration plugin based on uci (recommended!) +endef + +define Package/bmx7-json + $(call Package/bmx7/Default) + DEPENDS:=bmx7 +libjson-c + TITLE:=json plugin based on json-c +endef + +define Package/bmx7-sms + $(call Package/bmx7/Default) + DEPENDS:=bmx7 + TITLE:=sms plugin +endef + +#define Package/bmx7-quagga +# $(call Package/bmx7/Default) +# DEPENDS:=bmx7 +qmp-quagga @BROKEN +# TITLE:=bmx7 quagga plugin to redistribute/export routes (needs manet/bmx patched quagga 0.99.21) +#endef + +define Package/bmx7-table + $(call Package/bmx7/Default) + DEPENDS:=bmx7 + TITLE:=bmx7 table plugin to automatically announce routing-table routes via ip6ip tunnels +endef + +define Build/Configure + mkdir -p $(PKG_INSTALL_DIR) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) +endef + +define Package/bmx7/install + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6 +endef + +define Package/bmx7-uci-config/conffiles +/etc/config/bmx6 +endef + +define Package/bmx7-uci-config/install + $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so + $(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6 + $(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6 +endef + +define Package/bmx7-json/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_json/bmx6_json.so $(1)/usr/lib/bmx6_json.so +endef + +define Package/bmx7-sms/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_sms/bmx6_sms.so $(1)/usr/lib/bmx6_sms.so +endef + +define Package/bmx7-table/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_table/bmx6_table.so $(1)/usr/lib/bmx6_table.so +endef + +#define Package/bmx7-quagga/install +# $(INSTALL_DIR) $(1)/usr/lib +# $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_quagga/bmx6_quagga.so $(1)/usr/lib/bmx6_quagga.so +#endef + +$(eval $(call BuildPackage,bmx7)) +$(eval $(call BuildPackage,bmx7-uci-config)) +$(eval $(call BuildPackage,bmx7-json)) +$(eval $(call BuildPackage,bmx7-sms)) +#$(eval $(call BuildPackage,bmx7-quagga)) +$(eval $(call BuildPackage,bmx7-table)) diff --git a/bmx7/files/etc/config/bmx6 b/bmx7/files/etc/config/bmx6 new file mode 100644 index 0000000..5f7af9d --- /dev/null +++ b/bmx7/files/etc/config/bmx6 @@ -0,0 +1,48 @@ + +# for more information: +# http://bmx6.net/projects/bmx6/wiki +# options execute: bmx6 --help + +config 'bmx6' 'general' +# option 'runtimeDir' '/var/run/bmx6' + + +#config 'plugin' +# option 'plugin' 'bmx6_config.so' + +#config 'plugin' +# option 'plugin' 'bmx6_json.so' + +#config 'plugin' +# option 'plugin' 'bmx6_table.so' + +#config 'plugin' +# option 'plugin' 'bmx6_sms.so' + + +config 'dev' 'mesh_1' + option 'dev' 'br-lan' + +config 'dev' 'mesh_2' + option 'dev' 'wlan0' + +config 'tunDev' default + option 'tunDev' 'default' + option 'tun6Address' '2012:0:0:6666::1/64' + option 'tun4Address' '10.66.66.1/24' + + +#config 'tunOut' +# option 'tunOut' 'ip6' +# option 'network' '2012::/16' +# option 'exportDistance' '0' + +#config 'tunOut' +# option 'tunOut' 'ip4' +# option 'network' '10.0.0.0/9' +# option 'minPrefixLen' '27' + + + + + diff --git a/bmx7/files/etc/init.d/bmx6 b/bmx7/files/etc/init.d/bmx6 new file mode 100755 index 0000000..cb2d5b3 --- /dev/null +++ b/bmx7/files/etc/init.d/bmx6 @@ -0,0 +1,41 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2011 Fundacio Privada per a la Xarxa Oberta, Lliure i Neutral guifi.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# The full GNU General Public License is included in this distribution in +# the file called "COPYING". + +START=91 + +BIN=/usr/sbin/bmx6 +CONF=/etc/config/bmx6 +PID=/var/run/bmx6/pid + + +start() { + cd /root/ + while pgrep -f mac80211.sh ; do sleep 1; done + ulimit -c 20000 + $BIN -f $CONF -d0 > /dev/null & +} + +stop() { + start-stop-daemon -p $PID -K +} + +restart() { + stop; sleep 3; start +} diff --git a/bmx7/patches/001-json-c.patch b/bmx7/patches/001-json-c.patch new file mode 100644 index 0000000..5d29dae --- /dev/null +++ b/bmx7/patches/001-json-c.patch @@ -0,0 +1,13 @@ +Index: bmx6-r2014112401/lib/bmx6_json/json.c +=================================================================== +--- bmx6-r2014112401.orig/lib/bmx6_json/json.c ++++ bmx6-r2014112401/lib/bmx6_json/json.c +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + //#include + //#include + From 81a768b8addd5d14991b11506ab204b7766be709 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 28 Jul 2015 12:06:25 +0200 Subject: [PATCH 06/10] hnetd: bump and add tunneling support Signed-off-by: Steven Barth --- hnetd/Makefile | 32 ++++++++++++++++++++++++++------ hnetd/files/hnetd.init | 3 +++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/hnetd/Makefile b/hnetd/Makefile index b9fe825..03e3fb9 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hnetd -PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9 -PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=a6b4b6f1f5d38646fa11064cf7394719e048bc87 +PKG_VERSION:=2015-07-28-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git @@ -37,7 +37,7 @@ define Package/hnetd/Default CATEGORY:=Network TITLE:=HNCP Homenet daemon - $(2) URL:=https://github.com/sbyx/hnetd - DEPENDS:=+odhcpd +odhcp6c +netifd +ip $(3) + DEPENDS:=+odhcpd +odhcp6c +netifd $(3) DEPENDS+=+@IPV6 VARIANT:=$1 endef @@ -50,7 +50,7 @@ define Package/hnet-full CATEGORY:=Network TITLE:=HNCP Homenet metapackage URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-nossl +luci-app-hnet + DEPENDS:=+hnetd-nossl +luci-app-hnet +ip # Routing DEPENDS+=+babeld # Service discovery @@ -62,9 +62,23 @@ endef define Package/hnet-full-secure SECTION:=net CATEGORY:=Network - TITLE:=HNCP Homenet metapackage + TITLE:=HNCP Homenet metapackage (w/ SSL) URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-openssl +luci-app-hnet + DEPENDS:=+hnetd-openssl +luci-app-hnet +ip + # Routing + DEPENDS+=+babeld + # Service discovery + DEPENDS+=+ohybridproxy + # Distributed PCP support + DEPENDS+=+miniupnpd +minimalist-pcproxy +endef + +define Package/hnet-full-l2tp + SECTION:=net + CATEGORY:=Network + TITLE:=HNCP Homenet metapackage (w/ L2TP) + URL:=https://github.com/sbyx/hnetd + DEPENDS:=+hnetd-nossl +luci-app-hnet +ip-full +kmod-l2tp-eth # Routing DEPENDS+=+babeld # Service discovery @@ -116,6 +130,11 @@ define Package/hnet-full-secure/install true endef +define Package/hnet-full-l2tp/install + $(INSTALL_DIR) $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/tunnel.script $(1)/usr/sbin/hnetd-tunnel +endef + define Package/luci-app-hnet/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/www @@ -137,4 +156,5 @@ $(eval $(call BuildPackage,hnetd-nossl)) $(eval $(call BuildPackage,hnetd-openssl)) $(eval $(call BuildPackage,hnet-full)) $(eval $(call BuildPackage,hnet-full-secure)) +$(eval $(call BuildPackage,hnet-full-l2tp)) $(eval $(call BuildPackage,luci-app-hnet)) diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init index 6d7d0ec..6b98b8c 100644 --- a/hnetd/files/hnetd.init +++ b/hnetd/files/hnetd.init @@ -51,6 +51,9 @@ start_service() { # Routing script procd_append_param command -r /usr/sbin/hnetd-routing + [ -x /usr/sbin/hnetd-tunnel ] && \ + procd_append_param command -t /usr/sbin/hnetd-tunnel + # Prefix assignment (pa) config_get val pa ip4prefix [ -n "$val" ] && procd_append_param command --ip4prefix $val From 1414bea4b7a491321b136c160606128c35beae50 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Thu, 30 Jul 2015 17:03:16 +0200 Subject: [PATCH 07/10] Update OONF packages to 0.9.0 --- oonf-dlep-proxy/Makefile | 4 ++-- oonf-dlep-radio/Makefile | 4 ++-- oonf-olsrd2/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 115380c..1f69065 100644 --- 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.3 -PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08 +PKG_VERSION:=0.9.0 +PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f 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 4eb6328..008384e 100644 --- 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.3 -PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08 +PKG_VERSION:=0.9.0 +PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 2717441..4cd92a3 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.8.3 -PKG_REV:=a5ba0e6c093ff6c289a77ec9c3d04b5f94145e08 +PKG_VERSION:=0.9.0 +PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From 5e32f7a7446d7775846ed91aea39c71fcfad5b84 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Fri, 31 Jul 2015 08:55:51 +0200 Subject: [PATCH 08/10] Update to oonf v0.9.1 --- oonf-dlep-proxy/Makefile | 4 ++-- oonf-dlep-radio/Makefile | 4 ++-- oonf-olsrd2/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 1f69065..1f4f311 100644 --- 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.9.0 -PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f +PKG_VERSION:=0.9.1 +PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67 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 008384e..9973819 100644 --- 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.9.0 -PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f +PKG_VERSION:=0.9.1 +PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 4cd92a3..6749586 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.9.0 -PKG_REV:=2e367c28fa80aa1c2841c78e296ba946afb2476f +PKG_VERSION:=0.9.1 +PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67 PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From 4d43b2da76ad2515d75eaab34d8ff7e557431380 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Sat, 1 Aug 2015 09:22:46 +0200 Subject: [PATCH 09/10] Update to 0.9.1-r1 release for better openwrt startup script --- oonf-dlep-proxy/Makefile | 4 ++-- oonf-dlep-radio/Makefile | 4 ++-- oonf-olsrd2/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oonf-dlep-proxy/Makefile b/oonf-dlep-proxy/Makefile index 1f4f311..9a6cd2f 100644 --- 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.9.1 -PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67 +PKG_VERSION:=0.9.1-r1 +PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d 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 9973819..4fb9124 100644 --- 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.9.1 -PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67 +PKG_VERSION:=0.9.1-r1 +PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 6749586..4651f94 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_VERSION:=0.9.1 -PKG_REV:=5c2d56765f72572b0c970395604eee2218847e67 +PKG_VERSION:=0.9.1-r1 +PKG_REV:=eab3845089bc2410a3c115fb8274572b16a0e47d PKG_RELEASE:=$(PKG_REV) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 From 153dec97591e2f7a78f8f2333b4915d8fbbd4d8e Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Tue, 4 Aug 2015 14:16:38 +0200 Subject: [PATCH 10/10] nat46: Fix 464xlat interface teardown Signed-off-by: Hans Dedecker --- nat46/files/464xlat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh index c549cc5..2ec1094 100755 --- a/nat46/files/464xlat.sh +++ b/nat46/files/464xlat.sh @@ -74,7 +74,7 @@ proto_464xlat_setup() { } proto_464xlat_teardown() { - 464xlatcfg "464xlat-$1" + 464xlatcfg "464-$1" } proto_464xlat_init_config() {