Skip to content

Commit 96631c7

Browse files
Merge pull request #27612 from l0rd/win-default-helper-binaries
Replace FindExecutablePeer with FindHelperBinary when looking for gvproxy/win-sshproxy on WSL
2 parents ffe0174 + f71b933 commit 96631c7

File tree

75 files changed

+608
-5231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+608
-5231
lines changed

go.mod

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/containers/podman/v6
33
// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
44
// time there shouldn't be), its version must be an exact match to the "go" directive.
55

6-
go 1.24.2
6+
go 1.24.6
77

88
require (
99
github.com/Microsoft/go-winio v0.6.2
@@ -58,15 +58,15 @@ require (
5858
github.com/openshift/imagebuilder v1.2.19
5959
github.com/rootless-containers/rootlesskit/v2 v2.3.5
6060
github.com/shirou/gopsutil/v4 v4.25.10
61-
github.com/sirupsen/logrus v1.9.3
61+
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
6262
github.com/spf13/cobra v1.10.1
6363
github.com/spf13/pflag v1.0.10
6464
github.com/stretchr/testify v1.11.1
6565
github.com/vbauerster/mpb/v8 v8.11.2
6666
github.com/vishvananda/netlink v1.3.1
67-
go.podman.io/common v0.66.1-0.20251122023359-22d50c57903c
68-
go.podman.io/image/v5 v5.38.1-0.20251122023359-22d50c57903c
69-
go.podman.io/storage v1.61.1-0.20251122023359-22d50c57903c
67+
go.podman.io/common v0.66.1-0.20251126122123-4fc82df3fdc0
68+
go.podman.io/image/v5 v5.38.1-0.20251126122123-4fc82df3fdc0
69+
go.podman.io/storage v1.61.1-0.20251125064110-c4e25180a61d
7070
golang.org/x/crypto v0.45.0
7171
golang.org/x/net v0.47.0
7272
golang.org/x/sync v0.18.0
@@ -102,7 +102,7 @@ require (
102102
github.com/containers/common v0.62.2 // indirect
103103
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
104104
github.com/containers/luksy v0.0.0-20250910190358-2cf5bc928957 // indirect
105-
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
105+
github.com/coreos/go-oidc/v3 v3.16.0 // indirect
106106
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
107107
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
108108
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -132,7 +132,6 @@ require (
132132
github.com/jinzhu/copier v0.4.0 // indirect
133133
github.com/klauspost/compress v1.18.1 // indirect
134134
github.com/kr/fs v0.1.0 // indirect
135-
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
136135
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
137136
github.com/manifoldco/promptui v0.9.0 // indirect
138137
github.com/mattn/go-runewidth v0.0.19 // indirect
@@ -148,28 +147,26 @@ require (
148147
github.com/moby/sys/sequential v0.6.0 // indirect
149148
github.com/moby/sys/userns v0.1.0 // indirect
150149
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
151-
github.com/modern-go/reflect2 v1.0.2 // indirect
150+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
152151
github.com/morikuni/aec v1.0.0 // indirect
153152
github.com/opencontainers/runc v1.3.3 // indirect
153+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
154154
github.com/pkg/errors v0.9.1 // indirect
155155
github.com/pkg/sftp v1.13.10 // indirect
156156
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
157157
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
158158
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
159-
github.com/proglottis/gpgme v0.1.5 // indirect
159+
github.com/proglottis/gpgme v0.1.6 // indirect
160160
github.com/seccomp/libseccomp-golang v0.11.1 // indirect
161161
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
162-
github.com/segmentio/ksuid v1.0.4 // indirect
163-
github.com/sigstore/fulcio v1.7.1 // indirect
164-
github.com/sigstore/protobuf-specs v0.4.1 // indirect
165-
github.com/sigstore/sigstore v1.9.5 // indirect
162+
github.com/sigstore/fulcio v1.8.1 // indirect
163+
github.com/sigstore/protobuf-specs v0.5.0 // indirect
164+
github.com/sigstore/sigstore v1.9.6-0.20251111174640-d8ab8afb1326 // indirect
166165
github.com/skeema/knownhosts v1.3.2 // indirect
167-
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
168166
github.com/smallstep/pkcs7 v0.1.1 // indirect
169167
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
170168
github.com/sylabs/sif/v2 v2.22.0 // indirect
171169
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
172-
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
173170
github.com/tklauser/go-sysconf v0.3.15 // indirect
174171
github.com/tklauser/numcpus v0.10.0 // indirect
175172
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
@@ -183,12 +180,12 @@ require (
183180
go.opentelemetry.io/otel v1.38.0 // indirect
184181
go.opentelemetry.io/otel/metric v1.38.0 // indirect
185182
go.opentelemetry.io/otel/trace v1.38.0 // indirect
186-
go.yaml.in/yaml/v2 v2.4.2 // indirect
183+
go.yaml.in/yaml/v2 v2.4.3 // indirect
187184
go.yaml.in/yaml/v3 v3.0.4 // indirect
188185
golang.org/x/mod v0.29.0 // indirect
189186
golang.org/x/oauth2 v0.33.0 // indirect
190187
golang.org/x/text v0.31.0 // indirect
191-
golang.org/x/time v0.11.0 // indirect
188+
golang.org/x/time v0.14.0 // indirect
192189
golang.org/x/tools v0.38.0 // indirect
193190
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
194191
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect

0 commit comments

Comments
 (0)