From 69d54c482e84acee54af245dacc03b187ed4d9c4 Mon Sep 17 00:00:00 2001 From: Jake Correnti Date: Tue, 6 Feb 2024 13:54:59 -0500 Subject: [PATCH] Bump gvisor-tap-vsock from 0.7.2 to 0.7.3 Bump the gvisor-tap-vsock version that podman uses from 0.7.2 to 0.7.3 Signed-off-by: Jake Correnti --- Makefile | 2 +- contrib/pkginstaller/Makefile | 2 +- go.mod | 4 +- go.sum | 8 ++-- .../pkg/types/gvproxy_command.go | 8 ++++ .../gvisor-tap-vsock/pkg/types/version.go | 10 +++++ .../{versions_go121.go => versions.go} | 9 +++-- .../tools/internal/versions/versions_go122.go | 38 ------------------- vendor/modules.txt | 4 +- 9 files changed, 34 insertions(+), 51 deletions(-) rename vendor/golang.org/x/tools/internal/versions/{versions_go121.go => versions.go} (80%) delete mode 100644 vendor/golang.org/x/tools/internal/versions/versions_go122.go diff --git a/Makefile b/Makefile index 68fb105ed4..c7e8de361c 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,7 @@ endif # gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads # the upstream project ships pre-built binaries since version 0.7.1 -GV_VERSION=v0.7.2 +GV_VERSION=v0.7.3 ### ### Primary entry-point targets diff --git a/contrib/pkginstaller/Makefile b/contrib/pkginstaller/Makefile index ac3ab872d5..351d3cf41d 100644 --- a/contrib/pkginstaller/Makefile +++ b/contrib/pkginstaller/Makefile @@ -6,7 +6,7 @@ ifeq ($(ARCH), aarch64) else GOARCH:=$(ARCH) endif -GVPROXY_VERSION ?= 0.7.2 +GVPROXY_VERSION ?= 0.7.3 QEMU_VERSION ?= 8.2.1-1 GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin QEMU_RELEASE_URL ?= https://github.com/containers/podman-machine-qemu/releases/download/v$(QEMU_VERSION)/podman-machine-qemu-$(ARCH)-$(QEMU_VERSION).tar.xz diff --git a/go.mod b/go.mod index fd4baa3cb7..ea8a4f20d4 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/containers/buildah v1.34.1-0.20240201124221-b850c711ff5c github.com/containers/common v0.57.1-0.20240206153655-323e410f34bf github.com/containers/conmon v2.0.20+incompatible - github.com/containers/gvisor-tap-vsock v0.7.2 + github.com/containers/gvisor-tap-vsock v0.7.3 github.com/containers/image/v5 v5.29.2-0.20240130233108-e66a1ade2efc github.com/containers/libhvee v0.6.1-0.20240205152934-3a16bce3e4be github.com/containers/ocicrypt v1.1.9 @@ -213,7 +213,7 @@ require ( golang.org/x/mod v0.14.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.16.1 // indirect + golang.org/x/tools v0.17.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/grpc v1.60.1 // indirect diff --git a/go.sum b/go.sum index d052537011..13a56a3ce7 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ github.com/containers/common v0.57.1-0.20240206153655-323e410f34bf h1:n/MU6nLwLt github.com/containers/common v0.57.1-0.20240206153655-323e410f34bf/go.mod h1:s1gEyucR3ryIex1aDMo1KzbfpvRl0CaGER6s5jqXRkI= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= -github.com/containers/gvisor-tap-vsock v0.7.2 h1:6CyU5D85C0/DciRRd7W0bPljK4FAS+DPrrHEQMHfZKY= -github.com/containers/gvisor-tap-vsock v0.7.2/go.mod h1:6NiTxh2GCVxZQLPzfuEB78/Osp2Usd9uf6nLdd6PiUY= +github.com/containers/gvisor-tap-vsock v0.7.3 h1:yORnf15sP+sLFhxLNLgmB5/lOhldn9dRMHx/tmYtSOQ= +github.com/containers/gvisor-tap-vsock v0.7.3/go.mod h1:NI1fLMtKXQZoDrrOeqryGz7x7j/XSFWRmQILva7Fu9c= github.com/containers/image/v5 v5.29.2-0.20240130233108-e66a1ade2efc h1:3I5+mrrG7Fuv4aA13t1hAMQcjN3rTAQInfbxa5P+XH4= github.com/containers/image/v5 v5.29.2-0.20240130233108-e66a1ade2efc/go.mod h1:oMMRA6avp1Na54lVPCj/OvcfXDMLlzfy3H7xeRiWmmI= github.com/containers/libhvee v0.6.1-0.20240205152934-3a16bce3e4be h1:M0lI66eh3tYtvfcxy78dMbhKuYVP8aE0oLDoS5nDPq0= @@ -759,8 +759,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= -golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go index 8aa72e7eae..13df0982b3 100644 --- a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go @@ -22,6 +22,9 @@ type GvproxyCommand struct { // Map of different sockets provided by user (socket-type flag:socket) sockets map[string]string + // Logfile where gvproxy should redirect logs + LogFile string + // File where gvproxy's pid is stored PidFile string @@ -179,6 +182,11 @@ func (c *GvproxyCommand) ToCmdline() []string { args = append(args, "-pid-file", c.PidFile) } + // log-file + if c.LogFile != "" { + args = append(args, "-log-file", c.LogFile) + } + return args } diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/version.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/version.go index 845ba439b7..c371601c5d 100644 --- a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/version.go +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/version.go @@ -45,6 +45,16 @@ func moduleVersion() string { return gitArchiveVersion // This will be set when building from git using make case gitVersion != "": + if !strings.HasPrefix(gitVersion, "v") { + // if an annotated tag is found, the git describe string will be similar to: + // v0.7.2-15-g2c897d90 + // When using shallow clones, the commit being built + // may not have an annotated tag in its history, + // `git describe` will only be the abbreviated commit hash in this case: + // 2c897d90 + return fmt.Sprintf("git%s", gitVersion) + + } return gitVersion // moduleVersionFromBuildInfo() will be set when using `go install` default: diff --git a/vendor/golang.org/x/tools/internal/versions/versions_go121.go b/vendor/golang.org/x/tools/internal/versions/versions.go similarity index 80% rename from vendor/golang.org/x/tools/internal/versions/versions_go121.go rename to vendor/golang.org/x/tools/internal/versions/versions.go index cf4a7d0360..e16f6c33a5 100644 --- a/vendor/golang.org/x/tools/internal/versions/versions_go121.go +++ b/vendor/golang.org/x/tools/internal/versions/versions.go @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !go1.22 -// +build !go1.22 - package versions +// Note: If we use build tags to use go/versions when go >=1.22, +// we run into go.dev/issue/53737. Under some operations users would see an +// import of "go/versions" even if they would not compile the file. +// For example, during `go get -u ./...` (go.dev/issue/64490) we do not try to include +// For this reason, this library just a clone of go/versions for the moment. + // Lang returns the Go language version for version x. // If x is not a valid version, Lang returns the empty string. // For example: diff --git a/vendor/golang.org/x/tools/internal/versions/versions_go122.go b/vendor/golang.org/x/tools/internal/versions/versions_go122.go deleted file mode 100644 index c1c1814b28..0000000000 --- a/vendor/golang.org/x/tools/internal/versions/versions_go122.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2023 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build go1.22 -// +build go1.22 - -package versions - -import ( - "go/version" -) - -// Lang returns the Go language version for version x. -// If x is not a valid version, Lang returns the empty string. -// For example: -// -// Lang("go1.21rc2") = "go1.21" -// Lang("go1.21.2") = "go1.21" -// Lang("go1.21") = "go1.21" -// Lang("go1") = "go1" -// Lang("bad") = "" -// Lang("1.21") = "" -func Lang(x string) string { return version.Lang(x) } - -// Compare returns -1, 0, or +1 depending on whether -// x < y, x == y, or x > y, interpreted as Go versions. -// The versions x and y must begin with a "go" prefix: "go1.21" not "1.21". -// Invalid versions, including the empty string, compare less than -// valid versions and equal to each other. -// The language version "go1.21" compares less than the -// release candidate and eventual releases "go1.21rc1" and "go1.21.0". -// Custom toolchain suffixes are ignored during comparison: -// "go1.21.0" and "go1.21.0-bigcorp" are equal. -func Compare(x, y string) int { return version.Compare(x, y) } - -// IsValid reports whether the version x is valid. -func IsValid(x string) bool { return version.IsValid(x) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 8cf22e3b58..c2aa8a5654 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -236,7 +236,7 @@ github.com/containers/common/version # github.com/containers/conmon v2.0.20+incompatible ## explicit github.com/containers/conmon/runner/config -# github.com/containers/gvisor-tap-vsock v0.7.2 +# github.com/containers/gvisor-tap-vsock v0.7.3 ## explicit; go 1.20 github.com/containers/gvisor-tap-vsock/pkg/types # github.com/containers/image/v5 v5.29.2-0.20240130233108-e66a1ade2efc @@ -1240,7 +1240,7 @@ golang.org/x/text/unicode/norm # golang.org/x/time v0.3.0 ## explicit golang.org/x/time/rate -# golang.org/x/tools v0.16.1 +# golang.org/x/tools v0.17.0 ## explicit; go 1.18 golang.org/x/tools/cmd/stringer golang.org/x/tools/go/ast/inspector