From cf33901064c4cee87dbeee8c616b335e4015d576 Mon Sep 17 00:00:00 2001 From: Dobroslaw Kijowski Date: Mon, 21 Aug 2023 10:38:47 +0200 Subject: [PATCH] adguardhome: update quic-go to v0.37.6 * quic-go v0.36.x cannot be compiled with Go 1.21. Update that AdGuardHome dependency to latest one from v0.37 series. * It fixes following compilation error: go-mod-cache/github.com/quic-go/quic-go@v0.36.2/internal/qtls/go121.go:5:13: cannot use "The version of quic-go you're using can't be built on Go 1.21 yet. For more details, please see https://github. com/quic-go/quic-go/wiki/quic-go-and-Go-versions." (untyped string constant "The version of quic-go you're using can't be built on Go 1.21 yet. Signed-off-by: Dobroslaw Kijowski (cherry picked from commit 11230bb580443efd14a3c3bb4aa193c0476e4a7d) --- ...t-github.com-quic-go-quic-go-v0.37.6.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch diff --git a/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch b/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch new file mode 100644 index 0000000000..c158b2368c --- /dev/null +++ b/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch @@ -0,0 +1,45 @@ +From 61c2e12116147fab716221009b3a14fa5792a72d Mon Sep 17 00:00:00 2001 +From: Dobroslaw Kijowski +Date: Mon, 21 Aug 2023 10:22:27 +0200 +Subject: [PATCH] go get github.com/quic-go/quic-go@v0.37.6 + +--- + go.mod | 4 ++-- + go.sum | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +--- a/go.mod ++++ b/go.mod +@@ -28,7 +28,7 @@ require ( + github.com/mdlayher/raw v0.1.0 + github.com/miekg/dns v1.1.55 + // TODO(a.garipov): Update to ≥ v0.37.0 once we update to Go 1.20. +- github.com/quic-go/quic-go v0.36.2 ++ github.com/quic-go/quic-go v0.37.6 + github.com/stretchr/testify v1.8.4 + github.com/ti-mo/netfilter v0.5.0 + go.etcd.io/bbolt v1.3.7 +@@ -60,7 +60,7 @@ require ( + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/quic-go/qpack v0.4.0 // indirect + github.com/quic-go/qtls-go1-19 v0.3.2 // indirect +- github.com/quic-go/qtls-go1-20 v0.2.2 // indirect ++ github.com/quic-go/qtls-go1-20 v0.3.1 // indirect + github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sync v0.3.0 // indirect +--- a/go.sum ++++ b/go.sum +@@ -108,8 +108,12 @@ github.com/quic-go/qtls-go1-19 v0.3.2 h1 + github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= + github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= + github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= ++github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg= ++github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= + github.com/quic-go/quic-go v0.36.2 h1:ZX/UNQ4gvpCv2RmwdbA6lrRjF6EBm5yZ7TMoT4NQVrA= + github.com/quic-go/quic-go v0.36.2/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ= ++github.com/quic-go/quic-go v0.37.6 h1:2IIUmQzT5YNxAiaPGjs++Z4hGOtIR0q79uS5qE9ccfY= ++github.com/quic-go/quic-go v0.37.6/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU= + github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA= + github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=