Skip to content

Commit 406a11e

Browse files
bassosimoneMurphy-OrangeMud
authored andcommitted
chore: upgrade most deps except snowflake (ooni#1346)
This diff upgrades most deps except for snowflake and related dependencies such as goptlib. The following diff contains the packages I *did not* update: ```diff diff --git a/go.mod b/go.mod index 09b51d9..54eecd98 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/rubenv/sql-migrate v1.5.2 github.com/schollz/progressbar/v3 v3.13.1 github.com/upper/db/v4 v4.6.0 - gitlab.com/yawning/obfs4.git v0.0.0-20230519154740-645026c2ada4 + gitlab.com/yawning/obfs4.git v0.0.0-20231005123604-19f5a37fe427 gitlab.com/yawning/utls.git v0.0.12-1 golang.org/x/crypto v0.13.0 golang.org/x/net v0.15.0 @@ -74,13 +74,14 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect + gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266 // indirect gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 // indirect go.uber.org/mock v0.3.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 // indirect golang.org/x/time v0.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 // indirect + gvisor.dev/gvisor v0.0.0-20231005075148-09be6cec5e98 // indirect ) require ( @@ -89,7 +90,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect + github.com/bifurcation/mint v0.0.0-20210616192047-fd18df995463 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect @@ -132,7 +133,7 @@ require ( github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/refraction-networking/gotapdance v1.7.4 // indirect - github.com/refraction-networking/utls v1.3.3 // indirect + github.com/refraction-networking/utls v1.5.3 // indirect github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.7.0 @@ -142,11 +143,11 @@ require ( github.com/templexxx/xorsimd v0.4.2 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect - github.com/xtaci/kcp-go/v5 v5.6.2 // indirect + github.com/xtaci/kcp-go/v5 v5.6.3 // indirect github.com/xtaci/smux v1.5.24 // indirect gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect gitlab.com/yawning/edwards25519-extra.git v0.0.0-20230925102617-375edaeb7d45 // indirect - golang.org/x/mod v0.12.0 // indirect + golang.org/x/mod v0.13.0 // indirect golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.13.0 // indirect ``` The following updates would break the build: - gvisor because the default branch is not go.mod ready; - kcp-go because v5.6.3 requires go1.21; - obfs4 because it requires changing goptlib, which I'll do next; - mint because Psiphon requires that version of mint. This work is part of ooni/probe#2524
1 parent a2d7a2f commit 406a11e

File tree

2 files changed

+119
-108
lines changed

2 files changed

+119
-108
lines changed

go.mod

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,44 +41,42 @@ require (
4141
gitlab.com/yawning/utls.git v0.0.12-1
4242
golang.org/x/crypto v0.13.0
4343
golang.org/x/net v0.15.0
44-
golang.org/x/sys v0.12.0
44+
golang.org/x/sys v0.13.0
4545
)
4646

4747
require (
48-
github.com/BurntSushi/toml v1.3.0 // indirect
4948
github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7 // indirect
5049
github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect
5150
github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20230608213623-d58aa73e519a // indirect
5251
github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf // indirect
5352
github.com/Psiphon-Labs/quic-go v0.0.0-20230626192210-73f29effc9da // indirect
54-
github.com/Psiphon-Labs/tls-tris v0.0.0-20230821160547-c948ccd6c156 // indirect
53+
github.com/Psiphon-Labs/tls-tris v0.0.0-20230824155421-58bf6d336a9a // indirect
5554
github.com/andybalholm/brotli v1.0.5 // indirect
5655
github.com/davecgh/go-spew v1.1.1 // indirect
57-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
58-
github.com/gaukas/godicttls v0.0.3 // indirect
59-
github.com/go-redis/redis/v8 v8.11.5 // indirect
56+
github.com/gaukas/godicttls v0.0.4 // indirect
6057
github.com/google/btree v1.1.2 // indirect
61-
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
58+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
6259
github.com/inconshreveable/mousetrap v1.1.0 // indirect
63-
github.com/klauspost/compress v1.16.5 // indirect
64-
github.com/mattn/go-runewidth v0.0.14 // indirect
60+
github.com/klauspost/compress v1.17.0 // indirect
61+
github.com/libp2p/go-reuseport v0.4.0 // indirect
62+
github.com/mattn/go-runewidth v0.0.15 // indirect
6563
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
66-
github.com/mroth/weightedrand v1.0.0 // indirect
67-
github.com/onsi/ginkgo/v2 v2.9.7 // indirect
68-
github.com/pebbe/zmq4 v1.2.9 // indirect
69-
github.com/pelletier/go-toml v1.9.5 // indirect
70-
github.com/pion/transport/v2 v2.2.1 // indirect
64+
github.com/onsi/ginkgo/v2 v2.12.1 // indirect
65+
github.com/pion/transport/v2 v2.2.4 // indirect
7166
github.com/pmezard/go-difflib v1.0.0 // indirect
7267
github.com/quic-go/qpack v0.4.0 // indirect
7368
github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
74-
github.com/refraction-networking/conjure v0.4.0 // indirect
69+
github.com/refraction-networking/conjure v0.7.4 // indirect
70+
github.com/refraction-networking/ed25519 v0.1.2 // indirect
71+
github.com/refraction-networking/obfs4 v0.1.2 // indirect
7572
github.com/rivo/uniseg v0.4.4 // indirect
7673
github.com/segmentio/fasthash v1.0.3 // indirect
7774
github.com/spf13/pflag v1.0.5 // indirect
7875
github.com/stretchr/testify v1.8.4 // indirect
7976
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
77+
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 // indirect
8078
go.uber.org/mock v0.3.0 // indirect
81-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
79+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
8280
golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 // indirect
8381
golang.org/x/time v0.3.0 // indirect
8482
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -102,39 +100,39 @@ require (
102100
github.com/dustin/go-humanize v1.0.1 // indirect
103101
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
104102
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
105-
github.com/golang/glog v1.1.1 // indirect
103+
github.com/golang/glog v1.1.2 // indirect
106104
github.com/golang/protobuf v1.5.3 // indirect
107105
github.com/grafov/m3u8 v0.12.0 // indirect
108-
github.com/hashicorp/golang-lru v0.6.0 // indirect
106+
github.com/hashicorp/golang-lru v1.0.2 // indirect
109107
github.com/juju/ratelimit v1.0.2 // indirect
110108
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
111109
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
112-
github.com/klauspost/reedsolomon v1.11.7 // indirect
110+
github.com/klauspost/reedsolomon v1.11.8 // indirect
113111
github.com/mattn/go-isatty v0.0.19 // indirect
114112
github.com/mattn/go-sqlite3 v1.14.17
115113
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
116114
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
117115
github.com/oschwald/maxminddb-golang v1.12.0
118116
github.com/pion/datachannel v1.5.5 // indirect
119117
github.com/pion/dtls/v2 v2.2.7 // indirect
120-
github.com/pion/ice/v2 v2.3.6 // indirect
121-
github.com/pion/interceptor v0.1.17 // indirect
118+
github.com/pion/ice/v2 v2.3.11 // indirect
119+
github.com/pion/interceptor v0.1.21 // indirect
122120
github.com/pion/logging v0.2.2 // indirect
123-
github.com/pion/mdns v0.0.7 // indirect
121+
github.com/pion/mdns v0.0.9 // indirect
124122
github.com/pion/randutil v0.1.0 // indirect
125123
github.com/pion/rtcp v1.2.10 // indirect
126-
github.com/pion/rtp v1.7.13 // indirect
127-
github.com/pion/sctp v1.8.7 // indirect
124+
github.com/pion/rtp v1.8.2 // indirect
125+
github.com/pion/sctp v1.8.9 // indirect
128126
github.com/pion/sdp/v3 v3.0.6 // indirect
129-
github.com/pion/srtp/v2 v2.0.15 // indirect
130-
github.com/pion/turn/v2 v2.1.0 // indirect
131-
github.com/pion/webrtc/v3 v3.2.9 // indirect
127+
github.com/pion/srtp/v2 v2.0.17 // indirect
128+
github.com/pion/turn/v2 v2.1.4 // indirect
129+
github.com/pion/webrtc/v3 v3.2.21 // indirect
132130
github.com/prometheus/client_golang v1.17.0
133-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
131+
github.com/prometheus/client_model v0.5.0 // indirect
134132
github.com/prometheus/common v0.44.0 // indirect
135-
github.com/prometheus/procfs v0.11.1 // indirect
136-
github.com/refraction-networking/gotapdance v1.5.0 // indirect
137-
github.com/refraction-networking/utls v1.3.2 // indirect
133+
github.com/prometheus/procfs v0.12.0 // indirect
134+
github.com/refraction-networking/gotapdance v1.7.4 // indirect
135+
github.com/refraction-networking/utls v1.3.3 // indirect
138136
github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect
139137
github.com/sirupsen/logrus v1.9.3 // indirect
140138
github.com/spf13/cobra v1.7.0
@@ -147,7 +145,7 @@ require (
147145
github.com/xtaci/kcp-go/v5 v5.6.2 // indirect
148146
github.com/xtaci/smux v1.5.24 // indirect
149147
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
150-
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20220726154925-def713fd18e4 // indirect
148+
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20230925102617-375edaeb7d45 // indirect
151149
golang.org/x/mod v0.12.0 // indirect
152150
golang.org/x/term v0.12.0 // indirect
153151
golang.org/x/text v0.13.0 // indirect

0 commit comments

Comments
 (0)