Merge branch 'master' into smb_selective_enable

mariadb/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.7.2
+
+- Add option to configure MariaDB server parameters (see also [home-assistant/addons#3754](https://github.com/home-assistant/addons/issues/3754))
+
 ## 2.7.1
 
 **Note:** Restart the add-on before upgrade if the current version is lower

mariadb/DOCS.md

@@ -74,6 +74,13 @@ If omitted, grants `ALL PRIVILEGES` to the user. Restricting privileges of the u
 that Home Assistant uses is not recommended but if you want to allow other applications
 to view recorder data should create a user limited to read-only access on the database.
 
+### Option: `mariadb_server_args` (optional)
+
+Some users have experienced [errors][migration-issues] during Home Assistant schema updates on large databases.
+Defining the recommended parameters can help if there is RAM available.
+
+Example: `--innodb_buffer_pool_size=512M`
+
 ## Home Assistant Configuration
 
 MariaDB will be used by the `recorder` and `history` components within Home Assistant. For more information about setting this up, see the [recorder integration][mariadb-ha-recorder] documentation for Home Assistant.
@@ -101,6 +108,7 @@ In case you've found a bug, please [open an issue on our GitHub][issue].
 [username]: https://mariadb.com/kb/en/create-user/#user-name-component
 [hostname]: https://mariadb.com/kb/en/create-user/#host-name-component
 [grant]: https://mariadb.com/kb/en/grant/
+[migration-issues]: https://github.com/home-assistant/core/issues/125339
 [mariadb-ha-recorder]: https://www.home-assistant.io/integrations/recorder/
 [discord]: https://discord.gg/c5DvZ4e
 [forum]: https://community.home-assistant.io

mariadb/config.yaml

@@ -1,5 +1,5 @@
 ---
-version: 2.7.1
+version: 2.7.2
 slug: mariadb
 name: MariaDB
 description: A SQL database server
@@ -38,6 +38,8 @@ schema:
           CREATE VIEW|DELETE|DELETE HISTORY|DROP|EVENT|GRANT OPTION|INDEX|\
           INSERT|LOCK TABLES|SELECT|SHOW VIEW|TRIGGER|UPDATE)?"
       username: str
+  mariadb_server_args:
+    - str?
 services:
   - mysql:provide
 startup: system

mariadb/rootfs/etc/s6-overlay/s6-rc.d/mariadb-core/run

@@ -5,7 +5,18 @@
 # Start MariaDB service
 # ==============================================================================
 
+if bashio::config.has_value "mariadb_server_args"; then
+  readarray -t extra_args <<< "$(bashio::config 'mariadb_server_args')"
+  bashio::log.info "Starting MariaDB with command line parameters: ${extra_args[*]}"
+else
+  bashio::log.info "Starting MariaDB"
+fi
+
 # Start mariadb
-bashio::log.info "Starting MariaDB"
 mkdir -p /run/mysqld
-exec mysqld --datadir="${MARIADB_DATA}" --user=root < /dev/null
+
+if [ -z "${extra_args+x}" ] || [ ${#extra_args[@]} -eq 0 ]; then
+  exec mysqld --datadir="${MARIADB_DATA}" --user=root < /dev/null
+else
+  exec mysqld --datadir="${MARIADB_DATA}" --user=root "${extra_args[@]}" < /dev/null
+fi

mosquitto/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.5.0
+
+- Update base image to Debian 12 (bookworm)
+- Update mosquitto to version 2.0.20
+- Update mosquitto-go-auth to version 2.1.0
+- Update libwebsockets to version 4.3.3
+
 ## 6.4.1
 
 - Increase default max_queued_messages to 8192 to fix dropped messages during Home Assistant startup

mosquitto/Dockerfile

@@ -24,18 +24,21 @@ RUN apt-get update \
         golang-go \
     \
     # Compile and install libwebsocket
-    && git clone --depth 1 -b "${LIBWEBSOCKET_VERSION}" \
+    #
+    # DLWS_WITHOUT_TESTAPPS is just a workaround, see
+    # https://github.com/warmcat/libwebsockets/issues/2790 for more
+    && git clone --depth 1 -b "v${LIBWEBSOCKET_VERSION}" \
        https://libwebsockets.org/repo/libwebsockets \
     \
     && cd libwebsockets \
     && mkdir build \
     && cd build \
-    && cmake -DLWS_WITH_EXTERNAL_POLL=ON .. \
+    && cmake -DLWS_WITH_EXTERNAL_POLL=ON -DLWS_WITHOUT_TESTAPPS=ON .. \
     && make install \
     && ldconfig \
     && cd ../.. \
     # Compile and install mosquitto
-    && git clone --depth 1 -b "${MOSQUITTO_VERSION}" \
+    && git clone --depth 1 -b "v${MOSQUITTO_VERSION}" \
        https://github.com/eclipse/mosquitto \
     \
     && cd mosquitto \

mosquitto/build.yaml

@@ -1,14 +1,14 @@
 ---
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye
-  amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye
-  armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye
-  armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye
-  i386: ghcr.io/home-assistant/i386-base-debian:bullseye
+  aarch64: ghcr.io/home-assistant/aarch64-base-debian:bookworm
+  amd64: ghcr.io/home-assistant/amd64-base-debian:bookworm
+  armhf: ghcr.io/home-assistant/armhf-base-debian:bookworm
+  armv7: ghcr.io/home-assistant/armv7-base-debian:bookworm
+  i386: ghcr.io/home-assistant/i386-base-debian:bookworm
 codenotary:
   signer: [email protected]
   base_image: [email protected]
 args:
-  LIBWEBSOCKET_VERSION: v4.3.2
-  MOSQUITTO_VERSION: v2.0.18
-  MOSQUITTO_AUTH_VERSION: 1.8.2
+  LIBWEBSOCKET_VERSION: 4.3.3
+  MOSQUITTO_VERSION: 2.0.20
+  MOSQUITTO_AUTH_VERSION: 2.1.0

mosquitto/config.yaml

@@ -1,5 +1,5 @@
 ---
-version: 6.4.1
+version: 6.5.0
 slug: mosquitto
 name: Mosquitto broker
 description: An Open Source MQTT broker

openthread_border_router/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 2.13.0
+- Bump to OTBR POSIX version b067e5ac (2025-01-13 22:32:22 -0500)
+- Bump universal-silabs-flasher to 0.0.28
+- Remove dataset deletion REST API backwards compatibility patch. The minimum Core version for this add-on is now 2023.9.0
+
+## 2.12.4
+
+- Fix OTBR addon does not start after updating containerd.io to 1.7.24-1
+
+## 2.12.3
+
+- Enable recovery mechanism from "radio tx timeout" errors
+- Increase the number of mesh header fragmentation tag entries to address
+  "Failed to get forwarded frame priority" notice messages in logs. Note that
+  these types of messages are non-critical (default priority will be applied in
+  that case).
+- Make some compile time configurations via project header file
+
 ## 2.12.2
 
 - Update flasher script to work with Home Assistant Yellow with CM5

openthread_border_router/Dockerfile

@@ -17,9 +17,8 @@ ENV REST_API 1
 ENV DHCPV6_PD_REF 0
 ENV DOCKER 1
 
-COPY 0001-support-deleting-the-dataset.patch /usr/src
-COPY 0002-set-netif-route-metric-lower.patch /usr/src
 COPY 0001-channel-monitor-disable-by-default.patch /usr/src
+COPY openthread-core-ha-config-posix.h /usr/src
 # Required and installed (script/bootstrap) can be removed after build
 ENV OTBR_BUILD_DEPS build-essential ninja-build cmake wget ca-certificates \
   libreadline-dev libncurses-dev libcpputest-dev libdbus-1-dev libavahi-common-dev \
@@ -54,11 +53,10 @@ RUN \
     && git checkout ${OTBR_VERSION} \
     && git submodule update --init \
     && ./script/bootstrap \
-    && patch -p1 < /usr/src/0001-support-deleting-the-dataset.patch \
-    && patch -p1 < /usr/src/0002-set-netif-route-metric-lower.patch \
     && ( \
         cd third_party/openthread/repo \
         && patch -p1 < /usr/src/0001-channel-monitor-disable-by-default.patch \
+        && cp /usr/src/openthread-core-ha-config-posix.h . \
        ) \
     # Mimic rt_tables_install \
     && echo "88 openthread" >> /etc/iproute2/rt_tables \
@@ -90,6 +88,8 @@ RUN \
         -DOT_COAPS=OFF \
         -DOT_DNS_CLIENT_OVER_TCP=OFF \
         -DOT_THREAD_VERSION=1.3 \
+        -DOT_PROJECT_CONFIG="../openthread-core-ha-config-posix.h" \
+        -DOT_RCP_RESTORATION_MAX_COUNT=2 \
         && cd build/otbr/ \
         && ninja \
         && ninja install) \

openthread_border_router/build.yaml

@@ -3,5 +3,5 @@ build_from:
   aarch64: ghcr.io/home-assistant/aarch64-base-debian:bookworm
   amd64: ghcr.io/home-assistant/amd64-base-debian:bookworm
 args:
-  OTBR_VERSION: b041fa52daaa4dfbf6aa4665d8925c1be0350ca5
-  UNIVERSAL_SILABS_FLASHER: 0.0.25
+  OTBR_VERSION: b067e5ac5f8b3e92750df24922017eee2bc0fa04
+  UNIVERSAL_SILABS_FLASHER: 0.0.28

openthread_border_router/config.yaml

@@ -1,5 +1,5 @@
 ---
-version: 2.12.2
+version: 2.13.0
 slug: openthread_border_router
 name: OpenThread Border Router
 description: OpenThread Border Router add-on
@@ -8,7 +8,7 @@ url: >-
 arch:
   - aarch64
   - amd64
-homeassistant: 2023.6.0.dev20230531
+homeassistant: 2023.9.0
 gpio: true
 hassio_api: true
 discovery:
@@ -20,6 +20,8 @@ host_uts: true
 privileged:
   - IPC_LOCK
   - NET_ADMIN
+devices:
+  - /dev/net/tun
 image: homeassistant/{arch}-addon-otbr
 init: false
 options: