Merge tag 'v2023.2.3' into v2023.2.x-hwtest

Gluon v2023.2.3

.github/labeler.yml

@@ -1,59 +1,93 @@
 ---
 "3. topic: babel":
-  - package/gluon-l3roamd/**
-  - package/gluon-mesh-babel/**
-  - package/gluon-mmfd/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/gluon-l3roamd/**
+    - package/gluon-mesh-babel/**
+    - package/gluon-mmfd/**
 "3. topic: batman-adv":
-  - docs/package/gluon-mesh-batman-adv*
-  - package/gluon-alfred/**
-  - package/gluon-client-bridge/**
-  - package/gluon-mesh-batman-adv/**
-  - package/libbatadv/**
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/package/gluon-mesh-batman-adv*
+    - package/gluon-alfred/**
+    - package/gluon-client-bridge/**
+    - package/gluon-mesh-batman-adv/**
+    - package/libbatadv/**
 "3. topic: build":
-  - Makefile
-  - scripts/**
+  - changed-files:
+    - any-glob-to-any-file:
+      - Makefile
+      - scripts/**
 "3. topic: config-mode":
-  - docs/dev/web/config-mode.rst
-  - docs/package/gluon-config-mode-*
-  - package/gluon-config-mode-*/**
-  - package/gluon-web*/**
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/dev/web/config-mode.rst
+    - docs/package/gluon-config-mode-*
+    - package/gluon-config-mode-*/**
+    - package/gluon-web*/**
 "3. topic: continous integration":
-  - .github/workflows/*
-  - contrib/actions/**
-  - contrib/ci/**
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/workflows/*
+    - contrib/actions/**
+    - contrib/ci/**
 "3. topic: docs":
-  - docs/**
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/**
 "3. topic: fastd":
-  - docs/features/fastd*
-  - package/gluon-mesh-vpn-fastd/**
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/features/fastd*
+    - package/gluon-mesh-vpn-fastd/**
 "3. topic: firewall":
-  - package/**/*-firewall
-  - package/gluon-ebtables-*/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/**/*-firewall
+    - package/gluon-ebtables-*/**
 "3. topic: hardware":
-  - package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
-  - package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
-  - targets/*
+- changed-files:
+  - any-glob-to-any-file:
+    - package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+    - package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
+    - targets/*
 "3. topic: multidomain":
-  - docs/features/multidomain*
-  - docs/multidomain-site-example/**
-  - package/gluon-config-mode-domain-select/**
-  - package/gluon-scheduled-domain-switch/**
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/features/multidomain*
+    - docs/multidomain-site-example/**
+    - package/gluon-config-mode-domain-select/**
+    - package/gluon-scheduled-domain-switch/**
 "3. topic: package":
-  - package/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/**
 "3. topic: respondd":
-  - package/**/*respondd*
-  - package/gluon-respondd/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/**/*respondd*
+    - package/gluon-respondd/**
 "3. topic: status-page":
-  - package/gluon-status-page/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/gluon-status-page/**
 "3. topic: tests":
-  - tests/**
+- changed-files:
+  - any-glob-to-any-file:
+    - tests/**
 "3. topic: tunneldigger":
-  - package/gluon-mesh-vpn-tunneldigger/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/gluon-mesh-vpn-tunneldigger/**
 "3. topic: wireguard":
-  - package/gluon-mesh-vpn-wireguard/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/gluon-mesh-vpn-wireguard/**
 "3. topic: wireless":
-  - package/gluon-mesh-wireless-sae/**
-  - package/gluon-private-wifi/**
-  - package/gluon-web-private-wifi/**
-  - package/gluon-web-wifi-config/**
-  - package/gluon-wireless-encryption-wpa3/**
+- changed-files:
+  - any-glob-to-any-file:
+    - package/gluon-mesh-wireless-sae/**
+    - package/gluon-private-wifi/**
+    - package/gluon-web-private-wifi/**
+    - package/gluon-web-wifi-config/**
+    - package/gluon-wireless-encryption-wpa3/**

.github/workflows/build-container.yml

@@ -23,9 +23,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Log in to the Container registry
         uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         if: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}

.github/workflows/build-docs.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Build documentation
         run: make -C docs html
       - name: Archive build output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs_output
           path: docs/_build/html

.github/workflows/build-gluon.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
 
       # Filter targets based on changed files
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: .github/filters.yml
@@ -56,13 +56,13 @@ jobs:
 
       - name: Archive build logs
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target }}_logs
           path: openwrt/logs
 
       - name: Archive build output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target }}_output
           path: output

.github/workflows/labels.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: github.repository_owner == 'freifunk-gluon'
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         sync-labels: true

README.md

@@ -59,7 +59,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 v2023.2.2 && make update`.
+and switch to one by running `git checkout v2023.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 *might break* eventually.

docs/conf.py

@@ -24,7 +24,7 @@
 author = 'Project Gluon'
 
 # The short X.Y version
-version = '2023.2.2'
+version = '2023.2.3'
 # The full version, including alpha/beta/rc tags
 release = version
 

docs/releases/index.rst

@@ -5,6 +5,7 @@ Release Notes
   :caption: Gluon 2023.2
   :maxdepth: 2
 
+  v2023.2.3
   v2023.2.2
   v2023.2.1
   v2023.2

docs/releases/v2023.2.3.rst

@@ -0,0 +1,59 @@
+Gluon 2023.2.3
+==============
+
+Added hardware support
+----------------------
+
+ath79-generic
+~~~~~~~~~~~~~
+
+- NETGEAR
+
+  - WNDRMAC v2
+
+
+mpc85xx-p1020
+~~~~~~~~~~~~~
+
+- Hewlett-Packard
+
+  - MSM460
+
+
+Bugfixes
+--------
+
+* Factory images for TP-Link Archer C7 v2 now contain the correct region code
+  (`#3260 <https://github.com/freifunk-gluon/gluon/issues/3260>`_)
+
+* Fixed an issue where some bootloader versions of the NETGEAR EX6150 v2 failed
+  to boot Gluon images in rare cases
+  (`Upstream <https://github.com/openwrt/openwrt/commit/de59fc45402ff03e320264c8204f6928090534ad>`_)  
+
+* Fixed boot procedure becoming stuck on Enterasys WS-AP3710i devices
+  (`#3248 <https://github.com/freifunk-gluon/gluon/issues/3248>`_)
+
+
+Known issues
+------------
+
+* Unstable wireless with certain MediaTek devices (`#3154 <https://github.com/freifunk-gluon/gluon/issues/3154>`_)
+
+* 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 without 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

@@ -1,4 +1,4 @@
--- This is an example site configuration for Gluon v2023.2.2
+-- This is an example site configuration for Gluon v2023.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. *v2023.2.2*. Always get Gluon using git and don't try to download it
+e.g. *v2023.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
@@ -53,7 +53,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2023.2.2*.
+version you'd like to checkout, e.g. *v2023.2.3*.
 
 ::
 

docs/user/supported_devices.rst

@@ -76,6 +76,7 @@ ath79-generic
   - WNDR3700 (v1, v2)
   - WNDR3800
   - WNR2200 (8M, 16M)
+  - WNDRMAC (v2)
 
 * OCEDO
 
@@ -369,6 +370,10 @@ mpc85xx-p1020
 
   - WS-AP3825i
 
+* Hewlett-Packard
+
+  - MSM460
+
 * Ocedo
 
   - Panda

modules

@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=1bbb94df9687e7376ca5f50c69f24aa15c704f85
+OPENWRT_COMMIT=3001d3c5d446bf53fc222640d49a4cc79e04a2f3
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=229175a0bb3043b5ecbafc62d875122cca273881
+PACKAGES_PACKAGES_COMMIT=6be3892dc1abb7b39c2af0123a52335ef0b8a679
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-23.05
-PACKAGES_ROUTING_COMMIT=648753932d5a7deff7f2bdb33c000018a709ad84
+PACKAGES_ROUTING_COMMIT=a82e34d5e402ec77fd5facc1349352cacda2d0f8