From 07ad2750f6f6b905e2d07f6e5fb1e9111fe1c37f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 29 Jul 2026 10:39:27 +0000 Subject: [PATCH] fix(deps): update github.com/moby/go-archive digest to a11565d Signed-off-by: Mend Renovate --- go.mod | 2 +- go.sum | 4 +-- vendor/github.com/moby/go-archive/archive.go | 2 ++ vendor/github.com/moby/go-archive/time.go | 4 +++ .../moby/go-archive/time_nonwindows.go | 31 ++++++++++--------- .../moby/go-archive/time_windows.go | 5 +++ vendor/modules.txt | 2 +- 7 files changed, 31 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 962f4f1331..e09649c8c5 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 github.com/moby/buildkit v0.32.0-rc2 github.com/moby/docker-image-spec v1.3.1 - github.com/moby/go-archive v0.2.2-0.20260724112411-2ff9bfb8b2ee + github.com/moby/go-archive v0.2.2-0.20260729101603-a11565d1683c github.com/moby/ipvs v1.1.0 github.com/moby/locker v1.0.1 github.com/moby/moby/api v1.55.0 diff --git a/go.sum b/go.sum index ac83e24144..a081ce97d4 100644 --- a/go.sum +++ b/go.sum @@ -547,8 +547,8 @@ github.com/moby/buildkit v0.32.0-rc2 h1:2XiJmnPSZyJ0akoKG2ShWAFbWRT5DKvyAI2+Johq github.com/moby/buildkit v0.32.0-rc2/go.mod h1:Y10FBWvqxl/Wmhdzjee1Y2wQfjifTiwxENIUdaVNdME= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/go-archive v0.2.2-0.20260724112411-2ff9bfb8b2ee h1:VUrUP/hu1E43KunXVZlHsNstFGeZOpm/CQoLx5OSuMw= -github.com/moby/go-archive v0.2.2-0.20260724112411-2ff9bfb8b2ee/go.mod h1:Npdv43fFqlhZW7Xo8fbm3ZMYFvAGNviUPqX21VERbcE= +github.com/moby/go-archive v0.2.2-0.20260729101603-a11565d1683c h1:FHEkke3COBYyr7/aIk1782G/4oVN/6L/ISEMD5dPIDk= +github.com/moby/go-archive v0.2.2-0.20260729101603-a11565d1683c/go.mod h1:Npdv43fFqlhZW7Xo8fbm3ZMYFvAGNviUPqX21VERbcE= github.com/moby/ipvs v1.1.0 h1:ONN4pGaZQgAx+1Scz5RvWV4Q7Gb+mvfRh3NsPS+1XQQ= github.com/moby/ipvs v1.1.0/go.mod h1:4VJMWuf098bsUMmZEiD4Tjk/O7mOn3l1PTD3s4OoYAs= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= diff --git a/vendor/github.com/moby/go-archive/archive.go b/vendor/github.com/moby/go-archive/archive.go index 1654a07333..4a247c5f50 100644 --- a/vendor/github.com/moby/go-archive/archive.go +++ b/vendor/github.com/moby/go-archive/archive.go @@ -123,6 +123,8 @@ func breakoutError(err error) error { return &breakoutErr{error: err} } +func (e *breakoutErr) Unwrap() error { return e.error } + const ( AUFSWhiteoutFormat WhiteoutFormat = 0 // AUFSWhiteoutFormat is the default format for whiteouts OverlayWhiteoutFormat WhiteoutFormat = 1 // OverlayWhiteoutFormat formats whiteout according to the overlay standard. diff --git a/vendor/github.com/moby/go-archive/time.go b/vendor/github.com/moby/go-archive/time.go index 4e9ae95084..fb8c0299b9 100644 --- a/vendor/github.com/moby/go-archive/time.go +++ b/vendor/github.com/moby/go-archive/time.go @@ -22,6 +22,10 @@ func init() { } } +// boundTime returns t if it falls within the range supported by os.Chtimes. +// Times before the Unix epoch (minTime) or after the end of Unix time +// (maxTime) are replaced with minTime, as os.Chtimes has undefined behavior +// outside that range. func boundTime(t time.Time) time.Time { if t.Before(minTime) || t.After(maxTime) { return minTime diff --git a/vendor/github.com/moby/go-archive/time_nonwindows.go b/vendor/github.com/moby/go-archive/time_nonwindows.go index f959b9009a..5fa042ec27 100644 --- a/vendor/github.com/moby/go-archive/time_nonwindows.go +++ b/vendor/github.com/moby/go-archive/time_nonwindows.go @@ -14,25 +14,15 @@ import ( "golang.org/x/sys/unix" ) -// chtimes changes the access time and modified time of a file at the given path. -// If the modified time is prior to the Unix Epoch (unixMinTime), or after the -// end of Unix Time (unixEpochTime), os.Chtimes has undefined behavior. In this -// case, Chtimes defaults to Unix Epoch, just in case. +// chtimes changes the access and modification time of a file at the given +// path. +// +// Callers must use boundTime to ensure timestamps are within the range +// supported by os.Chtimes. func chtimes(name string, atime time.Time, mtime time.Time) error { return os.Chtimes(name, atime, mtime) } -func timeToTimespec(time time.Time) unix.Timespec { - if time.IsZero() { - // Return UTIME_OMIT special value - return unix.Timespec{ - Sec: 0, - Nsec: (1 << 30) - 2, - } - } - return unix.NsecToTimespec(time.UnixNano()) -} - func lchtimes(root *os.Root, name string, atime, mtime time.Time) error { dir, base := path.Split(filepath.ToSlash(name)) if base == "" { @@ -63,3 +53,14 @@ func lchtimes(root *os.Root, name string, atime, mtime time.Time) error { } return nil } + +func timeToTimespec(time time.Time) unix.Timespec { + if time.IsZero() { + // Return UTIME_OMIT special value + return unix.Timespec{ + Sec: 0, + Nsec: (1 << 30) - 2, + } + } + return unix.NsecToTimespec(time.UnixNano()) +} diff --git a/vendor/github.com/moby/go-archive/time_windows.go b/vendor/github.com/moby/go-archive/time_windows.go index c4a007fb7a..aaa3399f73 100644 --- a/vendor/github.com/moby/go-archive/time_windows.go +++ b/vendor/github.com/moby/go-archive/time_windows.go @@ -7,6 +7,11 @@ import ( "golang.org/x/sys/windows" ) +// chtimes changes the access and modification time of a file at the given +// path. +// +// Callers must use boundTime to ensure timestamps are within the range +// supported by os.Chtimes. func chtimes(name string, atime time.Time, mtime time.Time) error { if err := os.Chtimes(name, atime, mtime); err != nil { return err diff --git a/vendor/modules.txt b/vendor/modules.txt index 163e6f8388..02a4b32f6f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1266,7 +1266,7 @@ github.com/moby/buildkit/worker/label # github.com/moby/docker-image-spec v1.3.1 ## explicit; go 1.18 github.com/moby/docker-image-spec/specs-go/v1 -# github.com/moby/go-archive v0.2.2-0.20260724112411-2ff9bfb8b2ee +# github.com/moby/go-archive v0.2.2-0.20260729101603-a11565d1683c ## explicit; go 1.25 github.com/moby/go-archive github.com/moby/go-archive/chrootarchive