From a9ce67fb8874c2e80d0445bbf2fbcba2e22a78ee Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 13 Jun 2024 17:45:22 +0200 Subject: [PATCH] vendor: github.com/opencontainers/runc v1.1.13 full diff: https://github.com/opencontainers/runc/compare/v1.1.12...v1.1.13 Release notes: * If building with Go 1.22.x, make sure to use 1.22.4 or a later version. * Support go 1.22.4+. * runc list: fix race with runc delete. * Fix set nofile rlimit error. * libct/cg/fs: fix setting rt_period vs rt_runtime. * Fix a debug msg for user ns in nsexec. * script/*: fix gpg usage wrt keyboxd. * CI fixes and misc backports. * Fix codespell warnings. * Silence security false positives from golang/net. * libcontainer: allow containers to make apps think fips is enabled/disabled for testing. * allow overriding VERSION value in Makefile. * Vagrantfile.fedora: bump Fedora to 39. * ci/cirrus: rm centos stream 8. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit ec24e19d69acb32168c0dfd409c03b1199d1271c) Signed-off-by: Austin Vazquez --- vendor.mod | 2 +- vendor.sum | 4 ++-- .../github.com/opencontainers/runc/libcontainer/user/user.go | 1 - vendor/modules.txt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/vendor.mod b/vendor.mod index 56cde1db12..87dc752db9 100644 --- a/vendor.mod +++ b/vendor.mod @@ -78,7 +78,7 @@ require ( github.com/morikuni/aec v1.0.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 - github.com/opencontainers/runc v1.1.12 + github.com/opencontainers/runc v1.1.13 github.com/opencontainers/runtime-spec v1.2.0 github.com/opencontainers/selinux v1.11.0 github.com/pelletier/go-toml v1.9.5 diff --git a/vendor.sum b/vendor.sum index 67aa0fef26..4abf66ce16 100644 --- a/vendor.sum +++ b/vendor.sum @@ -541,8 +541,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss= -github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= +github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= +github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go index 984466d1ab..198c493679 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go @@ -197,7 +197,6 @@ func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) { for { var line []byte line, isPrefix, err = rd.ReadLine() - if err != nil { // We should return no error if EOF is reached // without a match. diff --git a/vendor/modules.txt b/vendor/modules.txt index 3363252968..f50019d202 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -987,8 +987,8 @@ github.com/opencontainers/go-digest/digestset github.com/opencontainers/image-spec/identity github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/opencontainers/runc v1.1.12 -## explicit; go 1.17 +# github.com/opencontainers/runc v1.1.13 +## explicit; go 1.18 github.com/opencontainers/runc/libcontainer/cgroups github.com/opencontainers/runc/libcontainer/configs github.com/opencontainers/runc/libcontainer/devices