diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 2024-12-06 16:54:18 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 2024-12-09 14:25:23 +0000 |
| commit | 588504901fbfb455e47ac5cccfbfe41ee8d1b558 (patch) | |
| tree | d5eb240645bca57780b000e3aca853cae714aea1 | |
| parent | a7e82a1a9a2a20db1416c01c15067c5777f2dc54 (diff) | |
sysutils/skopeo: fix problems with 'skopeo copy' in v1.16.1
This fix is already in the upstream sources since the same problem
affected 'podman save' and 'podman load'.
Reviewed by: osa
Differential Revision: https://reviews.freebsd.org/D47941
3 files changed, 51 insertions, 1 deletions
diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile index 4e24326ce7f0..b683e4020da1 100644 --- a/sysutils/skopeo/Makefile +++ b/sysutils/skopeo/Makefile @@ -1,7 +1,7 @@ PORTNAME= skopeo DISTVERSIONPREFIX= v DISTVERSION= 1.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go new file mode 100644 index 000000000000..9d548d485a79 --- /dev/null +++ b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go @@ -0,0 +1,41 @@ +--- vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go.orig 2024-12-06 15:50:57 UTC ++++ vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go +@@ -0,0 +1,38 @@ ++package fileutils ++ ++import ( ++ "errors" ++ "os" ++ "syscall" ++ ++ "golang.org/x/sys/unix" ++) ++ ++// Exists checks whether a file or directory exists at the given path. ++// If the path is a symlink, the symlink is followed. ++func Exists(path string) error { ++ // It uses unix.Faccessat which is a faster operation compared to os.Stat for ++ // simply checking the existence of a file. ++ err := unix.Faccessat(unix.AT_FDCWD, path, unix.F_OK, 0) ++ if err != nil { ++ return &os.PathError{Op: "faccessat", Path: path, Err: err} ++ } ++ return nil ++} ++ ++// Lexists checks whether a file or directory exists at the given path. ++// If the path is a symlink, the symlink itself is checked. ++func Lexists(path string) error { ++ // FreeBSD before 15.0 does not support the AT_SYMLINK_NOFOLLOW flag for ++ // faccessat. In this case, the call to faccessat will return EINVAL and ++ // we fall back to using Lstat. ++ err := unix.Faccessat(unix.AT_FDCWD, path, unix.F_OK, unix.AT_SYMLINK_NOFOLLOW) ++ if err != nil { ++ if errors.Is(err, syscall.EINVAL) { ++ _, err = os.Lstat(path) ++ return err ++ } ++ return &os.PathError{Op: "faccessat", Path: path, Err: err} ++ } ++ return nil ++} diff --git a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go new file mode 100644 index 000000000000..c5d9c783d732 --- /dev/null +++ b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go @@ -0,0 +1,9 @@ +--- vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go.orig 2024-12-06 15:50:49 UTC ++++ vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go +@@ -1,5 +1,4 @@ +-//go:build !windows +-// +build !windows ++//go:build !windows && !freebsd + + package fileutils + |