From nobody Mon Dec 9 14:25:43 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6PKh0bbrz5gMTH; Mon, 09 Dec 2024 14:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6PKg6ycSz4FTn; Mon, 9 Dec 2024 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733754344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WJkoUl1n+/dGL6vx5dbeD/VU34q/OsOaCeV08ASiGk4=; b=h1CVJ2NBhVVu57IDr5/o+gwyOSon7FQVRwBKy0pr2UAmigj+K9Xe8mwQBZU16QGf9b145Z 53BzDMDvs7hT9hlM2fQ2kWg2DG4ovX5Lsm1CAsBbBTsw5FDX74kI+2dxdFZmEVdb9JxErz Ga+2yCR/rYHvMGgxcet9Iy6y+o3Y7d65fgbiMfZkrZZcbjHymjt1SLGBXmL28jYJ7ROqeQ SmxKvTmZvsXXrvuK7UgDv01/mkW8lVL+uBJky/s6RPco0pAFhdSIv6U6+a9RDxO257YW8o Iq6cIC5LDuA2R6QKuZsW/79G8EGEWBTC9Msf1Yk2gpnir2QvIA+Tm0AZfAqucA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733754344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WJkoUl1n+/dGL6vx5dbeD/VU34q/OsOaCeV08ASiGk4=; b=nubRF+Vt8LFF7XsLJ2Yjejb4olhP5JDtkx4b/qdqevEPCyh0VW/MjCtaCVC6WEOq+Q4JqQ bcYCAEiyvaF4/o2xYEb/TRJF7sH3UspV02iGZ69nddJZG7fMITys+kRLH6Etk98rE/4KO6 ybk2A3VWgykmdSNwjBJtWwrdhjDp9QarPAazVS+OktGPquvPwQeXNBlbc6V2xtmefWeMg5 st5nutvDv8y50lJDZzI+qcZqQXTb7hbQUujIoK/0BLunn8xo6qrFpipf8uJG8C8KhCLTzW /bhBHxFPql1AZ1zbcSHH8EhCmpZLvzkixhsePEdEf+imtSmbOAXcKFu0+ql0oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733754344; a=rsa-sha256; cv=none; b=UoV1j/l83v2C5TejGpdHK1bJOtlhXyVY94vrrbMbUkWPAeXnAJnOeHKEsnUo9Uay+p2HzD Gl1YJsOzNQoBW1jvBEeCdKzGofoNFwSGzu3QDPCK1zD3k3mZlkloIqSwZAyK0jzQCc9Vmb JtG81D/vHWTtyMk90/BxRd36F82BW5IG0xtU5khen8rx1lYxVhLh+KvGxl1z+fBJzNiG6B V60XERqqmF20nYr89+qdhxmN0hfDkQBnIOPmiSoeowAScDBsj9zmlp0vbpwYRcPl8DbKKs r/ct9ta58nDXRThaEwbwFvZSdwaltrWlmtHnZDVnQuc53d4jO5dU+ZnQbpiL6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6PKg6Qwbzh2b; Mon, 9 Dec 2024 14:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B9EPhuk013580; Mon, 9 Dec 2024 14:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9EPhqF013577; Mon, 9 Dec 2024 14:25:43 GMT (envelope-from git) Date: Mon, 9 Dec 2024 14:25:43 GMT Message-Id: <202412091425.4B9EPhqF013577@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Doug Rabson Subject: git: 588504901fbf - main - sysutils/skopeo: fix problems with 'skopeo copy' in v1.16.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 588504901fbfb455e47ac5cccfbfe41ee8d1b558 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=588504901fbfb455e47ac5cccfbfe41ee8d1b558 commit 588504901fbfb455e47ac5cccfbfe41ee8d1b558 Author: Doug Rabson AuthorDate: 2024-12-06 16:54:18 +0000 Commit: Doug Rabson CommitDate: 2024-12-09 14:25:23 +0000 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 --- sysutils/skopeo/Makefile | 2 +- ...ainers_storage_pkg_fileutils_exists__freebsd.go | 41 ++++++++++++++++++++++ ...ontainers_storage_pkg_fileutils_exists__unix.go | 9 +++++ 3 files changed, 51 insertions(+), 1 deletion(-) 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 +