git: a84498685c21 - main - sysutils/podman: fix support for 'podman image load' and 'podman image save'

The branch main has been updated by dfr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a84498685c217bd53ae7dd354e10fb1e1a558ca3

commit a84498685c217bd53ae7dd354e10fb1e1a558ca3
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2024-08-23 13:15:29 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2024-08-23 14:20:12 +0000

    sysutils/podman: fix support for 'podman image load' and 'podman image save'
    
    The code assumed that the faccessat syscall supports AT_SYMLINK_NOFOLLOW
    which is not the case in FreeBSD before 15.0.
---
 sysutils/podman/Makefile                           |  2 +-
 ...ainers_storage_pkg_fileutils_exists__freebsd.go | 41 ++++++++++++++++++++++
 ...ontainers_storage_pkg_fileutils_exists__unix.go | 10 ++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index 65008f4cac74..22743dcddeab 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	podman
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go b/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go
new file mode 100644
index 000000000000..1334657fa9ed
--- /dev/null
+++ b/sysutils/podman/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-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
++}
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go b/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go
new file mode 100644
index 000000000000..0778a2749c65
--- /dev/null
+++ b/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go
@@ -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
+