README.md

@@ -21,7 +21,7 @@ the future development of Gluon.
 
 Please refrain from using the `master` branch for anything else but development purposes!
 Use the most recent release instead. You can list all releases by running `git tag`
-and switch to one by running `git checkout v2020.2.2 && make update`.
+and switch to one by running `git checkout v2020.2.3 && make update`.
 
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *will break* eventually.

contrib/actions/install-dependencies.sh

@@ -2,9 +2,7 @@
 
 set -e
 
-cp contrib/actions/sources.list /etc/apt/sources.list
-rm -rf /etc/apt/sources.list.d
-apt update
-apt install git subversion build-essential python gawk unzip libncurses5-dev zlib1g-dev libssl-dev wget time
-apt clean
+apt-get update
+apt-get install git subversion build-essential python gawk unzip libncurses-dev zlib1g-dev libssl-dev wget time
+apt-get clean
 rm -rf /var/lib/apt/lists/*

contrib/actions/sources.list

-deb http://mirror.netcologne.de/ubuntu/ bionic main restricted
-deb http://mirror.netcologne.de/ubuntu/ bionic-updates main restricted

docs/conf.py

@@ -24,7 +24,7 @@ copyright = '2015-2020, Project Gluon'
 author = 'Project Gluon'
 
 # The short X.Y version
-version = '2020.2.2'
+version = '2020.2.3'
 # The full version, including alpha/beta/rc tags
 release = version
 

docs/index.rst

@@ -78,6 +78,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
    :caption: Releases
    :maxdepth: 1
 
+   releases/v2020.2.3
    releases/v2020.2.2
    releases/v2020.2.1
    releases/v2020.2

docs/releases/v2020.2.3.rst

+Gluon 2020.2.3
+==============
+
+Bugfixes
+--------
+
+- LEDs on the ASUS RT-AC51 are now fully functional.
+
+- Netgear EX6150v1 randomly booting into failsafe mode has been fixed.
+  This happened dependant on the state of the mode setting switch.
+
+- Dnsmasq has been patched against multiple security issues in its DNS response validation.
+  See the OpenWrt advisory at https://openwrt.org/advisory/2021-01-19-1
+
+
+Other changes
+-------------
+
+- Linux kernel has been updated to 4.14.224
+- batman-adv fixes were backported from its 2021.0 release
+- OpenSSL has been updated to 1.1.1k
+
+Known issues
+------------
+
+* Upgrading EdgeRouter-X from versions before v2020.1.x may lead to a soft-bricked state due to bad blocks on the
+  NAND flash which the NAND driver before this release does not handle well.
+  (`#1937 <https://github.com/freifunk-gluon/gluon/issues/1937>`_)
+
+* The integration of the BATMAN_V routing algorithm is incomplete.
+
+  - Mesh neighbors don't appear on the status page. (`#1726 <https://github.com/freifunk-gluon/gluon/issues/1726>`_)
+    Many tools have the BATMAN_IV metric hardcoded, these need to be updated to account for the new throughput
+    metric.
+  - Throughput values are not correctly acquired for different interface types.
+    (`#1728 <https://github.com/freifunk-gluon/gluon/issues/1728>`_)
+    This affects virtual interface types like bridges and VXLAN.
+
+* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown
+  (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
+
+  Reducing the TX power in the Advanced Settings is recommended.
+
+* In configurations not using VXLAN, the MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled
+  (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
+
+  This may lead to issues in environments where a fixed MAC address is expected (like VMware when promiscuous mode is
+  disallowed).
+

docs/site-example/site.conf

--- This is an example site configuration for Gluon v2020.2.2
+-- This is an example site configuration for Gluon v2020.2.3
 --
 -- Take a look at the documentation located at
 -- https://gluon.readthedocs.io/ for details.

docs/user/getting_started.rst

@@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
 started with Gluon we recommend to use the latest stable release of Gluon.
 
 Take a look at the `list of gluon releases`_ and notice the latest release,
-e.g. *v2020.2.2*. Always get Gluon using git and don't try to download it
+e.g. *v2020.2.3*. Always get Gluon using git and don't try to download it
 as a Zip archive as the archive will be missing version information.
 
 Please keep in mind that there is no "default Gluon" build; a site configuration
@@ -44,7 +44,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2020.2.2*.
+version you'd like to checkout, e.g. *v2020.2.3*.
 
 ::
 

modules

@@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-19.07
-OPENWRT_COMMIT=d0b8be75ff248b4cda009a6c1ce72eb0072c6f82
+OPENWRT_COMMIT=81266d900104d657275aa5df3fb7629f7892c57a
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-19.07
-PACKAGES_PACKAGES_COMMIT=2974079d3db786fe5da00c10f1d80e79b0112093
+PACKAGES_PACKAGES_COMMIT=fdd4afe6ac0c05ba2b25d28700809841aeda643d
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_BRANCH=openwrt-19.07
-PACKAGES_ROUTING_COMMIT=02b4dbfcb7b8f8b566940847d22d5a6f229d2e66
+PACKAGES_ROUTING_COMMIT=e26b4745209655976b7d124465b1dc53ade632f9
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c
+PACKAGES_GLUON_COMMIT=3822f44013ccf60729d66c6143f554b6db2ccb63

package/gluon-core/Config.in

@@ -24,16 +24,12 @@ config KERNEL_TUN
 config KERNEL_L2TP_V3
 	bool
 
-config KERNEL_L2TP_IP
-	bool
-
 config KERNEL_L2TP_ETH
 	bool
 
 config KERNEL_L2TP
 	bool
 	select KERNEL_L2TP_V3
-	select KERNEL_L2TP_IP
 	select KERNEL_L2TP_ETH
 
 

package/gluon-respondd/src/respondd-statistics.c

@@ -239,7 +239,7 @@ static void count_iface_stations(size_t *wifi24, size_t *wifi5, const char *ifna
 	}
 }
 
-static void count_stations(size_t *wifi24, size_t *wifi5, size_t *owe24, size_t owe5) {
+static void count_stations(size_t *wifi24, size_t *wifi5, size_t *owe24, size_t *owe5) {
 	struct uci_context *ctx = uci_alloc_context();
 	if (!ctx)
 		return;

package/libgluonutil/src/libgluonutil.h

@@ -42,6 +42,7 @@ struct json_object * gluonutil_wrap_and_free_string(char *str);
 
 bool gluonutil_has_domains(void);
 char * gluonutil_get_domain(void);
+char * gluonutil_get_primary_domain(void);
 struct json_object * gluonutil_load_site_config(void);
 
 #endif /* _LIBGLUON_LIBGLUON_H_ */

patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Sat, 13 Jun 2020 19:19:17 +0200
-Subject: mt76: mt76x0: disable GTK offloading
-
-When the GTK is offloaded, MT7610 won't transmit any multicast frames.
-This is most likely due to a bug in the offloading datapath. MT7612 is
-not affected.
-
-Disable GTK offloading for now. It can be re-enabled once the bug in the
-offloading path is fixed.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch b/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..e7e19ac957dbfaa9510016d3387abe9eed353538
---- /dev/null
-+++ b/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch
-@@ -0,0 +1,30 @@
-+From ae01717951013fbc8bb0315d902d5b9f5873631a Mon Sep 17 00:00:00 2001
-+From: David Bauer <mail@david-bauer.net>
-+Date: Fri, 12 Jun 2020 01:09:57 +0200
-+Subject: [PATCH] mt76: mt76x0: disable GTK offloading
-+
-+When the GTK is offloaded, MT7610 won't transmit any multicast frames.
-+This is most likely due to a bug in the offloading datapath. MT7612 is
-+not affected.
-+
-+Disable GTK offloading for now. It can be re-enabled once the bug in the
-+offloading path is fixed.
-+
-+Signed-off-by: David Bauer <mail@david-bauer.net>
-+---
-+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 ++++
-+ 1 file changed, 4 insertions(+)
-+
-+--- a/mt76x02_util.c
-++++ b/mt76x02_util.c
-+@@ -432,6 +432,10 @@ int mt76x02_set_key(struct ieee80211_hw
-+ 	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
-+ 		return -EOPNOTSUPP;
-+ 
-++	/* MT76x0 GTK offloading is currently broken */
-++	if (is_mt76x0(dev) && !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
-++		return -EOPNOTSUPP;
-++
-+ 	/*
-+ 	 * In USB AP mode, broadcast/multicast frames are setup in beacon
-+ 	 * data registers and sent via HW beacons engine, they require to

patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch

-From: David Bauer <mail@david-bauer.net>
-Date: Thu, 15 Oct 2020 22:42:54 +0200
-Subject: mt76: mt7603: add additional EEPROM chip ID
-
-Some newer MT7628 based routers (notably the TP-Link Archer C50 v4) are
-shipped with a chip-id of 0x7600 in the on-flash EEPROM. Add this as a
-possible valid ID.
-
-Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2781
-
-Suggested-by: Ron Asimi <ron.asimi@gmail.com>
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch b/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..c749aa403f5940c19e5f580f461874b708b41f66
---- /dev/null
-+++ b/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch
-@@ -0,0 +1,27 @@
-+From 6b51340cdc32b1ba75163faaa8592feaeb4bddec Mon Sep 17 00:00:00 2001
-+From: David Bauer <mail@david-bauer.net>
-+Date: Sat, 10 Oct 2020 00:36:02 +0200
-+Subject: [PATCH] mt76: mt7603: add additional EEPROM chip ID
-+
-+Some newer MT7628 based routers (notably the TP-Link Archer C50 v4) are
-+shipped with a chip-id of 0x7600 in the on-flash EEPROM. Add this as a
-+possible valid ID.
-+
-+Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2781
-+
-+Suggested-by: Ron Asimi <ron.asimi@gmail.com>
-+Signed-off-by: David Bauer <mail@david-bauer.net>
-+---
-+ mt7603/eeprom.c | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+--- a/mt7603/eeprom.c
-++++ b/mt7603/eeprom.c
-+@@ -136,6 +136,7 @@ static int mt7603_check_eeprom(struct mt
-+ 	switch (val) {
-+ 	case 0x7628:
-+ 	case 0x7603:
-++	case 0x7600:
-+ 		return 0;
-+ 	default:
-+ 		return -EINVAL;

targets/ramips-mt7620

@@ -42,7 +42,9 @@ device('tp-link-archer-c2-v1', 'tplink_c2-v1', {
 	factory = false,
 })
 
-device('tp-link-archer-c20-v1', 'tplink_c20-v1')
+device('tp-link-archer-c20-v1', 'tplink_c20-v1', {
+	factory = false,
+})
 
 device('tp-link-archer-c20i', 'ArcherC20i')