Skip to content

Commit 16fda88

Browse files
EugeneOne1EugeneOne1
committed
Pull request 2425: Update all
Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit 7e0b443 Author: Eugene Burkov <[email protected]> Date: Tue Jun 10 15:52:49 2025 +0300 client: upd i18n commit 5c17d66 Author: Eugene Burkov <[email protected]> Date: Tue Jun 10 15:45:09 2025 +0300 filtering: upd blocked services commit 6a1d473 Author: Eugene Burkov <[email protected]> Date: Tue Jun 10 15:38:03 2025 +0300 all: upd go & tools
1 parent 490144a commit 16fda88

File tree

11 files changed

+46
-26
lines changed

11 files changed

+46
-26
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'name': 'build'
22

33
'env':
4-
'GO_VERSION': '1.24.3'
4+
'GO_VERSION': '1.24.4'
55
'NODE_VERSION': '20'
66

77
'on':

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'name': 'lint'
22

33
'env':
4-
'GO_VERSION': '1.24.3'
4+
'GO_VERSION': '1.24.4'
55

66
'on':
77
'push':

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,18 @@ See also the [v0.107.63 GitHub milestone][ms-v0.107.63].
1818
NOTE: Add new changes BELOW THIS COMMENT.
1919
-->
2020

21+
### Security
22+
23+
- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.24.4][go-1.24.4].
24+
2125
### Fixed
2226

2327
- The hostnames of DHCP clients with multiple labels not being recognized.
2428

2529
- Status reported by the systemd service implementation in cases of auto-restart after a failed start.
2630

31+
[go-1.24.4]: https://groups.google.com/g/golang-announce/c/ufZ8WpEsA3A
32+
2733
<!--
2834
NOTE: Add new changes ABOVE THIS COMMENT.
2935
-->

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DIST_DIR = dist
2727
GOAMD64 = v1
2828
GOPROXY = https://proxy.golang.org|direct
2929
GOTELEMETRY = off
30-
GOTOOLCHAIN = go1.24.3
30+
GOTOOLCHAIN = go1.24.4
3131
GPG_KEY = [email protected]
3232
GPG_KEY_PASSPHRASE = not-a-real-password
3333
NPM = npm

‎bamboo-specs/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'variables':
99
'channel': 'edge'
1010
'dockerFrontend': 'adguard/home-js-builder:3.1'
11-
'dockerGo': 'adguard/go-builder:1.24.3--1'
11+
'dockerGo': 'adguard/go-builder:1.24.4--1'
1212

1313
'stages':
1414
- 'Build frontend':
@@ -279,7 +279,7 @@
279279
'variables':
280280
'channel': 'beta'
281281
'dockerFrontend': 'adguard/home-js-builder:3.1'
282-
'dockerGo': 'adguard/go-builder:1.24.3--1'
282+
'dockerGo': 'adguard/go-builder:1.24.4--1'
283283
# release-vX.Y.Z branches are the branches from which the actual final
284284
# release is built.
285285
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -295,4 +295,4 @@
295295
'variables':
296296
'channel': 'release'
297297
'dockerFrontend': 'adguard/home-js-builder:3.1'
298-
'dockerGo': 'adguard/go-builder:1.24.3--1'
298+
'dockerGo': 'adguard/go-builder:1.24.4--1'

‎bamboo-specs/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'name': 'AdGuard Home - Build and run tests'
77
'variables':
88
'dockerFrontend': 'adguard/home-js-builder:3.1'
9-
'dockerGo': 'adguard/go-builder:1.24.3--1'
9+
'dockerGo': 'adguard/go-builder:1.24.4--1'
1010
'channel': 'development'
1111

1212
'stages':
@@ -234,5 +234,5 @@
234234
# may need to build a few of these.
235235
'variables':
236236
'dockerFrontend': 'adguard/home-js-builder:3.1'
237-
'dockerGo': 'adguard/go-builder:1.24.3--1'
237+
'dockerGo': 'adguard/go-builder:1.24.4--1'
238238
'channel': 'candidate'

‎client/src/__locales/tr.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"upstream_parallel": "Tüm üst sunucuları eş zamanlı sorgulayarak çözümlemeyi hızlandırmak için paralel sorgular kullanın.",
77
"parallel_requests": "Paralel istekler",
88
"load_balancing": "Yük dengeleme",
9-
"load_balancing_desc": "Aynı anda bir üst kaynak sunucusunu sorgulayın. AdGuard Home, en düşük başarısız arama sayısına ve en düşük ortalama arama süresine sahip sunucuları seçmek için ağırlıklı rastgele bir algoritma kullanır.",
9+
"load_balancing_desc": "Üst kaynak sunucuları aynı anda sorgulanır.<br/>AdGuard Home, en düşük başarısız sorgu sayısına ve en düşük ortalama sorgu süresine sahip sunucuları seçmek için ağırlıklı rastgele algoritma kullanır.",
1010
"bootstrap_dns": "DNS Önyükleme sunucuları",
1111
"bootstrap_dns_desc": "Üst kaynak olarak belirttiğiniz DoH/DoT çözümleyicilerin IP adreslerini çözümlemek için kullanılan DNS sunucularının IP adresleri. Yorumlara izin verilmez.",
1212
"fallback_dns_title": "Yedek DNS sunucuları",

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/AdguardTeam/AdGuardHome
22

3-
go 1.24.3
3+
go 1.24.4
44

55
require (
66
github.com/AdguardTeam/dnsproxy v0.75.6
@@ -32,9 +32,9 @@ require (
3232
github.com/stretchr/testify v1.10.0
3333
github.com/ti-mo/netfilter v0.5.3
3434
go.etcd.io/bbolt v1.4.0
35-
golang.org/x/crypto v0.38.0
35+
golang.org/x/crypto v0.39.0
3636
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b
37-
golang.org/x/net v0.40.0
37+
golang.org/x/net v0.41.0
3838
golang.org/x/sys v0.33.0
3939
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4040
gopkg.in/yaml.v3 v3.0.1
@@ -90,15 +90,15 @@ require (
9090
go.opentelemetry.io/otel/trace v1.36.0 // indirect
9191
go.uber.org/automaxprocs v1.6.0 // indirect
9292
go.uber.org/mock v0.5.2 // indirect
93-
golang.org/x/exp/typeparams v0.0.0-20250531010427-b6e5de432a8b // indirect
93+
golang.org/x/exp/typeparams v0.0.0-20250606033433-dcc06ee1d476 // indirect
9494
golang.org/x/mod v0.25.0 // indirect
9595
golang.org/x/oauth2 v0.30.0 // indirect
9696
golang.org/x/sync v0.15.0 // indirect
97-
golang.org/x/telemetry v0.0.0-20250605140807-cd7dbf5ade20 // indirect
97+
golang.org/x/telemetry v0.0.0-20250609191608-4884ade64e8b // indirect
9898
golang.org/x/term v0.32.0 // indirect
9999
golang.org/x/text v0.26.0 // indirect
100100
golang.org/x/time v0.12.0 // indirect
101-
golang.org/x/tools v0.33.0 // indirect
101+
golang.org/x/tools v0.34.0 // indirect
102102
golang.org/x/vuln v1.1.4 // indirect
103103
gonum.org/v1/gonum v0.16.0 // indirect
104104
google.golang.org/api v0.236.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
203203
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
204204
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
205205
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
206-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
207-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
206+
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
207+
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
208208
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA=
209209
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
210-
golang.org/x/exp/typeparams v0.0.0-20250531010427-b6e5de432a8b h1:BYXmVbbiQZNvDQnJIC37pAGLxabO8CGWgWEZrCtjXbk=
211-
golang.org/x/exp/typeparams v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:LKZHyeOpPuZcMgxeHjJp4p5yvxrCX1xDvH10zYHhjjQ=
210+
golang.org/x/exp/typeparams v0.0.0-20250606033433-dcc06ee1d476 h1:tceuojoK22x7b3gj32PCOPkkFeVtewHm1imqrGyFp1I=
211+
golang.org/x/exp/typeparams v0.0.0-20250606033433-dcc06ee1d476/go.mod h1:LKZHyeOpPuZcMgxeHjJp4p5yvxrCX1xDvH10zYHhjjQ=
212212
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
213213
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
214214
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -221,8 +221,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
221221
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
222222
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
223223
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
224-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
225-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
224+
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
225+
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
226226
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
227227
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
228228
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -242,8 +242,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
242242
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
243243
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
244244
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
245-
golang.org/x/telemetry v0.0.0-20250605140807-cd7dbf5ade20 h1:76h5FVhq9x1b/mxY9tfFIY66XtbIeUx1af9FJOQ/R10=
246-
golang.org/x/telemetry v0.0.0-20250605140807-cd7dbf5ade20/go.mod h1:mUcjA5g0luJpMYCLjhH91f4t4RAUNp+zq9ZmUoqPD7M=
245+
golang.org/x/telemetry v0.0.0-20250609191608-4884ade64e8b h1:Y/IUTO67KgVkBoAByyCNRMMLAXUzEiblXXJqxR3OF8Q=
246+
golang.org/x/telemetry v0.0.0-20250609191608-4884ade64e8b/go.mod h1:mUcjA5g0luJpMYCLjhH91f4t4RAUNp+zq9ZmUoqPD7M=
247247
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
248248
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
249249
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
@@ -257,8 +257,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
257257
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
258258
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
259259
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
260-
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
261-
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
260+
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
261+
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
262262
golang.org/x/vuln v1.1.4 h1:Ju8QsuyhX3Hk8ma3CesTbO8vfJD9EvUBgHvkxHBzj0I=
263263
golang.org/x/vuln v1.1.4/go.mod h1:F+45wmU18ym/ca5PLTPLsSzr2KppzswxPP603ldA67s=
264264
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/filtering/servicelist.go‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)