From d09fc22cd1815552983034099e52b0c02356fa74 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 16:10:03 +0000 Subject: [PATCH] [8.17](backport #42152) security: bump golang.org/x/net to v0.33.0 (#42166) * security: bump golang.org/x/net to v0.33.0 (#42152) * security: bump golang.org/x/net to v0.33.0 Fixes https://github.com/advisories/GHSA-w32m-9786-jp63 * make notice (cherry picked from commit 83f5f4e8d6770dc4f87ea02e2e24721851333ad6) # Conflicts: # NOTICE.txt # go.mod # go.sum * resolve conflict --------- Co-authored-by: Andrzej Stencel Co-authored-by: Julien Lind --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index be550802da8..fb2847dbd7d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -26396,11 +26396,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.29.0 +Version: v0.33.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.29.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.33.0/LICENSE: Copyright 2009 The Go Authors. diff --git a/go.mod b/go.mod index 27606d5a5c7..15d4cf2a9db 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/crypto v0.31.0 golang.org/x/mod v0.21.0 - golang.org/x/net v0.29.0 + golang.org/x/net v0.33.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.10.0 golang.org/x/sys v0.28.0 diff --git a/go.sum b/go.sum index 0622c2ba57b..6921288dd6f 100644 --- a/go.sum +++ b/go.sum @@ -1066,8 +1066,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=