From 5f5496ee6d91ff234bfb0bc760c969e3bcfff193 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 19 Nov 2018 21:48:51 +0100
Subject: [PATCH 1/4] fix upgrade issues to future gluon releases

v2017 and later have some changes which causes config loss
when upgraded directly.

This release basically aims to keep the config for a future release
of a current gluon (which then has a better hardware support)
---
 CHANGELOG.md | 5 ++---
 Makefile     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbfb9a8..615d135 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,10 @@
 
 ## v2018.0
 
-UNRELEASED
-
- - Updated to Gluon v2016.2.7-2-g3d824bd2
+ - Updated to Gluon v2016.2.7-3-g35c9f9ae
    - ar71xx: fix MAC addresses on TP-Link TL-WR1043ND v4
    - modules: update url to chaos calmer git repository after upstream move
+   - ar71xx: sysupgrade: improve CPE/WBS 210/510 validation
 
  - Makefile
    - Enabled firmware with ath10k WLAN driver
diff --git a/Makefile b/Makefile
index b2141f9..2fd96c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 3d824bd21d7f6d5db6dc238d2a68b62de471aa2a
+GLUON_GIT_REF := 35c9f9aecc5de53324ee61904faa1c5763d61134  # latest v2016.2.x
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 

From dd715dabfe937659987a9cdf4fa425237312c57c Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 20 Nov 2018 00:44:36 +0100
Subject: [PATCH 2/4] add public sign key for krombel

---
 site.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site.conf b/site.conf
index 4160a1f..4760e9b 100644
--- a/site.conf
+++ b/site.conf
@@ -126,6 +126,7 @@
         probability = 0.1,
         good_signatures = 3,
         pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -141,6 +142,7 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris

From 619250b6e8825ad4fc199822cef34b0234692c05 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 15 Jan 2019 22:33:09 +0100
Subject: [PATCH 3/4] add sign key of awlnx

---
 site.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site.conf b/site.conf
index 4760e9b..a382083 100644
--- a/site.conf
+++ b/site.conf
@@ -126,6 +126,7 @@
         probability = 0.1,
         good_signatures = 3,
         pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
           '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
@@ -142,6 +143,7 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
           '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz

From ce4f23cb241d298e45d1a6c4eea67eb04854236b Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 29 Jan 2019 22:52:27 +0100
Subject: [PATCH 4/4] add key of lukesix

---
 site.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site.conf b/site.conf
index a382083..e02ff3a 100644
--- a/site.conf
+++ b/site.conf
@@ -128,6 +128,7 @@
         pubkeys = {
           '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
           '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
+          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -145,6 +146,7 @@
         pubkeys = {
           '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
           '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
+          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris