diff options
Diffstat (limited to 'sysutils/podman')
10 files changed, 25 insertions, 121 deletions
diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index ae0280461b06..65c6a1c00031 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 5.3.2 -PORTREVISION= 2 +DISTVERSION= 5.5.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -21,7 +20,7 @@ RUN_DEPENDS= conmon:sysutils/conmon \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail -USES= gmake go:no_targets,1.22 pkgconfig python:build shebangfix +USES= gmake go:no_targets,1.23 pkgconfig python:build shebangfix USE_RC_SUBR= podman podman_service SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index 75743cf73366..48cdbe5f6f89 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738598697 -SHA256 (containers-podman-v5.3.2_GH0.tar.gz) = e7d7abf2d4ecae7217af017a4199d555563721bf6c3ae52e68704ee8268c432b -SIZE (containers-podman-v5.3.2_GH0.tar.gz) = 24207488 +TIMESTAMP = 1750101580 +SHA256 (containers-podman-v5.5.1_GH0.tar.gz) = 00d02f85ad27a46e77456fef1be81865a43147544ed2487e6c4c8decd0e3748f +SIZE (containers-podman-v5.5.1_GH0.tar.gz) = 21338501 diff --git a/sysutils/podman/files/patch-libpod_container__internal__common.go b/sysutils/podman/files/patch-libpod_container__internal__common.go new file mode 100644 index 000000000000..9eeb358bca34 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__internal__common.go @@ -0,0 +1,11 @@ +--- libpod/container_internal_common.go.orig 2025-06-18 16:07:27 UTC ++++ libpod/container_internal_common.go +@@ -192,7 +192,7 @@ func (c *Container) createInitRootfs() error { + } + + c.config.Rootfs = tmpDir +- c.config.RootfsOverlay = true ++ //c.config.RootfsOverlay = true + return nil + } + diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go b/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go deleted file mode 100644 index 5908c595098c..000000000000 --- a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go +++ /dev/null @@ -1,18 +0,0 @@ ---- libpod/runtime_migrate_freebsd.go.orig 2024-10-03 14:39:32 UTC -+++ libpod/runtime_migrate_freebsd.go -@@ -0,0 +1,15 @@ -+//go:build !remote -+ -+package libpod -+ -+import ( -+ "errors" -+) -+ -+func (r *Runtime) stopPauseProcess() error { -+ return nil -+} -+ -+func (r *Runtime) Migrate(newRuntime string) error { -+ return errors.New("not implemented (*Runtime) migrate") -+} diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go b/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go deleted file mode 100644 index 0c38a6d35a56..000000000000 --- a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go +++ /dev/null @@ -1,8 +0,0 @@ ---- libpod/runtime_migrate_unsupported.go.orig 2024-10-03 14:38:54 UTC -+++ libpod/runtime_migrate_unsupported.go -@@ -1,4 +1,4 @@ --//go:build !remote && !linux -+//go:build !remote && !linux && !freebsd - - package libpod - diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go deleted file mode 100644 index efd0b17a0aef..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go +++ /dev/null @@ -1,35 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config.go.orig 2025-01-21 18:41:34 UTC -+++ vendor/github.com/containers/common/pkg/config/config.go -@@ -12,7 +12,6 @@ import ( - - "github.com/containers/common/internal/attributedstring" - "github.com/containers/common/libnetwork/types" -- "github.com/containers/common/pkg/capabilities" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" - units "github.com/docker/go-units" -@@ -963,24 +962,6 @@ func (c *Config) GetDefaultEnvEx(envHost, httpProxy bo - } - } - return append(env, c.Containers.Env.Get()...) --} -- --// Capabilities returns the capabilities parses the Add and Drop capability --// list from the default capabilities for the container --func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -- userNotRoot := func(user string) bool { -- if user == "" || user == "root" || user == "0" { -- return false -- } -- return true -- } -- -- defaultCapabilities := c.Containers.DefaultCapabilities.Get() -- if userNotRoot(user) { -- defaultCapabilities = []string{} -- } -- -- return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) - } - - // Device parses device mapping string to a src, dest & permissions string diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go deleted file mode 100644 index cf91d1d981ef..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go +++ /dev/null @@ -1,33 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config_linux.go.orig 2025-01-21 18:41:34 UTC -+++ vendor/github.com/containers/common/pkg/config/config_linux.go -@@ -1,6 +1,7 @@ import ( - package config - - import ( -+ "github.com/containers/common/pkg/capabilities" - selinux "github.com/opencontainers/selinux/go-selinux" - ) - -@@ -25,4 +26,22 @@ var defaultHelperBinariesDir = []string{ - "/usr/local/lib/podman", - "/usr/libexec/podman", - "/usr/lib/podman", -+} -+ -+// Capabilities returns the capabilities parses the Add and Drop capability -+// list from the default capabilities for the container -+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -+ userNotRoot := func(user string) bool { -+ if user == "" || user == "root" || user == "0" { -+ return false -+ } -+ return true -+ } -+ -+ defaultCapabilities := c.Containers.DefaultCapabilities.Get() -+ if userNotRoot(user) { -+ defaultCapabilities = []string{} -+ } -+ -+ return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) - } diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go b/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go deleted file mode 100644 index 96b618fe65ae..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go +++ /dev/null @@ -1,12 +0,0 @@ ---- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig 2025-01-21 18:41:34 UTC -+++ vendor/github.com/containers/common/pkg/config/config_unsupported.go -@@ -5,3 +5,9 @@ func selinuxEnabled() bool { - func selinuxEnabled() bool { - return false - } -+ -+// Capabilities returns the capabilities parses the Add and Drop capability -+// list from the default capabilities for the container -+func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { -+ return nil, nil -+} diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go deleted file mode 100644 index d17e29d695ee..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/podman/pkg-plist b/sysutils/podman/pkg-plist index 60a484d79067..c7a1db09da81 100644 --- a/sysutils/podman/pkg-plist +++ b/sysutils/podman/pkg-plist @@ -5,6 +5,14 @@ share/bash-completion/completions/podman share/bash-completion/completions/podman-remote share/fish/vendor_completions.d/podman-remote.fish share/fish/vendor_completions.d/podman.fish +share/man/man1/podman-artifact-add.1.gz +share/man/man1/podman-artifact-extract.1.gz +share/man/man1/podman-artifact-inspect.1.gz +share/man/man1/podman-artifact-ls.1.gz +share/man/man1/podman-artifact-pull.1.gz +share/man/man1/podman-artifact-push.1.gz +share/man/man1/podman-artifact-rm.1.gz +share/man/man1/podman-artifact.1.gz share/man/man1/podman-attach.1.gz share/man/man1/podman-auto-update.1.gz share/man/man1/podman-build.1.gz @@ -109,6 +117,7 @@ share/man/man1/podman-load.1.gz share/man/man1/podman-login.1.gz share/man/man1/podman-logout.1.gz share/man/man1/podman-logs.1.gz +share/man/man1/podman-machine-cp.1.gz share/man/man1/podman-machine-info.1.gz share/man/man1/podman-machine-init.1.gz share/man/man1/podman-machine-inspect.1.gz |