Index: sysutils/podman/Makefile =================================================================== --- sysutils/podman/Makefile +++ sysutils/podman/Makefile @@ -1,7 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 5.2.5 -PORTREVISION= 2 +DISTVERSION= 5.3.2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -21,7 +20,7 @@ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail -USES= gmake go:no_targets pkgconfig python:build shebangfix +USES= gmake go:no_targets,1.22 pkgconfig python:build shebangfix USE_RC_SUBR= podman podman_service SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess Index: sysutils/podman/distinfo =================================================================== --- sysutils/podman/distinfo +++ sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733223741 -SHA256 (containers-podman-v5.2.5_GH0.tar.gz) = 18bbf2c26534229c030590d65da88154bed31f0207041d30fed5f508b933a66c -SIZE (containers-podman-v5.2.5_GH0.tar.gz) = 23834863 +TIMESTAMP = 1738598697 +SHA256 (containers-podman-v5.3.2_GH0.tar.gz) = e7d7abf2d4ecae7217af017a4199d555563721bf6c3ae52e68704ee8268c432b +SIZE (containers-podman-v5.3.2_GH0.tar.gz) = 24207488 Index: sysutils/podman/files/patch-libpod_container__inspect__freebsd.go =================================================================== --- sysutils/podman/files/patch-libpod_container__inspect__freebsd.go +++ sysutils/podman/files/patch-libpod_container__inspect__freebsd.go @@ -1,6 +1,6 @@ ---- libpod/container_inspect_freebsd.go.orig 2024-06-04 19:54:07 UTC +--- libpod/container_inspect_freebsd.go.orig 2025-01-21 18:41:34 UTC +++ libpod/container_inspect_freebsd.go -@@ -15,5 +15,14 @@ func (c *Container) platformInspectContainerHostConfig +@@ -15,10 +15,18 @@ func (c *Container) platformInspectContainerHostConfig // UTS namespace mode hostConfig.UTSMode = c.NamespaceMode(spec.UTSNamespace, ctrSpec) @@ -13,5 +13,10 @@ + return err + } + - return nil - } + // Devices + // Do not include if privileged - assumed that all devices will be + // included. +- var err error + hostConfig.Devices, err = c.GetDevices(hostConfig.Privileged, *ctrSpec, map[string]string{}) + if err != nil { + return err Index: sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__freebsd.go =================================================================== --- sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__freebsd.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/github.com/containers/buildah/run_freebsd.go.orig 2024-08-20 09:45:15 UTC -+++ vendor/github.com/containers/buildah/run_freebsd.go -@@ -244,7 +244,7 @@ func (b *Builder) Run(command []string, options RunOpt - // Only add entries here if we do not have to do setup network, - // if we do we have to do it much later after the network setup. - if !configureNetwork { -- err = b.addResolvConfEntries(resolvFile, nil, nil, false, true) -+ err = b.addResolvConfEntries(resolvFile, nil, spec, false, true) - if err != nil { - return err - } Index: sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go =================================================================== --- /dev/null +++ sysutils/podman/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")) + } Index: sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__freebsd.go =================================================================== --- sysutils/podman/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-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 -+} Index: sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go =================================================================== --- sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_fileutils_exists__unix.go +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - Index: sysutils/podman/pkg-message =================================================================== --- sysutils/podman/pkg-message +++ sysutils/podman/pkg-message @@ -5,7 +5,7 @@ The FreeBSD port of the Podman container engine is experimental and should be used for evaluation and testing purposes only. -$ sudo podman run --rm docker.io/dougrabson/hello +$ sudo podman run --rm quay.io/dougrabson/hello Podman can restart containers after a host is rebooted. To enable this, use: Index: sysutils/podman/pkg-plist =================================================================== --- sysutils/podman/pkg-plist +++ sysutils/podman/pkg-plist @@ -226,6 +226,8 @@ share/man/man1/podmansh.1.gz share/man/man5/podman-systemd.unit.5.gz share/man/man5/quadlet.5.gz +share/man/man7/podman-rootless.7.gz +share/man/man7/podman-troubleshooting.7.gz share/zsh/site-functions/_podman share/zsh/site-functions/_podman-remote @dir libexec/podman