mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2026-08-27 20:35:40 +00:00
Pull request 2752: ADG-12585-upd-go
Squashed commit of the following:
commit 50fb4bc95e3ed51f3522f42ee874979719e64a73
Author: Maksim Kazantsev <m.kazantsev@adguard.com>
Date: Fri Aug 14 15:25:56 2026 +0300
all: imp chlog;
commit d8ce15472f62bd93b7f8a0774cf1dd2f7b0ad599
Author: Maksim Kazantsev <m.kazantsev@adguard.com>
Date: Fri Aug 14 15:22:13 2026 +0300
all: upd go;
This commit is contained in:
parent
78aae72e3a
commit
090f75d79f
7 changed files with 12 additions and 9 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
|
@ -8,7 +8,7 @@
|
|||
# See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#permissions.
|
||||
'permissions': {}
|
||||
'env':
|
||||
'GO_VERSION': '1.26.5'
|
||||
'GO_VERSION': '1.26.6'
|
||||
'NODE_VERSION': '20'
|
||||
'on':
|
||||
'push':
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
|||
|
||||
### Security
|
||||
|
||||
- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.26.6][go-1.26.6].
|
||||
|
||||
- AdGuard Home is now more resistant to resource exhaustion attacks when using DNS-over-QUIC.
|
||||
|
||||
This is GHSA-w6v6-f44j-3rj2. We thank @ATinyShoe for reporting this security issue.
|
||||
|
|
@ -46,6 +48,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
|||
|
||||
- Blocked requests without an EDNS(0) OPT record ([#8183]).
|
||||
|
||||
[go-1.26.6]: https://groups.google.com/g/golang-announce/c/94pEornpRlI
|
||||
[#7514]: https://github.com/AdguardTeam/AdGuardHome/issues/7514
|
||||
[#8183]: https://github.com/AdguardTeam/AdGuardHome/issues/8183
|
||||
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -25,7 +25,7 @@ DIST_DIR = dist
|
|||
GOAMD64 = v1
|
||||
GOPROXY = https://proxy.golang.org|direct
|
||||
GOTELEMETRY = off
|
||||
GOTOOLCHAIN = go1.26.5
|
||||
GOTOOLCHAIN = go1.26.6
|
||||
GPG_KEY = devteam@adguard.com
|
||||
GPG_KEY_PASSPHRASE = not-a-real-password
|
||||
NPM = npm
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
'channel': 'edge'
|
||||
'clientDir': 'client_v2'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.26.5--1'
|
||||
'dockerGo': 'adguard/go-builder:1.26.6--1'
|
||||
|
||||
'stages':
|
||||
- 'Build frontend':
|
||||
|
|
@ -297,7 +297,7 @@
|
|||
'channel': 'beta'
|
||||
'clientDir': 'client'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.26.5--1'
|
||||
'dockerGo': 'adguard/go-builder:1.26.6--1'
|
||||
# release-vX.Y.Z branches are the branches from which the actual final
|
||||
# release is built.
|
||||
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
|
||||
|
|
@ -314,4 +314,4 @@
|
|||
'channel': 'release'
|
||||
'clientDir': 'client'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.26.5--1'
|
||||
'dockerGo': 'adguard/go-builder:1.26.6--1'
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
'channel': 'development'
|
||||
'clientDir': 'client_v2'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.26.5--1'
|
||||
'dockerGo': 'adguard/go-builder:1.26.6--1'
|
||||
|
||||
'stages':
|
||||
- 'Tests':
|
||||
|
|
@ -272,4 +272,4 @@
|
|||
'channel': 'candidate'
|
||||
'clientDir': 'client'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.26.5--1'
|
||||
'dockerGo': 'adguard/go-builder:1.26.6--1'
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
# needed. Keep it in sync with bamboo-specs/bamboo.yaml.
|
||||
|
||||
# NOTE: Keep in sync with bamboo-specs/bamboo.yaml.
|
||||
ARG BASE_IMAGE=adguard/go-builder:1.26.5--1
|
||||
ARG BASE_IMAGE=adguard/go-builder:1.26.6--1
|
||||
|
||||
# The dependencies stage is needed to install packages and tool dependencies.
|
||||
# This is also where binaries like osslsigncode, which may be required for tests
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -1,6 +1,6 @@
|
|||
module github.com/AdguardTeam/AdGuardHome
|
||||
|
||||
go 1.26.5
|
||||
go 1.26.6
|
||||
|
||||
require (
|
||||
github.com/AdguardTeam/dnscrypt v0.0.2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue