From 12e8b053f5d7e1a133d892bb8d2ffb1e18423d5c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 26 May 2019 22:14:30 +0200
Subject: [PATCH 01/52] fix some (not all) warnings that shellcheck displays

---
 build.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.sh b/build.sh
index 5008580..90d36d1 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 set -e
 
 function announce () {
-	echo '############################' $* >&2
+	echo '############################' "$@" >&2
 }
 function usage () {
 	echo "Usage: $0 -g GLUON_PATH" >&2
@@ -60,21 +60,21 @@ if [ -z "$gluon_path" ]; then
 	exit 1
 fi
 
-gluon_path=$(realpath $gluon_path)
-gluon_out=$(realpath $gluon_out)
-site_path=$(realpath $(dirname $BASH_SOURCE))
+gluon_path=$(realpath "$gluon_path")
+gluon_out=$(realpath "$gluon_out")
+site_path=$(realpath "$(dirname "$BASH_SOURCE")")
 
-announce GLUON: $gluon_path >&2
-announce FFHH SITE PATH: $site_path >&2
+announce GLUON: "$gluon_path" >&2
+announce FFHH SITE PATH: "$site_path" >&2
 
-pushd $site_path
+pushd "$site_path"
 . ./build.conf
 [ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
 export GLUON_RELEASE
 export GLUON_BRANCH
 # if a list of build targets has been supplied, only build those
 targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
-announce The following targets will be generated: $targets >&2
+announce "The following targets will be generated: $targets" >&2
 popd
 
 pushd "${gluon_path}"
@@ -85,16 +85,16 @@ rm -rf "${GLUON_OUTPUTDIR}"
 mkdir -p "${GLUON_OUTPUTDIR}"
 make update
 # Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
-for p in ${site_path}/patches/*.patch; do
-	if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then
-		announce Installing patch $p
-		patch -p1 < $p
+for p in "${site_path}"/patches/*.patch; do
+	if [ -e "$p" ] && [ ! -f "${gluon_path}/${p##*/}" ]; then
+		announce "Installing patch $p"
+		patch -p1 < "$p"
 		touch "${gluon_path}/${p##*/}"
 	fi
 done
 for t in $targets; do
-	announce Starting build for $t... >&2
-	make -j$(nproc) GLUON_TARGET=$t $verbose
+	announce "Starting build for $t..." >&2
+	make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
 done
 # Generate the images.list
 ( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )

From 256e9dfe98acfe801800b10d98e01b10d5e58bea Mon Sep 17 00:00:00 2001
From: bobcanthelpyou <bob@canthelpyou.com>
Date: Tue, 18 Jun 2019 22:42:27 +0200
Subject: [PATCH 02/52] Remove lede opkg mirror

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

diff --git a/site.conf b/site.conf
index c8c0822..4f76331 100644
--- a/site.conf
+++ b/site.conf
@@ -12,7 +12,6 @@
 	default_domain = 'ffhh_nowe',
 
 	opkg = {
-		lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
 		extra = {
 			modules = 'http://updates.hamburg.freifunk.net/multi/archive/%GR/packages/gluon-%GS-%GR/%S',
 		},

From 23952fdaf5b10d53c881b09b12c430459cbfc75e Mon Sep 17 00:00:00 2001
From: bobcanthelpyou <bob@canthelpyou.com>
Date: Sun, 16 Jun 2019 23:38:13 +0200
Subject: [PATCH 03/52] remove obsolete wifi24 rates settings

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

diff --git a/site.conf b/site.conf
index 4f76331..c8ea474 100644
--- a/site.conf
+++ b/site.conf
@@ -24,9 +24,6 @@
 	wifi24 = {
 		channel = 1,
 
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-
 		mesh = {
 			mcast_rate = 12000,
 		},

From bc82d9d6b75c992ae08a0683e4dd776d9f68dc8b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 5 Jul 2019 21:15:35 +0200
Subject: [PATCH 04/52] Add GLUON_DEPRECATED variable

---
 site.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site.mk b/site.mk
index 76cc687..efd1464 100644
--- a/site.mk
+++ b/site.mk
@@ -1,4 +1,5 @@
 GLUON_MULTIDOMAIN := 1
+GLUON_DEPRECATED := upgrade
 
 GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
 	-gluon-config-mode-contact-info \

From 9eadb86c82474ab9aa3d1278cc25daf7863a3667 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 22:44:43 +0200
Subject: [PATCH 05/52] build.sh: automatically detect available targets and
 build them all

---
 build.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 90d36d1..768a212 100755
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,7 @@ function usage () {
 	echo "Usage: $0 -g GLUON_PATH" >&2
 	echo "       -g GLUON_PATH   Path to a checkout of the gluon repository." >&2
 	echo "       -t TARGETS      Comma separated list of gluon targets to build" >&2
+	echo "       -a              Automatically detect and build all targets." >&2
 	echo "       -o OUT_PATH     Path to the firmware output directory. Default: ${gluon_out}" >&2
 	echo "       -s SIGNATURE    Sign firmware with signature" >&2
 	echo "       -b              BROKEN=1" >&2
@@ -20,6 +21,9 @@ gluon_out="${HOME}/firmware"
 
 while [ $# -gt 0 ]; do
 	case "$1" in
+		-a)
+			auto_targets=1
+			;;
 		-g)
 			gluon_path="$2"
 			shift
@@ -72,15 +76,20 @@ pushd "$site_path"
 [ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
 export GLUON_RELEASE
 export GLUON_BRANCH
-# if a list of build targets has been supplied, only build those
-targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
+export GLUON_SITEDIR="${site_path}"
+export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
+pushd "${gluon_path}"
+if [ "$auto_targets" = "1" ]; then
+	# detect available targets
+	targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+else
+	# if a list of build targets has been supplied, only build those
+	targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
+fi
 announce "The following targets will be generated: $targets" >&2
 popd
 
-pushd "${gluon_path}"
 announce Starting make update...
-export GLUON_SITEDIR="${site_path}"
-export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
 rm -rf "${GLUON_OUTPUTDIR}"
 mkdir -p "${GLUON_OUTPUTDIR}"
 make update

From e763875644aabae083fa704d841b36b6e451791c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 22:53:20 +0200
Subject: [PATCH 06/52] build.sh: fix the ordering of the steps

---
 build.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 768a212..b724efc 100755
--- a/build.sh
+++ b/build.sh
@@ -78,17 +78,9 @@ export GLUON_RELEASE
 export GLUON_BRANCH
 export GLUON_SITEDIR="${site_path}"
 export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
-pushd "${gluon_path}"
-if [ "$auto_targets" = "1" ]; then
-	# detect available targets
-	targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
-else
-	# if a list of build targets has been supplied, only build those
-	targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
-fi
-announce "The following targets will be generated: $targets" >&2
 popd
 
+pushd "${gluon_path}"
 announce Starting make update...
 rm -rf "${GLUON_OUTPUTDIR}"
 mkdir -p "${GLUON_OUTPUTDIR}"
@@ -101,6 +93,16 @@ for p in "${site_path}"/patches/*.patch; do
 		touch "${gluon_path}/${p##*/}"
 	fi
 done
+
+if [ "$auto_targets" = "1" ]; then
+	# detect available targets
+	targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+else
+	# if a list of build targets has been supplied, only build those
+	targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
+fi
+announce "The following targets will be generated: $targets" >&2
+
 for t in $targets; do
 	announce "Starting build for $t..." >&2
 	make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"

From f4b45ff5f7789afc631b73fb9ba7e6cf61a8f61e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 22:58:56 +0200
Subject: [PATCH 07/52] build.sh: the make that lists the targets can run a
 long time, copy the output to /dev/stderr

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index b724efc..820790a 100755
--- a/build.sh
+++ b/build.sh
@@ -96,7 +96,7 @@ done
 
 if [ "$auto_targets" = "1" ]; then
 	# detect available targets
-	targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+	targets="$(make | tee /dev/stderr | awk '$1 == "*" {print $2}' | sort | xargs)"
 else
 	# if a list of build targets has been supplied, only build those
 	targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"

From 44e04d3d9c7f7a435e7740aad3c0d023a54c2079 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 23:01:45 +0200
Subject: [PATCH 08/52] build.sh: dont build everything while detecting the
 targets...

---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 820790a..8ea0fc2 100755
--- a/build.sh
+++ b/build.sh
@@ -96,7 +96,8 @@ done
 
 if [ "$auto_targets" = "1" ]; then
 	# detect available targets
-	targets="$(make | tee /dev/stderr | awk '$1 == "*" {print $2}' | sort | xargs)"
+	make
+	targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
 else
 	# if a list of build targets has been supplied, only build those
 	targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"

From fbb4b5dc780c33a28891af5f07993513807b09c2 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 23:23:55 +0200
Subject: [PATCH 09/52] build.sh: use list-targets make target

---
 build.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 8ea0fc2..13e874b 100755
--- a/build.sh
+++ b/build.sh
@@ -96,8 +96,7 @@ done
 
 if [ "$auto_targets" = "1" ]; then
 	# detect available targets
-	make
-	targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+	targets="$(make list-targets | sort | xargs)"
 else
 	# if a list of build targets has been supplied, only build those
 	targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"

From cfebeb94b5b044dc1ae38529482cb0833a2e6838 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 18 Aug 2019 13:15:52 +0200
Subject: [PATCH 10/52] build.sh: some cleanup with shellcheck

---
 build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 13e874b..ac89af9 100755
--- a/build.sh
+++ b/build.sh
@@ -72,6 +72,7 @@ announce GLUON: "$gluon_path" >&2
 announce FFHH SITE PATH: "$site_path" >&2
 
 pushd "$site_path"
+# shellcheck source=/dev/null
 . ./build.conf
 [ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
 export GLUON_RELEASE
@@ -108,7 +109,8 @@ for t in $targets; do
 	make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
 done
 # Generate the images.list
-( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
+# shellcheck disable=SC2094
+( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
 announce Building manifest...
 make manifest
 if [ -n "${signature}" ]; then

From 50b79c0dc415725195930f8fccf04c971e22e23c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 18 Aug 2019 13:16:31 +0200
Subject: [PATCH 11/52] build.sh: remove known-broken images after the build

---
 build.conf | 3 +++
 build.sh   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/build.conf b/build.conf
index 5b9c9c4..6cb03ae 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,6 @@
 GLUON_RELEASE="v2018.2.1.0"
 GLUON_BRANCH="stable"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
+broken_images=(
+	'*dir*615*d*'
+)
diff --git a/build.sh b/build.sh
index ac89af9..bd80e84 100755
--- a/build.sh
+++ b/build.sh
@@ -108,6 +108,12 @@ for t in $targets; do
 	announce "Starting build for $t..." >&2
 	make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
 done
+# Remove known-broken images
+# shellcheck disable=SC2154
+for broken_image in "${broken_images[@]}"; do
+	announce "Removing broken image ${broken_image}..."
+	find "${GLUON_OUTPUTDIR}/${GLUON_BRANCH}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
+done
 # Generate the images.list
 # shellcheck disable=SC2094
 ( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )

From 74088a18a9c2cc648bcd341d7768e8f6bc4c7d71 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 18 Aug 2019 23:55:55 +0200
Subject: [PATCH 12/52] build.sh: fix remove known-broken images after the
 build

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index bd80e84..ce00e05 100755
--- a/build.sh
+++ b/build.sh
@@ -112,7 +112,7 @@ done
 # shellcheck disable=SC2154
 for broken_image in "${broken_images[@]}"; do
 	announce "Removing broken image ${broken_image}..."
-	find "${GLUON_OUTPUTDIR}/${GLUON_BRANCH}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
+	find "${GLUON_OUTPUTDIR}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
 done
 # Generate the images.list
 # shellcheck disable=SC2094

From 91adc7864649673c8de58eb21d7d4c2079289b34 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Sep 2019 20:48:30 +0200
Subject: [PATCH 13/52] Cleanup some wrong indentation

---
 domains/ffhh_nowe.conf | 12 ++++++------
 domains/ffhh_ost.conf  | 12 ++++++------
 domains/ffhh_sued.conf | 12 ++++++------
 domains/ffhh_west.conf | 12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/domains/ffhh_nowe.conf b/domains/ffhh_nowe.conf
index 90aed0c..cefc8ee 100644
--- a/domains/ffhh_nowe.conf
+++ b/domains/ffhh_nowe.conf
@@ -42,27 +42,27 @@
 					peers = {
 						gateway01 = {
 							remotes = { '"gw01-new.hamburg.freifunk.net" port 10007' },
-                            key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+							key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
 						},
 						gateway02 = {
 							remotes = { '"gw02-new.hamburg.freifunk.net" port 10007' },
-                            key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+							key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
 						},
 						gateway03 = {
 							remotes = { '"gw03-new.hamburg.freifunk.net" port 10007' },
-                            key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+							key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
 						},
 						gateway04 = {
 							remotes = { '"gw04-new.hamburg.freifunk.net" port 10008' },
-                            key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+							key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
 						},
 						gateway05 = {
 							remotes = { '"gw05-new.hamburg.freifunk.net" port 10008' },
-                            key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+							key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
 						},
 						gateway06 = {
 							remotes = { '"gw06-new.hamburg.freifunk.net" port 10008' },
-                            key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+							key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
 						},
 					},
 				},
diff --git a/domains/ffhh_ost.conf b/domains/ffhh_ost.conf
index 7c2b948..be7bf30 100644
--- a/domains/ffhh_ost.conf
+++ b/domains/ffhh_ost.conf
@@ -42,26 +42,26 @@
 					peers = {
 						gateway01 = {
 							remotes = { '"gw01-new.hamburg.freifunk.net" port 10009' },
-                            key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+							key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
 						},
 						gateway02 = {
 							remotes = { '"gw02-new.hamburg.freifunk.net" port 10009' },
-                            key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+							key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
 						},
 						gateway03 = {
 							remotes = { '"gw03-new.hamburg.freifunk.net" port 10009' },
-                            key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+							key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
 						},
 						gateway04 = {
 							remotes = { '"gw04-new.hamburg.freifunk.net" port 10010' },
-                            key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+							key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
 						},
 						gateway05 = {
 							remotes = { '"gw05-new.hamburg.freifunk.net" port 10010' },
-                            key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+							key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
 						},
 						gateway06 = {
-                            key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+							key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
 							remotes = { '"gw06-new.hamburg.freifunk.net" port 10010' },
 						},
 					},
diff --git a/domains/ffhh_sued.conf b/domains/ffhh_sued.conf
index 42da4ca..722aa25 100644
--- a/domains/ffhh_sued.conf
+++ b/domains/ffhh_sued.conf
@@ -42,27 +42,27 @@
 					peers = {
 						gateway01 = {
 							remotes = { '"gw01-new.hamburg.freifunk.net" port 10003' },
-                            key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+							key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
 						},
 						gateway02 = {
-                            key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+							key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
 							remotes = { '"gw02-new.hamburg.freifunk.net" port 10003' },
 						},
 						gateway03 = {
 							remotes = { '"gw03-new.hamburg.freifunk.net" port 10003' },
-                            key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+							key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
 						},
 						gateway04 = {
 							remotes = { '"gw04-new.hamburg.freifunk.net" port 10004' },
-                            key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+							key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
 						},
 						gateway05 = {
 							remotes = { '"gw05-new.hamburg.freifunk.net" port 10004' },
-                            key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+							key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
 						},
 						gateway06 = {
 							remotes = { '"gw06-new.hamburg.freifunk.net" port 10004' },
-                            key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+							key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
 						},
 					},
 				},
diff --git a/domains/ffhh_west.conf b/domains/ffhh_west.conf
index 80c0c15..361446c 100644
--- a/domains/ffhh_west.conf
+++ b/domains/ffhh_west.conf
@@ -42,27 +42,27 @@
 					peers = {
 						gateway01 = {
 							remotes = { '"gw01-new.hamburg.freifunk.net" port 10005' },
-                            key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+							key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
 						},
 						gateway02 = {
-                            key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+							key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
 							remotes = { '"gw02-new.hamburg.freifunk.net" port 10005' },
 						},
 						gateway03 = {
 							remotes = { '"gw03-new.hamburg.freifunk.net" port 10005' },
-                            key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+							key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
 						},
 						gateway04 = {
 							remotes = { '"gw04-new.hamburg.freifunk.net" port 10006' },
-                            key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+							key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
 						},
 						gateway05 = {
 							remotes = { '"gw05-new.hamburg.freifunk.net" port 10006' },
-                            key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+							key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
 						},
 						gateway06 = {
 							remotes = { '"gw06-new.hamburg.freifunk.net" port 10006' },
-                            key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+							key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
 						},
 					},
 				},

From 9ec6df8a052a5d502ebea7ff6b5ea73f24b3e5f5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Sep 2019 21:26:31 +0200
Subject: [PATCH 14/52] set mesh.batman_adv.routing_algo to BATMAN_IV as it is
 now mandatory

---
 domains/ffhh_nowe.conf | 3 +++
 domains/ffhh_ost.conf  | 3 +++
 domains/ffhh_sued.conf | 3 +++
 domains/ffhh_west.conf | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/domains/ffhh_nowe.conf b/domains/ffhh_nowe.conf
index cefc8ee..4ecba48 100644
--- a/domains/ffhh_nowe.conf
+++ b/domains/ffhh_nowe.conf
@@ -33,6 +33,9 @@
 
 	mesh = {
 		vxlan = false,
+		batman_adv = {
+			routing_algo = "BATMAN_IV",
+		},
 	},
 
 	mesh_vpn = {
diff --git a/domains/ffhh_ost.conf b/domains/ffhh_ost.conf
index be7bf30..941b75d 100644
--- a/domains/ffhh_ost.conf
+++ b/domains/ffhh_ost.conf
@@ -33,6 +33,9 @@
 
 	mesh = {
 		vxlan = false,
+		batman_adv = {
+			routing_algo = "BATMAN_IV",
+		},
 	},
 
 	mesh_vpn = {
diff --git a/domains/ffhh_sued.conf b/domains/ffhh_sued.conf
index 722aa25..1a6f31f 100644
--- a/domains/ffhh_sued.conf
+++ b/domains/ffhh_sued.conf
@@ -33,6 +33,9 @@
 
 	mesh = {
 		vxlan = false,
+		batman_adv = {
+			routing_algo = "BATMAN_IV",
+		},
 	},
 
 	mesh_vpn = {
diff --git a/domains/ffhh_west.conf b/domains/ffhh_west.conf
index 361446c..ca3c22a 100644
--- a/domains/ffhh_west.conf
+++ b/domains/ffhh_west.conf
@@ -33,6 +33,9 @@
 
 	mesh = {
 		vxlan = false,
+		batman_adv = {
+			routing_algo = "BATMAN_IV",
+		},
 	},
 
 	mesh_vpn = {

From 2affcbeb3e9dbd1c4fea0ffa989b464c35232438 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 25 Aug 2019 11:12:56 +0200
Subject: [PATCH 15/52] build.sh: create images.list with first line indication
 the release version

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index ce00e05..72fe790 100755
--- a/build.sh
+++ b/build.sh
@@ -116,7 +116,7 @@ for broken_image in "${broken_images[@]}"; do
 done
 # Generate the images.list
 # shellcheck disable=SC2094
-( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
+( cd "${GLUON_OUTPUTDIR}/images" && ( echo "RELEASE=${GLUON_RELEASE}"; find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
 announce Building manifest...
 make manifest
 if [ -n "${signature}" ]; then

From 678c61ae10df15dbad77229c91998fa462edd6bb Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 13 Sep 2019 20:26:13 +0200
Subject: [PATCH 16/52] Update README.md for v2018.2.3.0

(cherry picked from commit 4608dcd94ae8b9a383fe250502b0f86055afbc6e)
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1f20ab2..ef1a9a2 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
 - v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
 - v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
 - v2018.1.4.1: site-ffhh: v2018.1.4.1, gluon: v2018.1.4

From a60bb91b77d4f8a238d4a88d0c3f1e8b4663e491 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 21 Sep 2019 16:38:11 +0200
Subject: [PATCH 17/52] build.sh: Fix a stupid error that prevents building
 without -v

Signed-off-by: Daniel Frank <git@danielfrank.net>
---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 72fe790..88611d9 100755
--- a/build.sh
+++ b/build.sh
@@ -106,7 +106,7 @@ announce "The following targets will be generated: $targets" >&2
 
 for t in $targets; do
 	announce "Starting build for $t..." >&2
-	make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
+	make "-j$(nproc)" "GLUON_TARGET=$t" $verbose
 done
 # Remove known-broken images
 # shellcheck disable=SC2154

From 88a1d79c852edbc99cbf04317c79328904dd7a4e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 21 Sep 2019 16:41:58 +0200
Subject: [PATCH 18/52] build.sh: get rid of some shellcheck warnings

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 88611d9..4bf0eed 100755
--- a/build.sh
+++ b/build.sh
@@ -66,7 +66,7 @@ fi
 
 gluon_path=$(realpath "$gluon_path")
 gluon_out=$(realpath "$gluon_out")
-site_path=$(realpath "$(dirname "$BASH_SOURCE")")
+site_path=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 
 announce GLUON: "$gluon_path" >&2
 announce FFHH SITE PATH: "$site_path" >&2

From e5934ce04fc1d3b0aec60a59f6cfb686294afe4f Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:37:15 +0100
Subject: [PATCH 19/52] fix indentions

---
 site.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/site.mk b/site.mk
index efd1464..4d57d91 100644
--- a/site.mk
+++ b/site.mk
@@ -1,7 +1,8 @@
 GLUON_MULTIDOMAIN := 1
 GLUON_DEPRECATED := upgrade
 
-GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
+GLUON_SITE_PACKAGES := \
+	-gluon-config-mode-geo-location \
 	-gluon-config-mode-contact-info \
 	gluon-ebtables-source-filter \
 	gluon-web-mesh-vpn-fastd \
@@ -25,20 +26,20 @@ GLUON_FEATURES := \
 
 # EXTRA_SOFTWARE_TOOLS_01
 EXTRA_SOFTWARE_TOOLS_01 := \
-        nano \
-        htop \
-        ethtool
+	nano \
+	htop \
+	ethtool
 
 # x86
 ifeq ($(GLUON_TARGET),x86-generic)
 GLUON_SITE_PACKAGES += \
-    $(EXTRA_SOFTWARE_TOOLS_01)
+	$(EXTRA_SOFTWARE_TOOLS_01)
 endif
 
 # x86-64
 ifeq ($(GLUON_TARGET),x86-64)
 GLUON_SITE_PACKAGES += \
-    $(EXTRA_SOFTWARE_TOOLS_01)
+	$(EXTRA_SOFTWARE_TOOLS_01)
 endif
 
 GLUON_PRIORITY ?= 7

From cd90115c7461ec01ce9226689545658a7aba7e4b Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:40:00 +0100
Subject: [PATCH 20/52] gluon-radvd and gluon-ebtables-limit-arp are already in
 batman feature

---
 site.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/site.mk b/site.mk
index 4d57d91..7c9fbe0 100644
--- a/site.mk
+++ b/site.mk
@@ -15,10 +15,8 @@ GLUON_FEATURES := \
 	config-mode-domain-select \
 	ebtables-filter-multicast \
 	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
 	mesh-batman-adv-15 \
 	mesh-vpn-fastd \
-	radvd \
 	respondd \
 	status-page \
 	web-advanced \

From 553ba5c01e1498f58e0e61c14c79f2f7901b6732 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:50:36 +0100
Subject: [PATCH 21/52] unify setting of extra software on x86-generic and
 x86-64

---
 site.mk | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/site.mk b/site.mk
index 7c9fbe0..aea0325 100644
--- a/site.mk
+++ b/site.mk
@@ -22,22 +22,12 @@ GLUON_FEATURES := \
 	web-advanced \
 	web-wizard
 
-# EXTRA_SOFTWARE_TOOLS_01
-EXTRA_SOFTWARE_TOOLS_01 := \
-	nano \
-	htop \
-	ethtool
-
-# x86
-ifeq ($(GLUON_TARGET),x86-generic)
-GLUON_SITE_PACKAGES += \
-	$(EXTRA_SOFTWARE_TOOLS_01)
-endif
-
-# x86-64
-ifeq ($(GLUON_TARGET),x86-64)
-GLUON_SITE_PACKAGES += \
-	$(EXTRA_SOFTWARE_TOOLS_01)
+# x86 and x86-64 add extra software
+ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
+	GLUON_SITE_PACKAGES += \
+		nano \
+		htop \
+		ethtool
 endif
 
 GLUON_PRIORITY ?= 7

From dcc3abbea9cb6bc4639be9b1bde74fd3737a718b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 13 Dec 2019 22:11:59 +0100
Subject: [PATCH 22/52] Prepare migration to gluon v2019.1

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef1a9a2..43739ca 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2019.1.0.0: site-ffhh: v2019.1.0.0, gluon: v2019.1
 - v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
 - v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
 - v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
diff --git a/build.conf b/build.conf
index 6cb03ae..deac187 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2018.2.1.0"
+GLUON_RELEASE="v2019.1.0.0"
 GLUON_BRANCH="stable"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
 broken_images=(

From 049172bb0341154d4bdba6a516978161a3c3a397 Mon Sep 17 00:00:00 2001
From: Ruben Barkow-Kuder <rubo77@users.noreply.github.com>
Date: Sun, 1 Dec 2019 13:03:55 +0100
Subject: [PATCH 23/52] add web-private-wifi

---
 site.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site.mk b/site.mk
index efd1464..c2a3ba0 100644
--- a/site.mk
+++ b/site.mk
@@ -17,6 +17,7 @@ GLUON_FEATURES := \
 	ebtables-limit-arp \
 	mesh-batman-adv-15 \
 	mesh-vpn-fastd \
+	web-private-wifi \
 	radvd \
 	respondd \
 	status-page \

From c23854de97487b2edfd57f93431a259973f09284 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:35:15 +0100
Subject: [PATCH 24/52] add gluon-radv-filterd

---
 site.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site.mk b/site.mk
index c2a3ba0..d214e8c 100644
--- a/site.mk
+++ b/site.mk
@@ -19,6 +19,7 @@ GLUON_FEATURES := \
 	mesh-vpn-fastd \
 	web-private-wifi \
 	radvd \
+	radv-filterd \
 	respondd \
 	status-page \
 	web-advanced \

From 48083c51def4783a317dfb7225a3e669a7fce205 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 8 Jun 2020 20:45:04 +0200
Subject: [PATCH 25/52] bump version to 2019.1.2

---
 README.md  | 2 +-
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 43739ca..85bf9ad 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
-- v2019.1.0.0: site-ffhh: v2019.1.0.0, gluon: v2019.1
+- v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
 - v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
 - v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
 - v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
diff --git a/build.conf b/build.conf
index deac187..84b8c24 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2019.1.0.0"
+GLUON_RELEASE="v2019.1.2.0"
 GLUON_BRANCH="stable"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
 broken_images=(

From ccad2d2a2ba4fc36ef0f9673d8eb5471ca475ca5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 19 Jun 2020 22:00:28 +0200
Subject: [PATCH 26/52] Bump to v2020.1.3.0

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 85bf9ad..c6fabf1 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
 - v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
 - v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
 - v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
diff --git a/build.conf b/build.conf
index 84b8c24..0ca7d8a 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2019.1.2.0"
+GLUON_RELEASE="v2020.1.3.0"
 GLUON_BRANCH="stable"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
 broken_images=(

From 0d3140f32573058012f498a6f59f82b376b40ce0 Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Mon, 22 Jun 2020 13:17:10 +0200
Subject: [PATCH 27/52] site.conf: add channel list for 5GHz outdoor mode

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

diff --git a/site.conf b/site.conf
index c8ea474..d1432a8 100644
--- a/site.conf
+++ b/site.conf
@@ -31,6 +31,7 @@
 
 	wifi5 = {
 		channel = 44,
+		outdoor_chanlist = "100-140",
 		mesh = {
 			mcast_rate = 12000,
 		},

From f996941c77b9c95a2699b2c9ffc752bb59a187df Mon Sep 17 00:00:00 2001
From: Bjoern Dobe <bjoern@dobecom.de>
Date: Sat, 8 Aug 2020 12:15:35 +0200
Subject: [PATCH 28/52] site.mk: remove haveged

Remove the package haveged from site config, since it is no longer supported from Gluon
2020.2.
---
 site.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site.mk b/site.mk
index a46537b..5952e73 100644
--- a/site.mk
+++ b/site.mk
@@ -6,7 +6,6 @@ GLUON_SITE_PACKAGES := \
 	-gluon-config-mode-contact-info \
 	gluon-ebtables-source-filter \
 	gluon-web-mesh-vpn-fastd \
-	haveged \
 	iptables \
 	iwinfo
 

From 8e01a9a42a05e63955bdbd559449fda789867350 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 12 Sep 2020 00:37:24 +0200
Subject: [PATCH 29/52] README update for v2020.1.4.0

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c6fabf1..97ae8ce 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
 - v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
 - v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
 - v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3

From 78606aea3af1f579d721625903548047166f3278 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 16 Dec 2020 22:07:43 +0100
Subject: [PATCH 30/52] Prepare v2020.2.2.0

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 97ae8ce..99413eb 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
 - v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
 - v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
 - v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
diff --git a/build.conf b/build.conf
index 0ca7d8a..3185df3 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2020.1.3.0"
+GLUON_RELEASE="v2020.2.2.0"
 GLUON_BRANCH="stable"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
 broken_images=(

From 9ddf2f6720ce6598ddf4fcd6cbaea773a35f13a1 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 17 May 2021 20:05:27 +0200
Subject: [PATCH 31/52] Prepare release of v2020.2.3.0

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 99413eb..01cc4a6 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
 - v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
 - v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
 - v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3

From 28795fdd67fb9ec7bb5f22d5378f34c1ecc348a0 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 10 Jan 2022 20:28:41 +0100
Subject: [PATCH 32/52] Updates for v2021.1.1.0

---
 README.md  |  1 +
 build.conf |  3 +--
 build.sh   | 13 +++++++++----
 site.mk    |  2 ++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 01cc4a6..8f05274 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
 - v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
 - v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
diff --git a/build.conf b/build.conf
index 3185df3..fa24547 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,4 @@
-GLUON_RELEASE="v2020.2.2.0"
-GLUON_BRANCH="stable"
+GLUON_RELEASE="v2021.1.1.0"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
 broken_images=(
 	'*dir*615*d*'
diff --git a/build.sh b/build.sh
index 4bf0eed..c907d12 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,7 @@ function usage () {
 	echo "       -a              Automatically detect and build all targets." >&2
 	echo "       -o OUT_PATH     Path to the firmware output directory. Default: ${gluon_out}" >&2
 	echo "       -s SIGNATURE    Sign firmware with signature" >&2
+	echo "       -stable         Set GLUON_AUTOUPDATER_BRANCH=stable" >&2
 	echo "       -b              BROKEN=1" >&2
 	echo "       -v              verbose" >&2
 	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
@@ -40,6 +41,10 @@ while [ $# -gt 0 ]; do
 			signature="$2"
 			shift
 			;;
+		-stable)
+			export GLUON_AUTOUPDATER_BRANCH=stable
+			shift
+			;;
 		-b)
 			export BROKEN=1
 			;;
@@ -74,11 +79,11 @@ announce FFHH SITE PATH: "$site_path" >&2
 pushd "$site_path"
 # shellcheck source=/dev/null
 . ./build.conf
-[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+[ "${GLUON_AUTOUPDATER_BRANCH:-experimental}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
 export GLUON_RELEASE
-export GLUON_BRANCH
+export GLUON_AUTOUPDATER_BRANCH
 export GLUON_SITEDIR="${site_path}"
-export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
+export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
 popd
 
 pushd "${gluon_path}"
@@ -120,7 +125,7 @@ done
 announce Building manifest...
 make manifest
 if [ -n "${signature}" ]; then
-	if [ "$GLUON_BRANCH" == "experimental" ]; then
+	if [ "$GLUON_AUTOUPDATER_BRANCH" == "experimental" ]; then
 		announce Signing...
 		"${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
 	else
diff --git a/site.mk b/site.mk
index 5952e73..2d6fb10 100644
--- a/site.mk
+++ b/site.mk
@@ -1,6 +1,8 @@
 GLUON_MULTIDOMAIN := 1
 GLUON_DEPRECATED := upgrade
 
+GLUON_AUTOUPDATER_ENABLED ?= 1
+
 GLUON_SITE_PACKAGES := \
 	-gluon-config-mode-geo-location \
 	-gluon-config-mode-contact-info \

From cffd0a85530d8e918e6c84a3c5f4806a0061ad4b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 11 Jan 2022 01:25:05 +0100
Subject: [PATCH 33/52] no more git on github

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

diff --git a/modules b/modules
index 6416262..d1b67ac 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffhh_packages'
 
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_REPO=https://github.com/freifunkhamburg/ffhh-packages.git
 PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
 

From 9647ec46934a50af371d7624a2662f699a8c8ce1 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 21 Mar 2022 21:53:35 +0100
Subject: [PATCH 34/52] Updates for v2021.1.1.0

---
 build.conf | 2 +-
 build.sh   | 6 +++++-
 modules    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.conf b/build.conf
index fa24547..f69fe80 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
 GLUON_RELEASE="v2021.1.1.0"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
+targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
 broken_images=(
 	'*dir*615*d*'
 )
diff --git a/build.sh b/build.sh
index c907d12..507a127 100755
--- a/build.sh
+++ b/build.sh
@@ -79,13 +79,17 @@ announce FFHH SITE PATH: "$site_path" >&2
 pushd "$site_path"
 # shellcheck source=/dev/null
 . ./build.conf
-[ "${GLUON_AUTOUPDATER_BRANCH:-experimental}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
+[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
 export GLUON_RELEASE
 export GLUON_AUTOUPDATER_BRANCH
 export GLUON_SITEDIR="${site_path}"
 export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
 popd
 
+announce GLUON Variables:
+env | egrep '^GLUON' | sort
+
 pushd "${gluon_path}"
 announce Starting make update...
 rm -rf "${GLUON_OUTPUTDIR}"
diff --git a/modules b/modules
index 6416262..d1b67ac 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffhh_packages'
 
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_REPO=https://github.com/freifunkhamburg/ffhh-packages.git
 PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
 

From 7ad2cd6af6d014590e7b6ef6e0d0d1ae64ca8766 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 2 May 2022 21:37:49 +0200
Subject: [PATCH 35/52] build.sh: fix broken build.sh

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.sh b/build.sh
index 507a127..ac09d08 100755
--- a/build.sh
+++ b/build.sh
@@ -43,7 +43,6 @@ while [ $# -gt 0 ]; do
 			;;
 		-stable)
 			export GLUON_AUTOUPDATER_BRANCH=stable
-			shift
 			;;
 		-b)
 			export BROKEN=1

From 639d076417430b3ee3865fb484dc11adc43d32d4 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 3 May 2022 22:00:52 +0200
Subject: [PATCH 36/52] Add new version numbers in preparation for the security
 update

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f05274..53cbfb6 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
 - v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
 - v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
diff --git a/build.conf b/build.conf
index f69fe80..13f862f 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2021.1.1.0"
+GLUON_RELEASE="v2021.1.2.0"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
 broken_images=(
 	'*dir*615*d*'

From 932dfba35e47eb3097f9306e865159940ffadedd Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 17 Oct 2022 20:29:52 +0200
Subject: [PATCH 37/52] Updates for gluon v2022.1

---
 README.md  | 1 +
 build.conf | 4 ++--
 site.conf  | 2 +-
 site.mk    | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 53cbfb6..773f866 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2022.1.0.0: site-ffhh: v2022.1.0.0, gluon: v2022.1
 - v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
 - v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 13f862f..282bef3 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
-GLUON_RELEASE="v2021.1.2.0"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
+GLUON_RELEASE="v2022.1.0.0"
+targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'
 )
diff --git a/site.conf b/site.conf
index d1432a8..04919a0 100644
--- a/site.conf
+++ b/site.conf
@@ -39,9 +39,9 @@
 
 	mesh_vpn = {
 		enabled = true,
-		mtu = 1312,
 		fastd = {
 			configurable = true,
+			mtu = 1312,
 			methods = {'salsa2012+umac'},
 			groups = {
 				backbone = {
diff --git a/site.mk b/site.mk
index 2d6fb10..419cb23 100644
--- a/site.mk
+++ b/site.mk
@@ -8,7 +8,6 @@ GLUON_SITE_PACKAGES := \
 	-gluon-config-mode-contact-info \
 	gluon-ebtables-source-filter \
 	gluon-web-mesh-vpn-fastd \
-	iptables \
 	iwinfo
 
 GLUON_FEATURES := \

From df829eb3d03caa4f7e33222e516e4ee7890d8716 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 6 Feb 2023 20:45:11 +0100
Subject: [PATCH 38/52] Update for v2022.1.1.0

---
 README.md  | 2 +-
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 773f866..386cd89 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
-- v2022.1.0.0: site-ffhh: v2022.1.0.0, gluon: v2022.1
+- v2022.1.1.0: site-ffhh: v2022.1.1.0, gluon: v2022.1.1
 - v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
 - v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 282bef3..44a981b 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.0.0"
+GLUON_RELEASE="v2022.1.1.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'

From cd2d266749421eff3a9d9381c7c1df773408a093 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 20 Mar 2023 20:11:49 +0100
Subject: [PATCH 39/52] Updates for v2022.1.3.0

---
 README.md  | 2 +-
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 386cd89..02de4be 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
-- v2022.1.1.0: site-ffhh: v2022.1.1.0, gluon: v2022.1.1
+- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3
 - v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
 - v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 44a981b..7b0d90e 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.1.0"
+GLUON_RELEASE="v2022.1.3.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'

From e0206d03726a5537a736f69b9a4ae66b198dcd08 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 2 Feb 2024 20:05:50 +0100
Subject: [PATCH 40/52] v2022.1.4.0

---
 README.md  | 3 ++-
 build.conf | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 02de4be..8a01a20 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
-- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3
+- v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
+- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
 - v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
 - v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 7b0d90e..387c8db 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.3.0"
+GLUON_RELEASE="v2022.1.4.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'

From 6436e5cec6148af26bcf738da08d96cac5685ecc Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 25 Mar 2024 17:00:17 +0100
Subject: [PATCH 41/52] v2023.1.2

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8a01a20..5f1ea19 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
 - v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
 - v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
 - v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
diff --git a/build.conf b/build.conf
index 387c8db..7c44063 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.4.0"
+GLUON_RELEASE="v2023.1.2.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'

From 1a956e5375e11473955b490614e46e4d97fb2e48 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 26 Mar 2024 21:33:19 +0100
Subject: [PATCH 42/52] =?UTF-8?q?add=20updates=20for=20v2023.2=20from=20Bj?=
 =?UTF-8?q?=C3=B6rn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 image-customization.lua | 36 ++++++++++++++++++++++++++++++++++++
 site.mk                 | 29 -----------------------------
 2 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 image-customization.lua

diff --git a/image-customization.lua b/image-customization.lua
new file mode 100644
index 0000000..79abeed
--- /dev/null
+++ b/image-customization.lua
@@ -0,0 +1,36 @@
+features({
+    'autoupdater',
+    'config-mode-domain-select',
+    'ebtables-filter-multicast',
+    'ebtables-filter-ra-dhcp',
+    'mesh-batman-adv-15',
+    'mesh-vpn-fastd',
+    'web-private-wifi',
+    'radv-filterd',
+    'respondd',
+    'status-page',
+    'web-advanced',
+    'web-wizard',
+})
+
+if not device_class('tiny') then
+    features({
+        'wireless-encryption-wpa3',
+    })
+end
+
+packages({
+    '-gluon-config-mode-geo-location',
+    '-gluon-config-mode-contact-info',
+    'gluon-ebtables-source-filter',
+    'gluon-web-mesh-vpn-fastd',
+    'iwinfo',
+})
+
+if target('x86') then
+    packages({
+        'nano',
+        'htop',
+        'ethtool',
+    })
+end
diff --git a/site.mk b/site.mk
index 419cb23..45aa428 100644
--- a/site.mk
+++ b/site.mk
@@ -3,35 +3,6 @@ GLUON_DEPRECATED := upgrade
 
 GLUON_AUTOUPDATER_ENABLED ?= 1
 
-GLUON_SITE_PACKAGES := \
-	-gluon-config-mode-geo-location \
-	-gluon-config-mode-contact-info \
-	gluon-ebtables-source-filter \
-	gluon-web-mesh-vpn-fastd \
-	iwinfo
-
-GLUON_FEATURES := \
-	autoupdater \
-	config-mode-domain-select \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	mesh-batman-adv-15 \
-	mesh-vpn-fastd \
-	web-private-wifi \
-	radv-filterd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-wizard
-
-# x86 and x86-64 add extra software
-ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
-	GLUON_SITE_PACKAGES += \
-		nano \
-		htop \
-		ethtool
-endif
-
 GLUON_PRIORITY ?= 7
 
 # Region code required for some images; supported values: us eu

From 87e65917f87469570d966cd0e1a870b6bcc31b8f Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 26 Mar 2024 21:34:19 +0100
Subject: [PATCH 43/52] v2023.2.2.0

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f1ea19..a4daeb7 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
 - v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
 - v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
 - v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
diff --git a/build.conf b/build.conf
index 7c44063..fa36fb5 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2023.1.2.0"
+GLUON_RELEASE="v2023.2.2.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'

From 6251517fe4696099b092ede352fe48e1a4f8df74 Mon Sep 17 00:00:00 2001
From: Entil_Zha <Entil_Zha@localhost.localdomain>
Date: Mon, 16 Sep 2024 19:38:57 +0200
Subject: [PATCH 44/52] add mediatek-filogic targets

---
 README.md  | 3 ++-
 build.conf | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a4daeb7..0a79e19 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 	In the next two commands replace GLUON_VERSION and SITE_VERSION with the actual version numbers.
 	$ git clone -b GLUON_VERSION https://github.com/freifunk-gluon/gluon.git
-	$ git clone -b SITE_VERSION https://github.com/freifunkhamburg/site-ffhh.git
+	$ git clone -b SITE_VERSION https://git.hamburg.ccc.de/freifunk/site-ffhh.git
 	$ cd site-ffhh
 
 	To build the firmware into the subdirectory firmware:
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2023.2.2.1: site-ffhh: v2023.2.2.0, gluon: v2023.2.2 (add mediatek-filogic Routers)
 - v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
 - v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
 - v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
diff --git a/build.conf b/build.conf
index fa36fb5..ee3219a 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
 GLUON_RELEASE="v2023.2.2.0"
-targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
+targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'
 )

From 9c77f1954908127d12478b8cf14878589ca20fb0 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 1 Nov 2024 20:52:11 +0100
Subject: [PATCH 45/52] v2023.2.4.0

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0a79e19..d9e669a 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2023.2.4.0: site-ffhh: v2023.2.4.0, gluon: v2023.2.4
 - v2023.2.2.1: site-ffhh: v2023.2.2.0, gluon: v2023.2.2 (add mediatek-filogic Routers)
 - v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
 - v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
diff --git a/build.conf b/build.conf
index ee3219a..07358e1 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2023.2.2.0"
+GLUON_RELEASE="v2023.2.4.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'

From db81f77fd00b983b89154a2697a28bc1fa96f918 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 4 Nov 2024 00:49:48 +0100
Subject: [PATCH 46/52] dont nuke the output directory on each run

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.sh b/build.sh
index ac09d08..a91a46d 100755
--- a/build.sh
+++ b/build.sh
@@ -91,7 +91,6 @@ env | egrep '^GLUON' | sort
 
 pushd "${gluon_path}"
 announce Starting make update...
-rm -rf "${GLUON_OUTPUTDIR}"
 mkdir -p "${GLUON_OUTPUTDIR}"
 make update
 # Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.

From b3c3b41e3099a5c3379bbbd0501975f274ca7706 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 4 Nov 2024 20:05:53 +0100
Subject: [PATCH 47/52] support BUILD_DATE for experimental versions

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index a91a46d..5647ba5 100755
--- a/build.sh
+++ b/build.sh
@@ -79,7 +79,7 @@ pushd "$site_path"
 # shellcheck source=/dev/null
 . ./build.conf
 GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
-[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp${BUILD_DATE:-$(date +%Y%m%d)}"
 export GLUON_RELEASE
 export GLUON_AUTOUPDATER_BRANCH
 export GLUON_SITEDIR="${site_path}"

From 1c94a2061ef9342b4b32eed69dcb66ee11fda19f Mon Sep 17 00:00:00 2001
From: Bjoern Dobe <bjoern@dobecom.de>
Date: Fri, 6 Jun 2025 20:16:53 +0200
Subject: [PATCH 48/52] update ffhh-packages repository

---
 modules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules b/modules
index d1b67ac..45f281f 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,4 @@
 GLUON_SITE_FEEDS='ffhh_packages'
 
-PACKAGES_FFHH_PACKAGES_REPO=https://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
-
+PACKAGES_FFHH_PACKAGES_REPO=https://codeberg.org/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_COMMIT=eb99353a88b399583f46288485d05ca8d53cd1ac

From a1e1ac30fc872e5ae3c43da141b7374330480d2d Mon Sep 17 00:00:00 2001
From: Bjoern Dobe <bjoern@dobecom.de>
Date: Fri, 6 Jun 2025 20:32:19 +0200
Subject: [PATCH 49/52] add package gluon-upgrade-static-interface-ffhh to
 default packages

---
 image-customization.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/image-customization.lua b/image-customization.lua
index 79abeed..34f6279 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -23,6 +23,7 @@ packages({
     '-gluon-config-mode-geo-location',
     '-gluon-config-mode-contact-info',
     'gluon-ebtables-source-filter',
+    'gluon-upgrade-static-interface-ffhh',
     'gluon-web-mesh-vpn-fastd',
     'iwinfo',
 })

From fcccd3a1050fb6f7958a9497f1e271cc267106d8 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Jun 2025 20:40:27 +0200
Subject: [PATCH 50/52] Rename master branch to main


From 457461ad05e82694f79f5bd9b51a6b0bbf1aa737 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Jun 2025 20:42:46 +0200
Subject: [PATCH 51/52] Update README.md to reference codeberg as main repo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d9e669a..69c6bc6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 	In the next two commands replace GLUON_VERSION and SITE_VERSION with the actual version numbers.
 	$ git clone -b GLUON_VERSION https://github.com/freifunk-gluon/gluon.git
-	$ git clone -b SITE_VERSION https://git.hamburg.ccc.de/freifunk/site-ffhh.git
+	$ git clone -b SITE_VERSION https://codeberg.org/freifunkhamburg/site-ffhh.git
 	$ cd site-ffhh
 
 	To build the firmware into the subdirectory firmware:

From ae5b4804f55c36f935d9126c48b125ea1e5f27e5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Jun 2025 22:21:14 +0200
Subject: [PATCH 52/52] Update build.conf for v2023.2.5.0

---
 README.md  | 1 +
 build.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 69c6bc6..a0673d8 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2023.2.5.0: site-ffhh: v2023.2.5.0, gluon: v2023.2.5
 - v2023.2.4.0: site-ffhh: v2023.2.4.0, gluon: v2023.2.4
 - v2023.2.2.1: site-ffhh: v2023.2.2.0, gluon: v2023.2.2 (add mediatek-filogic Routers)
 - v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
diff --git a/build.conf b/build.conf
index 07358e1..2d07aa1 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2023.2.4.0"
+GLUON_RELEASE="v2023.2.5.0"
 targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'