Skip to content

Commit 50e74d2

Browse files
committed
chore: use go1.20.8
Part of ooni/probe#2524
1 parent 24ce473 commit 50e74d2

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

GOVERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20.6
1+
1.20.8

Readme.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ sudo apt install golang build-essential ca-certificates git
8888
sudo apt install mingw-w64
8989

9090
# install the required go version binary
91-
go install -v golang.org/dl/go1.20.6@latest
91+
go install -v golang.org/dl/go1.20.8@latest
9292

9393
# fetch the whole go distribution
94-
$HOME/go/bin/go1.20.6 download
94+
$HOME/go/bin/go1.20.8 download
9595
```
9696

9797
### Fedora developer setup
@@ -107,10 +107,10 @@ sudo dnf install golang make gcc gcc-c++ git
107107
sudo dnf install mingw64-gcc mingw64-gcc-c++
108108

109109
# install the required go version binary
110-
go install -v golang.org/dl/go1.20.6@latest
110+
go install -v golang.org/dl/go1.20.8@latest
111111

112112
# fetch the whole go distribution
113-
$HOME/go/bin/go1.20.6 download
113+
$HOME/go/bin/go1.20.8 download
114114
```
115115

116116
### macOS developer setup
@@ -127,10 +127,10 @@ Then, you need to follow these instructions:
127127
brew install go
128128

129129
# install the required go version binary
130-
go install -v golang.org/dl/go1.20.6@latest
130+
go install -v golang.org/dl/go1.20.8@latest
131131

132132
# fetch the whole go distribution
133-
$HOME/go/bin/go1.20.6 download
133+
$HOME/go/bin/go1.20.8 download
134134
```
135135

136136
### Build instructions
@@ -139,7 +139,7 @@ Once you have installed the correct Go version and a C compiler,
139139
you can compile `ooniprobe` using:
140140

141141
```bash
142-
$HOME/go/bin/go1.20.6 build -v -ldflags '-s -w' ./cmd/ooniprobe
142+
$HOME/go/bin/go1.20.8 build -v -ldflags '-s -w' ./cmd/ooniprobe
143143
```
144144

145145
This command will generate a stripped binary called `ooniprobe`
@@ -148,7 +148,7 @@ in the toplevel directory.
148148
Likewise, you can compile `miniooni` using:
149149

150150
```bash
151-
$HOME/go/bin/go1.20.6 build -v -ldflags '-s -w' ./internal/cmd/miniooni
151+
$HOME/go/bin/go1.20.8 build -v -ldflags '-s -w' ./internal/cmd/miniooni
152152
```
153153

154154
This command will generate a stripped binary called `miniooni`
@@ -157,7 +157,7 @@ in the toplevel directory.
157157
And `oohelperd` using:
158158

159159
```bash
160-
$HOME/go/bin/go1.20.6 build -v -ldflags '-s -w' ./internal/cmd/oohelperd
160+
$HOME/go/bin/go1.20.8 build -v -ldflags '-s -w' ./internal/cmd/oohelperd
161161
```
162162

163163
This command will generate a stripped binary called `oohelperd`

go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
github.com/montanaflynn/stats v0.7.1
2828
github.com/ooni/go-libtor v1.1.8
2929
github.com/ooni/netem v0.0.0-20230920215742-15f3ffec0107
30-
github.com/ooni/oocrypto v0.5.3
31-
github.com/ooni/oohttp v0.6.3
30+
github.com/ooni/oocrypto v0.5.4
31+
github.com/ooni/oohttp v0.6.4
3232
github.com/ooni/probe-assets v0.18.0
3333
github.com/pborman/getopt/v2 v2.1.0
3434
github.com/pion/stun v0.6.1
@@ -40,9 +40,9 @@ require (
4040
github.com/upper/db/v4 v4.6.0
4141
gitlab.com/yawning/obfs4.git v0.0.0-20230519154740-645026c2ada4
4242
gitlab.com/yawning/utls.git v0.0.12-1
43-
golang.org/x/crypto v0.11.0
44-
golang.org/x/net v0.12.0
45-
golang.org/x/sys v0.10.0
43+
golang.org/x/crypto v0.13.0
44+
golang.org/x/net v0.15.0
45+
golang.org/x/sys v0.12.0
4646
)
4747

4848
require (
@@ -150,8 +150,8 @@ require (
150150
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
151151
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20220726154925-def713fd18e4 // indirect
152152
golang.org/x/mod v0.10.0 // indirect
153-
golang.org/x/term v0.10.0 // indirect
154-
golang.org/x/text v0.11.0 // indirect
153+
golang.org/x/term v0.12.0 // indirect
154+
golang.org/x/text v0.13.0 // indirect
155155
golang.org/x/tools v0.9.3 // indirect
156156
google.golang.org/protobuf v1.30.0 // indirect
157157
)

go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,10 @@ github.com/ooni/go-libtor v1.1.8 h1:Wo3V3DVTxl5vZdxtQakqYP+DAHx7pPtAFSl1bnAa08w=
476476
github.com/ooni/go-libtor v1.1.8/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI=
477477
github.com/ooni/netem v0.0.0-20230920215742-15f3ffec0107 h1:PktaCPQ1NYZOaK+J8pQGYiPCYFkGR5H3ZURg9zPkQsI=
478478
github.com/ooni/netem v0.0.0-20230920215742-15f3ffec0107/go.mod h1:5X3Lk4+cnrwrQiYgRlCWXgV33IMDgLaO5s1x0DD/fO0=
479-
github.com/ooni/oocrypto v0.5.3 h1:CAb0Ze6q/EWD1PRGl9KqpzMfkut4O3XMaiKYsyxrWOs=
480-
github.com/ooni/oocrypto v0.5.3/go.mod h1:HjEQ5pQBl6btcWgAsKKq1tFo8CfBrZu63C/vPAUGIDk=
481-
github.com/ooni/oohttp v0.6.3 h1:MHydpeAPU/LSDSI/hIFJwZm4afBhd2Yo+rNxxFdeMCY=
482-
github.com/ooni/oohttp v0.6.3/go.mod h1:Zk8frCRZeVn2x68SI6rc0PvAJrK5unPLczIhCU/STAk=
479+
github.com/ooni/oocrypto v0.5.4 h1:/AkVZd+aq54+OXgOtWEmK8xgZsFQtlmtPf2VgY20YWw=
480+
github.com/ooni/oocrypto v0.5.4/go.mod h1:HjEQ5pQBl6btcWgAsKKq1tFo8CfBrZu63C/vPAUGIDk=
481+
github.com/ooni/oohttp v0.6.4 h1:QZyOO4e88AzLOHGTgapXmsjtn1EVR7Wl+BtHd8okIf4=
482+
github.com/ooni/oohttp v0.6.4/go.mod h1:RipdYAUiw1UTnpm0ISd0r1Kiv/CGaRUgn08xbK1JgVo=
483483
github.com/ooni/probe-assets v0.18.0 h1:/Ui1mvGzPKu+IB9sBWGeVDJPuIlWGAfKb7nPOhQfgGQ=
484484
github.com/ooni/probe-assets v0.18.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
485485
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
@@ -807,8 +807,8 @@ golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0
807807
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
808808
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
809809
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
810-
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
811-
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
810+
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
811+
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
812812
golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
813813
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
814814
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
@@ -872,8 +872,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
872872
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
873873
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
874874
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
875-
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
876-
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
875+
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
876+
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
877877
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
878878
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
879879
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -947,8 +947,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
947947
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
948948
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
949949
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
950-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
951-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
950+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
951+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
952952
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
953953
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
954954
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -958,8 +958,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
958958
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
959959
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
960960
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
961-
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
962-
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
961+
golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
962+
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
963963
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
964964
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
965965
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -971,8 +971,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
971971
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
972972
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
973973
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
974-
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
975-
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
974+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
975+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
976976
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
977977
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
978978
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=

0 commit comments

Comments
 (0)