Merge branch 'master' into dependabot/docker/ftl-build/master/alpine-3.23

Author: DL6ER

.github/workflows/editorconfig.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
 
     - name: Get editorconfig-checker
       uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 #v2.1.0

.github/workflows/ftl-build.yml

@@ -63,7 +63,7 @@ jobs:
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       -
         name: Checkout Repo
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
       -
         name: Docker meta (Docker Hub and GitHub Container Registry)
         id: meta
@@ -156,7 +156,7 @@ jobs:
     steps:
       -
         name: Checkout Repo
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
       -
         name: Download digests
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 #v6.0.0

ftl-build/Dockerfile

@@ -4,7 +4,7 @@ ARG TARGETPLATFORM
 ARG readlineversion=8.3
 ARG termcapversion=1.3.1-patched
 ARG nettleversion=3.10.2
-ARG mbedtlsversion=3.6.4
+ARG mbedtlsversion=4.0.0
 
 RUN apk add --no-cache \
         alpine-sdk \
@@ -85,7 +85,9 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/mbedtls-${mbedtlsversion}.tar.bz
          && echo "BUILDING WITHOUT AESNI SUPPORT" \
          && sed -i '/#define MBEDTLS_AESNI_C/s*^*//*g' include/mbedtls/mbedtls_config.h \
          || echo "BUILDING WITH AESNI SUPPORT" ) \
-    && make -j $(nproc) install \
+    && cmake -S . -B build -DCMAKE_C_FLAGS="-fomit-frame-pointer" \
+    && cmake --build build -j $(nproc) \
+    && cmake --install build \
     && cd .. \
     && rm -r mbedtls-${mbedtlsversion}