From a4037a2e3192261af9133709372ac07311593f65 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Wed, 11 Oct 2023 15:34:26 +0200 Subject: [PATCH] [backport] chore: use go1.20.10 This diff backports #1362 to the release/3.19 branch. Part of https://github.com/ooni/probe/issues/2524 --- GOVERSION | 2 +- Readme.md | 20 ++++++++++---------- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/GOVERSION b/GOVERSION index 95393fc7d4..acdfc7930c 100644 --- a/GOVERSION +++ b/GOVERSION @@ -1 +1 @@ -1.20.8 +1.20.10 diff --git a/Readme.md b/Readme.md index 6125e9ddea..656edfaa8d 100644 --- a/Readme.md +++ b/Readme.md @@ -61,7 +61,7 @@ Debian/Ubuntu. Once `ooniprobe` is installed, refer to the ## Developer instructions This repository requires _exactly_ the Go version mentioned by the -[GOVERSION](GOVERSION) file (i.e., go1.20.8). Using a different version of +[GOVERSION](GOVERSION) file (i.e., go1.20.10). Using a different version of Go _may_ work as intended but is not recommended: we depend on packages forked from the standard library; so, it is more robust to use the same version of Go from which @@ -88,10 +88,10 @@ sudo apt install golang build-essential ca-certificates git sudo apt install mingw-w64 # install the required go version binary -go install -v golang.org/dl/go1.20.8@latest +go install -v golang.org/dl/go1.20.10@latest # fetch the whole go distribution -$HOME/go/bin/go1.20.8 download +$HOME/go/bin/go1.20.10 download ``` ### Fedora developer setup @@ -107,10 +107,10 @@ sudo dnf install golang make gcc gcc-c++ git sudo dnf install mingw64-gcc mingw64-gcc-c++ # install the required go version binary -go install -v golang.org/dl/go1.20.8@latest +go install -v golang.org/dl/go1.20.10@latest # fetch the whole go distribution -$HOME/go/bin/go1.20.8 download +$HOME/go/bin/go1.20.10 download ``` ### macOS developer setup @@ -127,10 +127,10 @@ Then, you need to follow these instructions: brew install go # install the required go version binary -go install -v golang.org/dl/go1.20.8@latest +go install -v golang.org/dl/go1.20.10@latest # fetch the whole go distribution -$HOME/go/bin/go1.20.8 download +$HOME/go/bin/go1.20.10 download ``` ### Build instructions @@ -139,7 +139,7 @@ Once you have installed the correct Go version and a C compiler, you can compile `ooniprobe` using: ```bash -$HOME/go/bin/go1.20.8 build -v -ldflags '-s -w' ./cmd/ooniprobe +$HOME/go/bin/go1.20.10 build -v -ldflags '-s -w' ./cmd/ooniprobe ``` This command will generate a stripped binary called `ooniprobe` @@ -148,7 +148,7 @@ in the toplevel directory. Likewise, you can compile `miniooni` using: ```bash -$HOME/go/bin/go1.20.8 build -v -ldflags '-s -w' ./internal/cmd/miniooni +$HOME/go/bin/go1.20.10 build -v -ldflags '-s -w' ./internal/cmd/miniooni ``` This command will generate a stripped binary called `miniooni` @@ -157,7 +157,7 @@ in the toplevel directory. And `oohelperd` using: ```bash -$HOME/go/bin/go1.20.8 build -v -ldflags '-s -w' ./internal/cmd/oohelperd +$HOME/go/bin/go1.20.10 build -v -ldflags '-s -w' ./internal/cmd/oohelperd ``` This command will generate a stripped binary called `oohelperd` diff --git a/go.mod b/go.mod index 67e0af02e9..cb036df062 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cloudflare/circl v1.3.3 github.com/cretz/bine v0.2.0 github.com/fatih/color v1.15.0 - github.com/google/go-cmp v0.5.9 + github.com/google/go-cmp v0.6.0 github.com/google/gopacket v1.1.19 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.3.1 @@ -24,8 +24,8 @@ require ( github.com/montanaflynn/stats v0.7.1 github.com/ooni/go-libtor v1.1.8 github.com/ooni/netem v0.0.0-20230920215742-15f3ffec0107 - github.com/ooni/oocrypto v0.5.4 - github.com/ooni/oohttp v0.6.4 + github.com/ooni/oocrypto v0.5.5 + github.com/ooni/oohttp v0.6.5 github.com/ooni/probe-assets v0.19.0 github.com/pborman/getopt/v2 v2.1.0 github.com/pion/stun v0.6.1 @@ -40,7 +40,7 @@ require ( gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2 v2.6.1 golang.org/x/crypto v0.14.0 - golang.org/x/net v0.16.0 + golang.org/x/net v0.17.0 golang.org/x/sys v0.13.0 ) diff --git a/go.sum b/go.sum index ed4a73f645..0f3aaf7ff2 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ= @@ -326,10 +326,10 @@ github.com/ooni/go-libtor v1.1.8 h1:Wo3V3DVTxl5vZdxtQakqYP+DAHx7pPtAFSl1bnAa08w= github.com/ooni/go-libtor v1.1.8/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI= github.com/ooni/netem v0.0.0-20230920215742-15f3ffec0107 h1:PktaCPQ1NYZOaK+J8pQGYiPCYFkGR5H3ZURg9zPkQsI= github.com/ooni/netem v0.0.0-20230920215742-15f3ffec0107/go.mod h1:5X3Lk4+cnrwrQiYgRlCWXgV33IMDgLaO5s1x0DD/fO0= -github.com/ooni/oocrypto v0.5.4 h1:/AkVZd+aq54+OXgOtWEmK8xgZsFQtlmtPf2VgY20YWw= -github.com/ooni/oocrypto v0.5.4/go.mod h1:HjEQ5pQBl6btcWgAsKKq1tFo8CfBrZu63C/vPAUGIDk= -github.com/ooni/oohttp v0.6.4 h1:QZyOO4e88AzLOHGTgapXmsjtn1EVR7Wl+BtHd8okIf4= -github.com/ooni/oohttp v0.6.4/go.mod h1:RipdYAUiw1UTnpm0ISd0r1Kiv/CGaRUgn08xbK1JgVo= +github.com/ooni/oocrypto v0.5.5 h1:x0wIgtBfghVu8Ok0tR/xVyfHlo646hN1LB/5bzuXcIg= +github.com/ooni/oocrypto v0.5.5/go.mod h1:HjEQ5pQBl6btcWgAsKKq1tFo8CfBrZu63C/vPAUGIDk= +github.com/ooni/oohttp v0.6.5 h1:hjMnX2fGNHYHqh1JmfxoTfnN9JmdgT0fa6yIEjoYhG8= +github.com/ooni/oohttp v0.6.5/go.mod h1:RipdYAUiw1UTnpm0ISd0r1Kiv/CGaRUgn08xbK1JgVo= github.com/ooni/probe-assets v0.19.0 h1:XloDJQt6uxn6EYVwfWCOnlgsJZbmzO7VPFsJ8RPW8Ns= github.com/ooni/probe-assets v0.19.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU= github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc= @@ -616,8 +616,8 @@ golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= -golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=