mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

sysutils/podman: fix support for 'podman image load' and 'podman image save'

Browse Source 
The code assumed that the faccessat syscall supports AT_SYMLINK_NOFOLLOW
which is not the case in FreeBSD before 15.0.
This commit is contained in:
Doug Rabson 2024-08-23 14:15:29 +01:00
parent 17257d707a
commit a84498685c
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/podman/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= podman PORTNAME= podman
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 5.1.1 DISTVERSION= 5.1.1
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= sysutils CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org MAINTAINER= dfr@FreeBSD.org

41
sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go Normal file
View File

@ -0,0 +1,41 @@
--- vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go.orig 2024-08-23 10:19:26 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
+}

10
sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go Normal file
View File

@ -0,0 +1,10 @@
--- vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go.orig 2024-08-23 10:19:17 UTC
+++ vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go
@@ -1,5 +1,5 @@
-//go:build !windows
-// +build !windows
+//go:build !windows && !freebsd
+// +build !windows,!freebsd
package fileutils