Merge pull request #2394 from pi-hole/development

Pi-hole FTL v6.1

Author: PromoFaux

.github/workflows/codespell.yml

@@ -19,5 +19,5 @@ jobs:
       uses: codespell-project/actions-codespell@master
       with:
         ignore_words_file: .github/.codespellignore
-        skip: ./src/database/sqlite3.c,./src/database/sqlite3.h,./src/database/shell.c,./src/lua,./src/dnsmasq,./src/tre-regex,./.git,./test/libs,./src/webserver/civetweb,./src/zip/miniz,./src/api/docs/content/external,./src/database/sqlite3_rsync.c
+        skip: ./src/database/sqlite3.c,./src/database/sqlite3.h,./src/database/shell.c,./src/lua,./src/dnsmasq,./src/tre-regex,./.git,./test/libs,./src/webserver/civetweb,./src/zip/miniz,./src/api/docs/content/external,./src/database/sqlite3_rsync.c,./package-lock.json
         exclude_file: .github/.codespellignore_lines

.github/workflows/openapi-validator.yml

@@ -3,7 +3,7 @@ name: API validation
 on: [push]
 
 env:
-  CI: true
+  FORCE_COLOR: 2
 
 jobs:
   openapi-validator:
@@ -12,12 +12,13 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
-      - name: Set Node.js version
-        uses: actions/setup-node@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4.3.0
         with:
           node-version: "20"
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci

.gitignore

@@ -17,6 +17,7 @@ version~
 .vscode/*
 !.vscode/c_cpp_properties.json
 /build/
+.codechecker/
 
 # __pycache__ files (API tests)
 __pycache__/

CMakeLists.txt

@@ -16,6 +16,6 @@ set(CMAKE_C_STANDARD 17)
 
 project(PIHOLE_FTL C)
 
-set(DNSMASQ_VERSION pi-hole-v2.91rc5+1)
+set(DNSMASQ_VERSION pi-hole-v2.91)
 
 add_subdirectory(src)

README.md

@@ -1,21 +1,14 @@
 <p align="center">
-  <a href="https://pi-hole.net">
-    <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://pi-hole.github.io/graphics/Vortex/Vortex_Vertical_wordmark_darkmode.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://pi-hole.github.io/graphics/Vortex/Vortex_Vertical_wordmark_lightmode.png">
-      <img src="https://pi-hole.github.io/graphics/Vortex/Vortex_Vertical_wordmark_lightmode.png" width="80" alt="Pi-hole website">
-    </picture>
+  <a href="https://pi-hole.net/">
+    <img src="https://raw.githubusercontent.com/pi-hole/graphics/refs/heads/master/Vortex/vortex_with_text.svg" alt="Pi-hole logo" width="80" height="128">
   </a>
-  <br/>
-  <b>Network-wide ad blocking via your own Linux hardware</b><br/><br/>
-  <a href="https://pi-hole.net">
-    <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://pi-hole.github.io/graphics/FTLDNS/FTLDNS_darkmode.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://pi-hole.github.io/graphics/FTLDNS/FTLDNS.png">
-      <img src="https://pi-hole.github.io/graphics/FTLDNS/FTLDNS.png" alt="FTLDNS">
-    </picture>
+  <br>
+  <strong>Network-wide ad blocking via your own Linux hardware</strong>
+  <br>
+  <br>
+  <a href="https://pi-hole.net/">
+    <img src="https://raw.githubusercontent.com/pi-hole/graphics/refs/heads/master/FTLDNS/FTLDNS.svg" alt="FTLDNS logo" width="500" height="128">
   </a>
-  <br/>
 </p>
 
 FTLDNS (`pihole-FTL`) provides an interactive API and also generates statistics for Pi-hole[®](https://pi-hole.net/trademark-rules-and-brand-guidelines/)'s Web interface.
@@ -36,4 +29,4 @@ FTLDNS (`pihole-FTL`) is automatically installed when installing Pi-hole.
 
 ### IMPORTANT
 
->FTLDNS will *disable* any existing installations of `dnsmasq`.  This is because FTLDNS *is* `dnsmasq` + Pi-hole's code, so both cannot run simultaneously.
+>FTLDNS will *disable* any existing installations of `dnsmasq`. This is because FTLDNS *is* `dnsmasq` + Pi-hole's code, so both cannot run simultaneously.

build.sh

@@ -157,8 +157,13 @@ else
     cmake ..
 fi
 
-# Build the sources with the number of available cores
-cmake --build . -- -j "$(nproc)"
+# If MAKEFLAGS is unset, we set it to "-j$(nproc)"
+if [[ -z "${MAKEFLAGS}" ]]; then
+    MAKEFLAGS="-j$(nproc)"
+fi
+
+# Build the sources
+cmake --build . -- ${MAKEFLAGS}
 
 # Checksum verification
 ./pihole-FTL verify