Merge branch 'testing' into stable

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2016.1.x
-PACKAGES_FFHO_COMMIT=e5fb2f841962673c299179eab8ad55983caba6eb
+PACKAGES_FFHO_COMMIT=c9af86fd75180636aa11f4c7334825925632d75b

patches/0001-fix-ubnt-model-detection.patch

@@ -89,10 +89,10 @@ index 0000000..79180b4
 + 	*"Rocket M XW")
 + 		name="rocket-m-xw"
 diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk
-index c0b82ec..4826dba 100644
+index 14fee2a..316064d 100644
 --- a/targets/ar71xx-generic/profiles.mk
 +++ b/targets/ar71xx-generic/profiles.mk
-@@ -161,12 +161,19 @@ $(eval $(call GluonModel,UBNT,ubnt-air-gateway,ubiquiti-airgateway))
+@@ -162,12 +162,19 @@ $(eval $(call GluonModel,UBNT,ubnt-air-gateway,ubiquiti-airgateway))
  $(eval $(call GluonModel,UBNT,ubnt-airrouter,ubiquiti-airrouter))
  
  $(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-bullet-m))
@@ -114,8 +114,8 @@ index c0b82ec..4826dba 100644
 +
 +$(eval $(call GluonModel,UBNT,ubnt-loco-m-xw,ubiquiti-loco-m-xw))
  $(eval $(call GluonModel,UBNT,ubnt-nano-m-xw,ubiquiti-nanostation-m-xw))
+ $(eval $(call GluonModel,UBNT,ubnt-rocket-m-xw,ubiquiti-rocket-m-xw))
  $(eval $(call GluonModel,UBNT,ubnt-uap-pro,ubiquiti-unifi-ap-pro))
- $(eval $(call GluonModel,UBNT,ubnt-unifi,ubiquiti-unifi))
 -- 
 2.1.4
 

patches/0002-openwrt-patch-iw.patch

@@ -0,0 +1,41 @@
+From: Karsten Böddeker <freifunk@kb-light.de>
+Date: Sat, 23 Apr 2016 15:20:30 +0200
+Subject: [PATCH] openwrt: patch iw
+
+---
+ .../openwrt/1001-iw-patch-200-reduce_size.patch.patch   | 23 +++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+ create mode 100644 patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
+
+diff --git a/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
+new file mode 100644
+index 0000000..6f59663
+--- /dev/null
++++ b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
+@@ -0,0 +1,23 @@
++From: Karsten Böddeker <freifunk@kb-light.de>
++Date: Sat, 23 Apr 2016 15:20:29 +0200
++Subject: iw: patch 200-reduce_size.patch
++
++diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
++index dea24fb..fefbf1f 100644
++--- a/package/network/utils/iw/patches/200-reduce_size.patch
+++++ b/package/network/utils/iw/patches/200-reduce_size.patch
++@@ -1,12 +1,11 @@
++ --- a/Makefile
++ +++ b/Makefile
++-@@ -15,8 +15,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
+++@@ -16,7 +16,7 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
++  OBJS = iw.o genl.o event.o info.o phy.o \
++  	interface.o ibss.o station.o survey.o util.o ocb.o \
++  	mesh.o mpath.o mpp.o scan.o reg.o version.o \
++--	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
+++ 	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
++ -	bitrate.o wowlan.o coalesce.o roc.o p2p.o vendor.o
++-+	reason.o status.o link.o offch.o ps.o cqm.o \
++ +	bitrate.o vendor.o
++  OBJS += sections.o
++  
+-- 
+2.1.4
+

site.conf

@@ -137,15 +137,6 @@
 							'ipv4 "192.26.175.182" port 10000',
 						},
 					},
-					gw06 = {
-						key = 'b912bcf1c1335390364b8030448e53d8869b650f32923e59bf01d763d3028840',
-						remotes = {
-							'ipv6 "v6.gw06.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw06.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a03:4000:6:20f0::ff12" port 10000',
-							'ipv4 "5.45.111.222" port 10000',
-						},
-					},
 					gw08 = {
 						key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
 						remotes = {
@@ -155,6 +146,12 @@
 							'ipv4 "5.45.107.59" port 10000',
 						},
 					},
+					ffho_gw01 = {
+						key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
+						remotes = {
+							'"gw01.ffho.net" port 10000',
+						},
+					},
 				},
 			},
 		},

site.mk

@@ -1,34 +1,35 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-14 \
-	ffho-banner \
-	ffho-debug \
-	ffho-node-tuning \
-	ffho-ebtables-net-rules \
-	ffho-txpower-fix \
-	ffho-site-auto-select \
 	gluon-alfred \
 	gluon-respondd \
-	ffho-respondd-config \
 	ffho-autoupdater \
 	ffho-autoupdater-wifi-fallback \
+	ffho-autoupdater-wifi-fallback-legacy \
+	ffho-banner \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
-	gluon-config-mode-hostname \
 	gluon-config-mode-contact-info \
-	ffho-config-mode-mesh-vpn \
 	ffho-config-mode-geo-location \
+	gluon-config-mode-hostname \
+	ffho-config-mode-mesh-vpn \
 	ffho-config-mode-site-select \
+	ffho-debug \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
+	ffho-ebtables-net-rules \
 	gluon-luci-admin \
-	gluon-luci-autoupdater \
+	ffho-luci-autoupdater-wifi-fallback \
 	gluon-luci-portconfig \
 	gluon-luci-wifi-config \
-	gluon-next-node \
 	gluon-mesh-vpn-fastd \
+	gluon-next-node \
+	ffho-node-tuning \
 	gluon-radvd \
+	ffho-respondd-config \
 	gluon-setup-mode \
+	ffho-site-auto-select \
 	ffho-status-page \
+	ffho-txpower-fix \
 	iwinfo \
 	iptables \
 	haveged
@@ -60,7 +61,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.7.2~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.7.3~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)