gluon_patches/0005-gluon-config-mode-mesh-vpn-0300-mesh-vpn.lua-fix-lim.patch

-From e473b36cd9bf9902f16ce6d7e568ec183208a38c Mon Sep 17 00:00:00 2001
-From: Jan-Tarek Butt <tarek@ring0.de>
-Date: Sat, 23 Mar 2019 17:59:55 +0100
-Subject: [PATCH 5/5] gluon-config-mode-mesh-vpn: 0300-mesh-vpn.lua fix
- limit_ingress default value in case of default disabled simple-tc for
- tunneldigger
-
-Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
----
- .../luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua        | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
-index 0fd6432b..b11c105a 100644
---- a/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
-+++ b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
-@@ -48,10 +48,13 @@ return function(form, uci)
- 
- 	o = s:option(Value, "limit_ingress", pkg_i18n.translate("Downstream (kbit/s)"))
- 	o:depends(limit, true)
-+	o.default = uci:get("simple-tc", "mesh_vpn", "limit_ingress")
- 	if has_tunneldigger then
--		o.default = uci:get("tunneldigger", "mesh_vpn", "limit_bw_down")
--	else
--		o.default = uci:get("simple-tc", "mesh_vpn", "limit_ingress")
-+		-- Check if limit_bw_down exsist if not take value vom limit_ingress
-+		local limit_bw_down = uci:get("tunneldigger", "mesh_vpn", "limit_bw_down")
-+		if limit_bw_down ~= nil then
-+			o.default = limit_bw_down
-+		end
- 	end
- 	o.datatype = "uinteger"
- 	function o:write(data)
--- 
-2.11.0
-

modules

-GLUON_SITE_FEEDS='ffnw tecff'
+GLUON_SITE_FEEDS='ffnw tecff ffho'
 
 PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
 PACKAGES_FFNW_BRANCH=master
-PACKAGES_FFNW_COMMIT=ca8f033e5614b82e75f1e6fd65aff67e44a6495e
+PACKAGES_FFNW_COMMIT=7a52798fa903baa27fb29c150773d3403283be2e
 
 PACKAGES_TECFF_REPO=https://github.com/tecff/gluon-packages.git
-PACKAGES_TECFF_BRANCH=v2018.1.x
-PACKAGES_TECFF_COMMIT=7964a2884f1b43d994f8d1da931e89c5d36d3890
+PACKAGES_TECFF_BRANCH=v2018.2.x
+PACKAGES_TECFF_COMMIT=e2c8aa81f8ae138e90c2f8aac26dc863d9405307
+
+PACKAGES_FFHO_REPO=https://git.ffho.net/FreifunkHochstift/ffho-packages.git
+PACKAGES_FFHO_BRANCH=master
+PACKAGES_FFHO_COMMIT=a2521ef8cd6774a0470a7b2568d0240e679e95e7

site.conf

@@ -18,8 +18,6 @@
 
 	wifi24 = {
 		channel = 6,
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
 		mesh = {
 			mcast_rate = 12000,
 		},
@@ -32,12 +30,13 @@
 	},
 
 	dns = {
-		servers = {'2001:1b60:3:34:7711:1:0:1','2001:67c:1400:2250::1'},
+		servers = {'2a06:e881:2000:8::1','2001:67c:1400:2250::1'},
 	},
 
 	mesh = {
 		batman_adv = {
 			gw_sel_class = 1, --class 1 is calculated from both the TQ and the announced bandwidth.
+			routing_algo = "BATMAN_IV", -- also possible: "BATMAN_V" and "BATMAN_IV_LEGACY", but this value may not be unset
 		},
 	},
 
@@ -71,14 +70,11 @@
 				mirrors = {
 %B
 				},
-				good_signatures = 4,
+				good_signatures = 3,
 				pubkeys = {
-					'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
 					'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
-					'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
 					'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
 					'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
-					'36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
 					'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
 					'e3d2e96563b9be3e95a3d748c0ff50a6f854208b68b4a1181667641d74754c76', --stefan
 				},
@@ -90,12 +86,9 @@
 				},
 				good_signatures = 1,
 				pubkeys = {
-					'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
 					'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
-					'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
 					'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
 					'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
-					'36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
 					'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
 					'e3d2e96563b9be3e95a3d748c0ff50a6f854208b68b4a1181667641d74754c76', --stefan
 				},

site.mk

@@ -10,7 +10,6 @@ GLUON_FEATURES := \
 	ebtables-filter-ra-dhcp \
 	ebtables-limit-arp \
 	ebtables-source-filter \
-	radvd \
 	radv-filterd \
 	lock-password \
 	web-private-wifi \
@@ -24,6 +23,7 @@ GLUON_SITE_PACKAGES := \
 	haveged \
 	ffnw-banner \
 	iwinfo \
+	ffho-autoupdater-wifi-fallback
 
 USB_BASIC := \
 	kmod-usb-core \
@@ -64,3 +64,4 @@ GLUON_WLAN_MESH := 11s
 GLUON_PRIORITY ?= 0
 GLUON_REGION ?= eu
 GLUON_LANGS ?= de en
+GLUON_DEPRECATED ?= upgrade