From 2a56c78f26e8adabbcfcc39e3a48b93b4b992e54 Mon Sep 17 00:00:00 2001 From: Dimitry Kolyshev Date: Wed, 25 Oct 2023 14:36:54 +0300 Subject: [PATCH] Pull request: all: upd dep Merge in DNS/adguard-home from 6204-dnsrewrite-important to master Squashed commit of the following: commit 379a1c4f3ec3784bc88a3250623e9f4852ef4cb2 Author: Dimitry Kolyshev Date: Wed Oct 25 14:09:00 2023 +0300 all: upd dep commit 40485f9b791a22218bae76b0aa6cb8d87173ccb2 Author: Dimitry Kolyshev Date: Wed Oct 25 14:07:58 2023 +0300 all: upd dep commit 8c09fe9d937be2c603c9632907edbcde60dd6680 Author: Dimitry Kolyshev Date: Wed Oct 25 14:04:25 2023 +0300 docs: changelog commit 33451738f5dd4b16bbba73bfe1cb495cb976abf9 Author: Dimitry Kolyshev Date: Wed Oct 25 14:01:27 2023 +0300 docs: changelog commit cc94b4232c2990234d0bdfc510af58aef10d61a5 Author: Dimitry Kolyshev Date: Wed Oct 25 14:00:58 2023 +0300 docs: changelog commit adea5117cb0ca820556a8f00aafb8fd56f471e24 Merge: b90197e87 c0588146e Author: Dimitry Kolyshev Date: Wed Oct 25 13:58:13 2023 +0300 Merge remote-tracking branch 'origin/master' into 6204-dnsrewrite-important commit b90197e871e238404a27f43f51b12248a8cff79e Author: Dimitry Kolyshev Date: Wed Oct 25 11:21:05 2023 +0300 all: upd dep --- CHANGELOG.md | 3 +++ go.mod | 7 ++----- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed00929f..39124a66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,9 +25,12 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed +- `$important,dnsrewrite` rules do not take precedence over allowlist rules + ([#6204]). - Dark mode DNS rewrite background ([#6329]). - Issues with QUIC and HTTP/3 upstreams on Linux ([#6335]). +[#6204]: https://github.com/AdguardTeam/AdGuardHome/issues/6204 [#6329]: https://github.com/AdguardTeam/AdGuardHome/issues/6329 [#6335]: https://github.com/AdguardTeam/AdGuardHome/issues/6335 diff --git a/go.mod b/go.mod index 16e8f935..19be8199 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/AdguardTeam/dnsproxy v0.56.2 github.com/AdguardTeam/golibs v0.17.2 - github.com/AdguardTeam/urlfilter v0.17.0 + github.com/AdguardTeam/urlfilter v0.17.3 github.com/NYTimes/gziphandler v1.1.1 github.com/ameshkov/dnscrypt/v2 v2.2.7 github.com/bluele/gcache v0.0.2 @@ -27,7 +27,7 @@ require ( // own code for that. Perhaps, use gopacket. github.com/mdlayher/raw v0.1.0 github.com/miekg/dns v1.1.56 - github.com/quic-go/quic-go v0.39.1 + github.com/quic-go/quic-go v0.39.2 github.com/stretchr/testify v1.8.4 github.com/ti-mo/netfilter v0.5.1 go.etcd.io/bbolt v1.3.7 @@ -63,6 +63,3 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.14.0 // indirect ) - -// TODO(a.garipov): Remove once a patched version is released. -replace github.com/quic-go/quic-go => github.com/quic-go/quic-go v0.39.1-0.20231024111439-6dbe30ababfe diff --git a/go.sum b/go.sum index b6881482..9fda18ac 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/AdguardTeam/dnsproxy v0.56.2 h1:+k1iUmp05QIqkgXWyPn70fki4FouHe6vHIyHg github.com/AdguardTeam/dnsproxy v0.56.2/go.mod h1:ZvkbM71HwpilgkCnTubDiR4Ba6x5Qvnhy2iasMWaTDM= github.com/AdguardTeam/golibs v0.17.2 h1:vg6wHMjUKscnyPGRvxS5kAt7Uw4YxcJiITZliZ476W8= github.com/AdguardTeam/golibs v0.17.2/go.mod h1:DKhCIXHcUYtBhU8ibTLKh1paUL96n5zhQBlx763sj+U= -github.com/AdguardTeam/urlfilter v0.17.0 h1:tUzhtR9wMx704GIP3cibsDQJrixlMHfwoQbYJfPdFow= -github.com/AdguardTeam/urlfilter v0.17.0/go.mod h1:bbuZjPUzm/Ip+nz5qPPbwIP+9rZyQbQad8Lt/0fCulU= +github.com/AdguardTeam/urlfilter v0.17.3 h1:fg/ObbnO0Cv6aw0tW6N/ETDMhhNvmcUUOZ7HlmKC3rw= +github.com/AdguardTeam/urlfilter v0.17.3/go.mod h1:Jru7jFfeH2CoDf150uDs+rRYcZBzHHBz05r9REyDKyE= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= @@ -94,8 +94,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.39.1-0.20231024111439-6dbe30ababfe h1:FHRxRa93mIeHFDAPRN7i74lQhhPBspOAjVhODfr78Qk= -github.com/quic-go/quic-go v0.39.1-0.20231024111439-6dbe30ababfe/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= +github.com/quic-go/quic-go v0.39.2 h1:hmwAf8zAHlvan0Y5PXxeeBFZEW17IW99sXLry8I2kjk= +github.com/quic-go/quic-go v0.39.2/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=