From 72fba13ec04bd2eaea95e1034d7e89c9535f8699 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Thu, 16 Jul 2026 17:40:37 -0700
Subject: [PATCH] vendor: update fsutil to 6d9dc2ebad62

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 go.mod                                         |  2 +-
 go.sum                                         |  4 ++--
 .../tonistiigi/fsutil/chtimes_linux.go         |  1 -
 .../tonistiigi/fsutil/chtimes_nolinux.go       |  1 -
 .../tonistiigi/fsutil/copy/copy_darwin.go      |  1 -
 .../tonistiigi/fsutil/copy/copy_freebsd.go     |  1 -
 .../tonistiigi/fsutil/copy/copy_linux.go       |  6 +++++-
 .../tonistiigi/fsutil/copy/copy_nowindows.go   |  1 -
 .../tonistiigi/fsutil/copy/copy_otherbsd.go    |  1 -
 .../tonistiigi/fsutil/copy/copy_unix.go        |  7 +++++--
 .../tonistiigi/fsutil/copy/hardlink_unix.go    |  1 -
 .../tonistiigi/fsutil/copy/mkdir_unix.go       |  1 -
 .../tonistiigi/fsutil/copy/mkdir_windows.go    |  1 -
 .../tonistiigi/fsutil/copy/stat_bsd.go         |  1 -
 .../tonistiigi/fsutil/copy/stat_openbsd.go     | 18 ------------------
 .../tonistiigi/fsutil/copy/stat_sysv.go        |  3 +--
 .../tonistiigi/fsutil/diskwriter_freebsd.go    |  1 -
 .../tonistiigi/fsutil/diskwriter_unix.go       |  1 -
 .../tonistiigi/fsutil/diskwriter_unixnobsd.go  |  1 -
 .../tonistiigi/fsutil/diskwriter_windows.go    |  1 -
 .../tonistiigi/fsutil/docker-bake.hcl          |  3 +++
 .../tonistiigi/fsutil/followlinks_unix.go      |  1 -
 .../github.com/tonistiigi/fsutil/stat_unix.go  |  1 -
 .../tonistiigi/fsutil/stat_windows.go          |  1 -
 .../github.com/tonistiigi/fsutil/validator.go  |  2 +-
 vendor/modules.txt                             |  2 +-
 26 files changed, 19 insertions(+), 45 deletions(-)
 delete mode 100644 vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go

diff --git a/go.mod b/go.mod
index 0ae963e26..4a378c60b 100644
--- a/go.mod
+++ b/go.mod
@@ -78,7 +78,7 @@ require (
 	github.com/spdx/tools-golang v0.5.7
 	github.com/stretchr/testify v1.11.1
 	github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323
-	github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4
+	github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62
 	github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2
 	github.com/tonistiigi/go-archvariant v1.0.0
 	github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0
diff --git a/go.sum b/go.sum
index 8fe210789..9b1e308d8 100644
--- a/go.sum
+++ b/go.sum
@@ -584,8 +584,8 @@ github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C
 github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
 github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 h1:r0p7fK56l8WPequOaR3i9LBqfPtEdXIQbUTzT55iqT4=
 github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY=
-github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4 h1:tJkv/edHw9FXVtbHxc6cpqDttiCLNzhqI1W40fcnxIY=
-github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4/go.mod h1:K5zrLch9UaSGNiek5XHZeqZUf1zPWJHqDfLIcnpquQ4=
+github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62 h1:uppBiK+tE8tYG6fc0N8VnsC7FMZcWxnXIyaQ9GcUIU8=
+github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62/go.mod h1:K5zrLch9UaSGNiek5XHZeqZUf1zPWJHqDfLIcnpquQ4=
 github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2 h1:5p6hffZeB25G4rhBc3HU6x1aIlyDELfib+/Omq+ZfQA=
 github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=
 github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=
diff --git a/vendor/github.com/tonistiigi/fsutil/chtimes_linux.go b/vendor/github.com/tonistiigi/fsutil/chtimes_linux.go
index dd65a49ad..3de3a9d59 100644
--- a/vendor/github.com/tonistiigi/fsutil/chtimes_linux.go
+++ b/vendor/github.com/tonistiigi/fsutil/chtimes_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go b/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
index 08251ec22..43bfb219b 100644
--- a/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
+++ b/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/copy_darwin.go b/vendor/github.com/tonistiigi/fsutil/copy/copy_darwin.go
index 0cdc00a82..5165ec8f2 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/copy_darwin.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/copy_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/copy_freebsd.go b/vendor/github.com/tonistiigi/fsutil/copy/copy_freebsd.go
index 1b9dbb3d0..9430871d7 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/copy_freebsd.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/copy_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/copy_linux.go b/vendor/github.com/tonistiigi/fsutil/copy/copy_linux.go
index 3df11d6a3..6d16e8298 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/copy_linux.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/copy_linux.go
@@ -62,7 +62,11 @@ func (c *copier) copyFileTimestamp(fi os.FileInfo, name string) error {
 	}
 
 	st := fi.Sys().(*syscall.Stat_t)
-	timespec := []unix.Timespec{unix.Timespec(StatAtime(st)), unix.Timespec(StatMtime(st))}
+	atime, mtime := StatAtime(st), StatMtime(st)
+	timespec := []unix.Timespec{
+		{Sec: atime.Sec, Nsec: atime.Nsec},
+		{Sec: mtime.Sec, Nsec: mtime.Nsec},
+	}
 	if err := unix.UtimesNanoAt(unix.AT_FDCWD, name, timespec, unix.AT_SYMLINK_NOFOLLOW); err != nil {
 		return errors.Wrapf(err, "failed to utime %s", name)
 	}
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/copy_nowindows.go b/vendor/github.com/tonistiigi/fsutil/copy/copy_nowindows.go
index 382fe201c..a7a723a04 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/copy_nowindows.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/copy_nowindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/copy_otherbsd.go b/vendor/github.com/tonistiigi/fsutil/copy/copy_otherbsd.go
index 8e71292b8..39492eaa8 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/copy_otherbsd.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/copy_otherbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd || netbsd
-// +build openbsd netbsd
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go b/vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go
index 5407c16e4..c822db9f5 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/copy_unix.go
@@ -1,5 +1,4 @@
 //go:build solaris || darwin || freebsd || openbsd || netbsd
-// +build solaris darwin freebsd openbsd netbsd
 
 package fs
 
@@ -62,7 +61,11 @@ func (c *copier) copyFileTimestamp(fi os.FileInfo, name string) error {
 	}
 
 	st := fi.Sys().(*syscall.Stat_t)
-	timespec := []unix.Timespec{unix.Timespec(StatAtime(st)), unix.Timespec(StatMtime(st))}
+	atime, mtime := StatAtime(st), StatMtime(st)
+	timespec := []unix.Timespec{
+		{Sec: atime.Sec, Nsec: atime.Nsec},
+		{Sec: mtime.Sec, Nsec: mtime.Nsec},
+	}
 	if err := unix.UtimesNanoAt(unix.AT_FDCWD, name, timespec, unix.AT_SYMLINK_NOFOLLOW); err != nil {
 		return errors.Wrapf(err, "failed to utime %s", name)
 	}
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/hardlink_unix.go b/vendor/github.com/tonistiigi/fsutil/copy/hardlink_unix.go
index a02c5a585..176e51820 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/hardlink_unix.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/hardlink_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/mkdir_unix.go b/vendor/github.com/tonistiigi/fsutil/copy/mkdir_unix.go
index 8bc5711bf..50f34d3df 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/mkdir_unix.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/mkdir_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/mkdir_windows.go b/vendor/github.com/tonistiigi/fsutil/copy/mkdir_windows.go
index d8dddae93..9daf8d8c3 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/mkdir_windows.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/mkdir_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go b/vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go
index 37b0840c9..e4d389ceb 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/stat_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || netbsd
-// +build darwin freebsd netbsd
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go b/vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go
deleted file mode 100644
index c87d789cd..000000000
--- a/vendor/github.com/tonistiigi/fsutil/copy/stat_openbsd.go
+++ /dev/null
@@ -1,18 +0,0 @@
-//go:build openbsd
-// +build openbsd
-
-package fs
-
-import (
-	"syscall"
-)
-
-// Returns the last-accessed time
-func StatAtime(st *syscall.Stat_t) syscall.Timespec {
-	return st.Atim
-}
-
-// Returns the last-modified time
-func StatMtime(st *syscall.Stat_t) syscall.Timespec {
-	return st.Mtim
-}
diff --git a/vendor/github.com/tonistiigi/fsutil/copy/stat_sysv.go b/vendor/github.com/tonistiigi/fsutil/copy/stat_sysv.go
index 31ea3d941..50d69c67a 100644
--- a/vendor/github.com/tonistiigi/fsutil/copy/stat_sysv.go
+++ b/vendor/github.com/tonistiigi/fsutil/copy/stat_sysv.go
@@ -1,5 +1,4 @@
-//go:build dragonfly || linux || solaris
-// +build dragonfly linux solaris
+//go:build dragonfly || linux || openbsd || solaris
 
 package fs
 
diff --git a/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go b/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go
index ed6356fab..ad5564928 100644
--- a/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go
+++ b/vendor/github.com/tonistiigi/fsutil/diskwriter_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go b/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
index ccd554ab8..18d736fa7 100644
--- a/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
+++ b/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/diskwriter_unixnobsd.go b/vendor/github.com/tonistiigi/fsutil/diskwriter_unixnobsd.go
index 927dba460..6c8a44880 100644
--- a/vendor/github.com/tonistiigi/fsutil/diskwriter_unixnobsd.go
+++ b/vendor/github.com/tonistiigi/fsutil/diskwriter_unixnobsd.go
@@ -1,5 +1,4 @@
 //go:build !windows && !freebsd
-// +build !windows,!freebsd
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/diskwriter_windows.go b/vendor/github.com/tonistiigi/fsutil/diskwriter_windows.go
index d278add87..0652ce861 100644
--- a/vendor/github.com/tonistiigi/fsutil/diskwriter_windows.go
+++ b/vendor/github.com/tonistiigi/fsutil/diskwriter_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl b/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl
index 8e7c05d71..4cf487c2c 100644
--- a/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl
+++ b/vendor/github.com/tonistiigi/fsutil/docker-bake.hcl
@@ -15,6 +15,7 @@ target "_platforms" {
     "darwin/amd64",
     "darwin/arm64",
     "freebsd/amd64",
+    "freebsd/arm",
     "freebsd/arm64",
     "linux/386",
     "linux/amd64",
@@ -23,8 +24,10 @@ target "_platforms" {
     "linux/ppc64le",
     "linux/s390x",
     "netbsd/amd64",
+    "netbsd/arm",
     "netbsd/arm64",
     "openbsd/amd64",
+    "openbsd/arm",
     "openbsd/arm64",
     "windows/amd64",
     "windows/arm64"
diff --git a/vendor/github.com/tonistiigi/fsutil/followlinks_unix.go b/vendor/github.com/tonistiigi/fsutil/followlinks_unix.go
index 41ae5e42a..ee7a498b5 100644
--- a/vendor/github.com/tonistiigi/fsutil/followlinks_unix.go
+++ b/vendor/github.com/tonistiigi/fsutil/followlinks_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/stat_unix.go b/vendor/github.com/tonistiigi/fsutil/stat_unix.go
index 8676f1a4e..486a9cc03 100644
--- a/vendor/github.com/tonistiigi/fsutil/stat_unix.go
+++ b/vendor/github.com/tonistiigi/fsutil/stat_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/stat_windows.go b/vendor/github.com/tonistiigi/fsutil/stat_windows.go
index f78016f59..387451320 100644
--- a/vendor/github.com/tonistiigi/fsutil/stat_windows.go
+++ b/vendor/github.com/tonistiigi/fsutil/stat_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package fsutil
 
diff --git a/vendor/github.com/tonistiigi/fsutil/validator.go b/vendor/github.com/tonistiigi/fsutil/validator.go
index 44d80cdf0..773ffcdb7 100644
--- a/vendor/github.com/tonistiigi/fsutil/validator.go
+++ b/vendor/github.com/tonistiigi/fsutil/validator.go
@@ -38,7 +38,7 @@ func (v *Validator) HandleChange(kind ChangeKind, p string, fi os.FileInfo, err
 	if dir == "." {
 		dir = ""
 	}
-	if dir == ".." || strings.HasPrefix(p, filepath.FromSlash("../")) {
+	if p == ".." || dir == ".." || strings.HasPrefix(p, filepath.FromSlash("../")) {
 		return errors.WithStack(&os.PathError{Path: p, Err: syscall.EINVAL, Op: "escape check"})
 	}
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index e937b202a..613c965e8 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1038,7 +1038,7 @@ github.com/theupdateframework/go-tuf/v2/metadata/updater
 # github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323
 ## explicit; go 1.21
 github.com/tonistiigi/dchapes-mode
-# github.com/tonistiigi/fsutil v0.0.0-20260609091201-0257b3308df4
+# github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62
 ## explicit; go 1.25.0
 github.com/tonistiigi/fsutil
 github.com/tonistiigi/fsutil/copy