From 717d8a08e7b92b781b78f25c9a0f00e25c643d40 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 17 Jun 2015 20:41:55 +0200
Subject: [PATCH 1/7] Update to gluon v2015.1.1

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f3ab844..d86c714 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 := v2015.1
+GLUON_GIT_REF := v2015.1.1
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 

From f9fed1b9119ef11f2a0e04cb27cd88c71cd01226 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 18 Jun 2015 14:47:06 +0200
Subject: [PATCH 2/7] Makefile: Add support for changing gluon git remotes

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f8c2ae3..a6659d9 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,10 @@ ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
 gluon-prepare: images-clean ${GLUON_BUILD_DIR}
-	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
+	(cd ${GLUON_BUILD_DIR} \
+	  && git remote set-url origin ${GLUON_GIT_URL} \
+	  && git fetch origin \
+	  && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update
 

From 03899909c0ef4c845f411791ae84e5a74282fab3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Jun 2015 00:17:01 +0200
Subject: [PATCH 3/7] Disable mesh on WAN per default

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

diff --git a/site.conf b/site.conf
index 6f0be69..3f62f1f 100644
--- a/site.conf
+++ b/site.conf
@@ -10,7 +10,7 @@
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
 
-  mesh_on_wan = true,
+  mesh_on_wan = false,
 
   regdom = 'DE',
 

From 59392738552fec40cf4b9a851ae89d8f32663e92 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Jun 2015 00:17:16 +0200
Subject: [PATCH 4/7] Connect only to one mesh_vpn gateway

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

diff --git a/site.conf b/site.conf
index 3f62f1f..95fe601 100644
--- a/site.conf
+++ b/site.conf
@@ -43,7 +43,7 @@
     mtu = 1426,
     groups = {
       backbone = {
-      limit = 2,
+      limit = 1,
         peers = {
           gw02 = {   --[[ mephisto ]]
             key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',

From ce073a2c8d5942b08a8d7cbacc5e14b907032c73 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Jun 2015 00:18:05 +0200
Subject: [PATCH 5/7] Remove gw02

---
 site.conf | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/site.conf b/site.conf
index 95fe601..7fdd7e3 100644
--- a/site.conf
+++ b/site.conf
@@ -45,13 +45,6 @@
       backbone = {
       limit = 1,
         peers = {
-          gw02 = {   --[[ mephisto ]]
-            key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',
-            remotes = {
-              'ipv4 "gw02.ffmuc.net" port 10000',
-              'ipv4 "gw02.freifunk-muenchen.de" port 10000',
-            },
-          },
           gw03 = {   --[[ fpletz ]]
             key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {

From f5420019ab75ecfa65ff2f9d449e774e126710c5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Jun 2015 00:19:46 +0200
Subject: [PATCH 6/7] Update CHANGELOG for v2015.5

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86fccd..35c54e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Freifunk München Firmware Changelog
 
-## v2015.4
+## v2015.5
+ - Updated to Gluon 2015.1.1
+   - Fixes some problems with mesh ono LAN setups
+ - x86 images now support two network interfaces, eth0 for LAN and eth1 for WAN
+ - Mesh on WAN is disabled by default
+
+## v2015.4 (never released)
  - Updated to Gluon 2015.1
    - More supported architectures and router models are available, including x86
  - Setup Mode

From 3927678e39d42949ac79fadbc924ebd0402ab87e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Jun 2015 02:31:11 +0200
Subject: [PATCH 7/7] Release v2015.5

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35c54e3..0e1d9aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 ## v2015.5
  - Updated to Gluon 2015.1.1
-   - Fixes some problems with mesh ono LAN setups
+   - Fixes some problems with mesh on LAN setups
  - x86 images now support two network interfaces, eth0 for LAN and eth1 for WAN
  - Mesh on WAN is disabled by default
+ - VPN connection limit was decreased from 2 to 1 to divide the broadcast traffic
+   into half and take unnecessary load from overloaded gateways
 
-## v2015.4 (never released)
+## v2015.4 [never released]
  - Updated to Gluon 2015.1
    - More supported architectures and router models are available, including x86
  - Setup Mode