git: 43e744c05263 - main - sysutils/skopeo: update to 1.17.0

The branch main has been updated by dfr:

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

commit 43e744c05263b285c2c4ab656ad0f3ae33ee4819
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2025-02-03 16:40:32 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2025-02-18 14:59:10 +0000

    sysutils/skopeo: update to 1.17.0
---
 sysutils/skopeo/Makefile                           |  5 ++-
 sysutils/skopeo/distinfo                           |  6 ++--
 ...ers_storage_pkg_chunked_storage__unsupported.go |  9 +++++
 ...ainers_storage_pkg_fileutils_exists__freebsd.go | 41 ----------------------
 ...ontainers_storage_pkg_fileutils_exists__unix.go |  9 -----
 5 files changed, 14 insertions(+), 56 deletions(-)

diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile
index b683e4020da1..a2de380653bb 100644
--- a/sysutils/skopeo/Makefile
+++ b/sysutils/skopeo/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	skopeo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.16.1
-PORTREVISION=	2
+DISTVERSION=	1.17.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
@@ -17,7 +16,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 LIB_DEPENDS=	libgpgme.so:security/gpgme
 RUN_DEPENDS=	${LOCALBASE}/etc/containers/containers.conf.sample:sysutils/containers-common
 
-USES=		gmake go:modules,no_targets pkgconfig
+USES=		gmake go:modules,no_targets,1.22 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	containers
 
diff --git a/sysutils/skopeo/distinfo b/sysutils/skopeo/distinfo
index 1216be93bfe1..9d4508ce79a5 100644
--- a/sysutils/skopeo/distinfo
+++ b/sysutils/skopeo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733327536
-SHA256 (containers-skopeo-v1.16.1_GH0.tar.gz) = 9402e71f3fba979d0c0509240b963847bfeda2eac60be83eb5a628fd67d098e6
-SIZE (containers-skopeo-v1.16.1_GH0.tar.gz) = 10532961
+TIMESTAMP = 1738598110
+SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69
+SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765
diff --git a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
new file mode 100644
index 000000000000..d17e29d695ee
--- /dev/null
+++ b/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
@@ -0,0 +1,9 @@
+--- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig	2025-02-04 11:32:21 UTC
++++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go
+@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor
+ 
+ // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer.
+ func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) {
+-	return nil, errors.New("format not supported on this system")
++	return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system"))
+ }
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
deleted file mode 100644
index 9d548d485a79..000000000000
--- a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
deleted file mode 100644
index c5d9c783d732..000000000000
--- a/sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
-