Skip to content

Commit 8737877

Browse files
DL6ERDL6ER
committed
Merge branch 'alpine/3.32' into special/CI_development
Signed-off-by: Dominik <[email protected]>
2 parents 7652756 + 3706c4d commit 8737877

14 files changed

Lines changed: 53 additions & 32 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
-
3434
name: Checkout code
35-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
35+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
3636
-
3737
name: "Calculate required variables"
3838
id: variables
@@ -100,7 +100,7 @@ jobs:
100100
steps:
101101
-
102102
name: Checkout code
103-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
103+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
104104
# QEMU should come before Buildx
105105
-
106106
name: Set up QEMU
@@ -265,7 +265,7 @@ jobs:
265265
-
266266
name: Attach binaries to release
267267
if: github.event_name == 'release'
268-
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe #v2.4.2
268+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b #v2.5.0
269269
with:
270270
tag_name: ${{ github.event.release.tag_name }}
271271
files: |
@@ -279,7 +279,7 @@ jobs:
279279
-
280280
name: Create Pull Request to pi-hole/docs
281281
if: env.GIT_BRANCH == 'master' && env.DO_DEPLOY == 'true' && matrix.bin_name == 'pihole-FTL-amd64'
282-
uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 #v7.0.9
282+
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 #v7.0.11
283283
with:
284284
token: ${{ secrets.PRALOR_PULL_REQUESTS }}
285285
commit-message: "docs: update pihole.toml documentation"

‎.github/workflows/codeql.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
name: "CodeQL Advanced"
1313
env:
1414
nettleversion: 3.10.2
15-
mbedtlsversion: 3.6.4
15+
mbedtlsversion: 4.0.0
1616

1717
on:
1818
push:
@@ -58,7 +58,7 @@ jobs:
5858
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5959
steps:
6060
- name: Checkout repository
61-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
61+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
6262

6363
- name: Install dependencies
6464
run: |
@@ -67,10 +67,11 @@ jobs:
6767
6868
- name: Install nettle
6969
run: |
70-
curl -sSL https://ftl.pi-hole.net/libraries/nettle-${nettleversion}.tar.gz | tar -xz
70+
curl -sSL https://ftl.pi-hole.net/libraries/nettle-${nettleversion}.tar.bz2 | tar -xz
7171
cd nettle-${nettleversion}
72-
./configure --enable-static --disable-shared --disable-openssl --disable-mini-gmp -disable-gcov --disable-documentation
73-
sudo make -j $(nproc) install
72+
cmake -S . -B build -DCMAKE_C_FLAGS="-fomit-frame-pointer"
73+
cmake --build build -j $(nproc)
74+
cmake --install build
7475
7576
- name: Install mbedTLS
7677
# Build static mbedTLS with pthread support
@@ -85,7 +86,7 @@ jobs:
8586
8687
# Initializes the CodeQL tools for scanning.
8788
- name: Initialize CodeQL
88-
uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 #v4.31.5
89+
uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 #v4.31.7
8990
with:
9091
languages: ${{ matrix.language }}
9192
build-mode: ${{ matrix.build-mode }}
@@ -108,7 +109,7 @@ jobs:
108109
./build.sh
109110
110111
- name: Perform CodeQL Analysis
111-
uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 #v4.31.5
112+
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 #v4.31.7
112113
with:
113114
category: "/language:${{matrix.language}}"
114115
upload: failure-only # upload only in case of failure, otherwise upload later after filtering
@@ -134,7 +135,7 @@ jobs:
134135
output: codeql-results/cpp.sarif
135136

136137
- name: Upload SARIF
137-
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 #v4.31.5
138+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 #v4.31.7
138139
with:
139140
sarif_file: codeql-results/cpp.sarif
140141

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
-
1515
name: Checkout repository
16-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
16+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
1717
-
1818
name: Spell-Checking
1919
uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 #v2.2

‎.github/workflows/openapi-validator.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- name: Clone repository
15-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
15+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
1616

1717
- name: Set up Node.js
18-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 #v6.0.0
18+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f #v6.1.0
1919
with:
2020
node-version: "20"
2121
cache: npm

‎.github/workflows/stale.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
issues: write
1818

1919
steps:
20-
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
20+
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d #v10.1.1
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
days-before-stale: 30
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
43+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
4444
- name: Remove 'stale' label
4545
run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
4646
env:

‎.github/workflows/stale_pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818

1919
steps:
20-
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
20+
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d #v10.1.1
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
# Do not automatically mark PR/issue as stale

‎.github/workflows/sync-back-to-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Syncing branches
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
14+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
1515
- name: Opening pull request
1616
run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
1717
env:

‎src/api/docs/content/specs/config.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ components:
252252
type: integer
253253
upstreamBlockedTTL:
254254
type: integer
255+
rrtype:
256+
type: string
255257
revServers:
256258
type: array
257259
items:
@@ -706,6 +708,7 @@ components:
706708
size: 10000
707709
optimizer: 3600
708710
upstreamBlockedTTL: 86400
711+
rrtype: "ANY"
709712
revServers:
710713
- "true,192.168.0.0/24,192.168.0.1,lan"
711714
blocking:

‎src/config/config.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,14 @@ void initConfig(struct config *conf)
635635
conf->dns.cache.upstreamBlockedTTL.d.ui = 86400;
636636
conf->dns.cache.upstreamBlockedTTL.c = validate_stub; // Only type-based checking
637637

638+
conf->dns.cache.rrtype.k = "dns.cache.rrtype";
639+
conf->dns.cache.rrtype.h = "This is dnsmasq's --cache-rr option, which allows you to define which DNS record types should be cached by PiHole. This option can take a comma-separated list of RR-types as input. The default value ANY caches all record types.";
640+
conf->dns.cache.rrtype.a = cJSON_CreateStringReference("Valid DNS record types in the following form: <rrtype>[,<rrtype>...]");
641+
conf->dns.cache.rrtype.t = CONF_STRING;
642+
conf->dns.cache.rrtype.f = FLAG_RESTART_FTL;
643+
conf->dns.cache.rrtype.d.s = (char*)"ANY";
644+
conf->dns.cache.rrtype.c = validate_stub; // Only type-based checking
645+
638646
// sub-struct dns.blocking
639647
conf->dns.blocking.active.k = "dns.blocking.active";
640648
conf->dns.blocking.active.h = "Should FTL block queries?";

‎src/config/config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ struct config {
160160
struct conf_item size;
161161
struct conf_item optimizer;
162162
struct conf_item upstreamBlockedTTL;
163+
struct conf_item rrtype;
163164
} cache;
164165
struct {
165166
struct conf_item active;

0 commit comments

Comments
 (0)