diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index b6e1e314eed6..0377fd95331f 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,44 +1,43 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 5.1.1 -PORTREVISION= 7 +DISTVERSION= 5.2.5 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org COMMENT= Manage Pods, Containers and Container Images WWW= https://podman.io/ LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash \ go-md2man:textproc/go-md2man \ gsed:textproc/gsed LIB_DEPENDS= libgpgme.so:security/gpgme RUN_DEPENDS= conmon:sysutils/conmon \ containernetworking-plugins>=0:net/containernetworking-plugins \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail USES= gmake go:no_targets pkgconfig python:build shebangfix USE_RC_SUBR= podman podman_service SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess MAKE_ARGS= SHELL=${LOCALBASE}/bin/bash # Parallel builds are flaky due to some kind of file race in the # markdown-preprocess phase of the docs build. MAKE_JOBS_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= containers GH_PROJECT= podman INSTALL_TARGET= install install.completions # Temporary until https://github.com/containers/podman/pull/16422 lands do-install: ${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install ${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install.completions ${RM} ${STAGEDIR}${PREFIX}/lib/tmpfiles.d/podman.conf .include diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index c3e793311228..dacdb9d58acc 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717584025 -SHA256 (containers-podman-v5.1.1_GH0.tar.gz) = ba1022c467dbc3e551e4d391dc6a5c03f33040a0764304b334afd7c6217c4894 -SIZE (containers-podman-v5.1.1_GH0.tar.gz) = 23794366 +TIMESTAMP = 1733223741 +SHA256 (containers-podman-v5.2.5_GH0.tar.gz) = 18bbf2c26534229c030590d65da88154bed31f0207041d30fed5f508b933a66c +SIZE (containers-podman-v5.2.5_GH0.tar.gz) = 23834863 diff --git a/sysutils/podman/files/patch-libpod_kube.go b/sysutils/podman/files/patch-libpod_kube.go deleted file mode 100644 index 64ae53b72347..000000000000 --- a/sysutils/podman/files/patch-libpod_kube.go +++ /dev/null @@ -1,11 +0,0 @@ ---- libpod/kube.go.orig 2024-06-05 10:44:10 UTC -+++ libpod/kube.go -@@ -1308,7 +1308,7 @@ func generateKubeSecurityContext(c *Container) (*v1.Se - scHasData = true - sc.ReadOnlyRootFilesystem = &ro - } -- if c.config.Spec.Linux.MaskedPaths == nil { -+ if c.config.Spec.Linux != nil && c.config.Spec.Linux.MaskedPaths == nil { - scHasData = true - unmask := v1.UnmaskedProcMount - sc.ProcMount = &unmask diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go b/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go deleted file mode 100644 index 869f92f72b7e..000000000000 --- a/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go +++ /dev/null @@ -1,30 +0,0 @@ ---- vendor/github.com/containers/buildah/run_common.go.orig 2024-08-20 09:45:05 UTC -+++ vendor/github.com/containers/buildah/run_common.go -@@ -83,12 +83,17 @@ func (b *Builder) addResolvConfEntries(file string, ne - - // addResolvConf copies files from host and sets them up to bind mount into container - func (b *Builder) addResolvConfEntries(file string, networkNameServer []string, -- namespaces []specs.LinuxNamespace, keepHostServers, ipv6 bool) error { -+ spec *specs.Spec, keepHostServers, ipv6 bool) error { - defaultConfig, err := config.Default() - if err != nil { - return fmt.Errorf("failed to get config: %w", err) - } - -+ var namespaces []specs.LinuxNamespace -+ if spec.Linux != nil { -+ namespaces = spec.Linux.Namespaces -+ } -+ - dnsServers, dnsSearch, dnsOptions := b.CommonBuildOpts.DNSServers, b.CommonBuildOpts.DNSSearch, b.CommonBuildOpts.DNSOptions - nameservers := make([]string, 0, len(defaultConfig.Containers.DNSServers.Get())+len(dnsServers)) - nameservers = append(nameservers, defaultConfig.Containers.DNSServers.Get()...) -@@ -1253,7 +1258,7 @@ func (b *Builder) runUsingRuntimeSubproc(isolation def - } - - if resolvFile != "" { -- err = b.addResolvConfEntries(resolvFile, netResult.dnsServers, spec.Linux.Namespaces, netResult.keepHostResolvers, netResult.ipv6) -+ err = b.addResolvConfEntries(resolvFile, netResult.dnsServers, spec, netResult.keepHostResolvers, netResult.ipv6) - if err != nil { - return err - } diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist index bfe3ee194bcc..892b3c724663 100644 --- a/sysutils/podman/pkg-plist +++ b/sysutils/podman/pkg-plist @@ -1,230 +1,231 @@ bin/podman -bin/podmansh bin/podman-remote -@dir libexec/podman +bin/podmansh 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-attach.1.gz share/man/man1/podman-auto-update.1.gz share/man/man1/podman-build.1.gz share/man/man1/podman-commit.1.gz share/man/man1/podman-completion.1.gz share/man/man1/podman-compose.1.gz share/man/man1/podman-container-attach.1.gz share/man/man1/podman-container-checkpoint.1.gz share/man/man1/podman-container-cleanup.1.gz share/man/man1/podman-container-clone.1.gz share/man/man1/podman-container-commit.1.gz share/man/man1/podman-container-cp.1.gz share/man/man1/podman-container-create.1.gz share/man/man1/podman-container-diff.1.gz share/man/man1/podman-container-exec.1.gz share/man/man1/podman-container-exists.1.gz share/man/man1/podman-container-export.1.gz share/man/man1/podman-container-init.1.gz share/man/man1/podman-container-inspect.1.gz share/man/man1/podman-container-kill.1.gz share/man/man1/podman-container-list.1.gz share/man/man1/podman-container-logs.1.gz share/man/man1/podman-container-ls.1.gz share/man/man1/podman-container-mount.1.gz share/man/man1/podman-container-pause.1.gz share/man/man1/podman-container-port.1.gz share/man/man1/podman-container-prune.1.gz share/man/man1/podman-container-ps.1.gz share/man/man1/podman-container-rename.1.gz share/man/man1/podman-container-restart.1.gz share/man/man1/podman-container-restore.1.gz share/man/man1/podman-container-rm.1.gz share/man/man1/podman-container-run.1.gz share/man/man1/podman-container-runlabel.1.gz share/man/man1/podman-container-start.1.gz share/man/man1/podman-container-stats.1.gz share/man/man1/podman-container-stop.1.gz share/man/man1/podman-container-top.1.gz share/man/man1/podman-container-umount.1.gz share/man/man1/podman-container-unmount.1.gz share/man/man1/podman-container-unpause.1.gz share/man/man1/podman-container-update.1.gz share/man/man1/podman-container-wait.1.gz share/man/man1/podman-container.1.gz share/man/man1/podman-cp.1.gz share/man/man1/podman-create.1.gz share/man/man1/podman-diff.1.gz share/man/man1/podman-events.1.gz share/man/man1/podman-exec.1.gz share/man/man1/podman-export.1.gz share/man/man1/podman-farm-build.1.gz share/man/man1/podman-farm-create.1.gz share/man/man1/podman-farm-list.1.gz share/man/man1/podman-farm-remove.1.gz share/man/man1/podman-farm-update.1.gz share/man/man1/podman-farm.1.gz share/man/man1/podman-generate-kube.1.gz share/man/man1/podman-generate-spec.1.gz share/man/man1/podman-generate-systemd.1.gz share/man/man1/podman-generate.1.gz share/man/man1/podman-healthcheck-run.1.gz share/man/man1/podman-healthcheck.1.gz share/man/man1/podman-help.1.gz share/man/man1/podman-history.1.gz share/man/man1/podman-image-build.1.gz share/man/man1/podman-image-diff.1.gz share/man/man1/podman-image-exists.1.gz share/man/man1/podman-image-history.1.gz share/man/man1/podman-image-import.1.gz share/man/man1/podman-image-inspect.1.gz share/man/man1/podman-image-list.1.gz share/man/man1/podman-image-load.1.gz share/man/man1/podman-image-ls.1.gz share/man/man1/podman-image-mount.1.gz share/man/man1/podman-image-prune.1.gz share/man/man1/podman-image-pull.1.gz share/man/man1/podman-image-push.1.gz share/man/man1/podman-image-rm.1.gz share/man/man1/podman-image-save.1.gz share/man/man1/podman-image-scp.1.gz share/man/man1/podman-image-search.1.gz share/man/man1/podman-image-sign.1.gz share/man/man1/podman-image-tag.1.gz share/man/man1/podman-image-tree.1.gz share/man/man1/podman-image-trust.1.gz share/man/man1/podman-image-umount.1.gz share/man/man1/podman-image-unmount.1.gz share/man/man1/podman-image-untag.1.gz share/man/man1/podman-image.1.gz share/man/man1/podman-images.1.gz share/man/man1/podman-import.1.gz share/man/man1/podman-info.1.gz share/man/man1/podman-init.1.gz share/man/man1/podman-inspect.1.gz share/man/man1/podman-kill.1.gz share/man/man1/podman-kube-apply.1.gz share/man/man1/podman-kube-down.1.gz share/man/man1/podman-kube-generate.1.gz share/man/man1/podman-kube-play.1.gz share/man/man1/podman-kube.1.gz 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-info.1.gz share/man/man1/podman-machine-init.1.gz share/man/man1/podman-machine-inspect.1.gz share/man/man1/podman-machine-list.1.gz share/man/man1/podman-machine-ls.1.gz share/man/man1/podman-machine-os-apply.1.gz share/man/man1/podman-machine-os.1.gz share/man/man1/podman-machine-reset.1.gz share/man/man1/podman-machine-rm.1.gz share/man/man1/podman-machine-set.1.gz share/man/man1/podman-machine-ssh.1.gz share/man/man1/podman-machine-start.1.gz share/man/man1/podman-machine-stop.1.gz share/man/man1/podman-machine.1.gz share/man/man1/podman-manifest-add.1.gz share/man/man1/podman-manifest-annotate.1.gz share/man/man1/podman-manifest-create.1.gz share/man/man1/podman-manifest-exists.1.gz share/man/man1/podman-manifest-inspect.1.gz share/man/man1/podman-manifest-push.1.gz share/man/man1/podman-manifest-remove.1.gz share/man/man1/podman-manifest-rm.1.gz share/man/man1/podman-manifest.1.gz share/man/man1/podman-mount.1.gz share/man/man1/podman-network-connect.1.gz share/man/man1/podman-network-create.1.gz share/man/man1/podman-network-disconnect.1.gz share/man/man1/podman-network-exists.1.gz share/man/man1/podman-network-inspect.1.gz share/man/man1/podman-network-ls.1.gz share/man/man1/podman-network-prune.1.gz share/man/man1/podman-network-reload.1.gz share/man/man1/podman-network-rm.1.gz share/man/man1/podman-network-update.1.gz share/man/man1/podman-network.1.gz share/man/man1/podman-pause.1.gz share/man/man1/podman-play-kube.1.gz share/man/man1/podman-pod-clone.1.gz share/man/man1/podman-pod-create.1.gz share/man/man1/podman-pod-exists.1.gz share/man/man1/podman-pod-inspect.1.gz share/man/man1/podman-pod-kill.1.gz share/man/man1/podman-pod-logs.1.gz share/man/man1/podman-pod-pause.1.gz share/man/man1/podman-pod-prune.1.gz share/man/man1/podman-pod-ps.1.gz share/man/man1/podman-pod-restart.1.gz share/man/man1/podman-pod-rm.1.gz share/man/man1/podman-pod-start.1.gz share/man/man1/podman-pod-stats.1.gz share/man/man1/podman-pod-stop.1.gz share/man/man1/podman-pod-top.1.gz share/man/man1/podman-pod-unpause.1.gz share/man/man1/podman-pod.1.gz share/man/man1/podman-port.1.gz share/man/man1/podman-ps.1.gz share/man/man1/podman-pull.1.gz share/man/man1/podman-push.1.gz share/man/man1/podman-remote.1.gz share/man/man1/podman-rename.1.gz share/man/man1/podman-restart.1.gz share/man/man1/podman-rm.1.gz share/man/man1/podman-rmi.1.gz share/man/man1/podman-run.1.gz share/man/man1/podman-save.1.gz share/man/man1/podman-search.1.gz share/man/man1/podman-secret-create.1.gz share/man/man1/podman-secret-exists.1.gz share/man/man1/podman-secret-inspect.1.gz share/man/man1/podman-secret-ls.1.gz share/man/man1/podman-secret-rm.1.gz share/man/man1/podman-secret.1.gz share/man/man1/podman-start.1.gz share/man/man1/podman-stats.1.gz share/man/man1/podman-stop.1.gz +share/man/man1/podman-system-check.1.gz share/man/man1/podman-system-connection-add.1.gz share/man/man1/podman-system-connection-default.1.gz share/man/man1/podman-system-connection-list.1.gz share/man/man1/podman-system-connection-remove.1.gz share/man/man1/podman-system-connection-rename.1.gz share/man/man1/podman-system-connection.1.gz -share/man/man1/podman-system-events.1.gz share/man/man1/podman-system-df.1.gz +share/man/man1/podman-system-events.1.gz share/man/man1/podman-system-info.1.gz share/man/man1/podman-system-migrate.1.gz share/man/man1/podman-system-prune.1.gz share/man/man1/podman-system-renumber.1.gz share/man/man1/podman-system-reset.1.gz share/man/man1/podman-system-service.1.gz share/man/man1/podman-system.1.gz share/man/man1/podman-tag.1.gz share/man/man1/podman-top.1.gz share/man/man1/podman-umount.1.gz share/man/man1/podman-unmount.1.gz share/man/man1/podman-unpause.1.gz share/man/man1/podman-unshare.1.gz share/man/man1/podman-untag.1.gz share/man/man1/podman-update.1.gz share/man/man1/podman-version.1.gz share/man/man1/podman-volume-create.1.gz share/man/man1/podman-volume-exists.1.gz share/man/man1/podman-volume-export.1.gz share/man/man1/podman-volume-import.1.gz share/man/man1/podman-volume-inspect.1.gz share/man/man1/podman-volume-ls.1.gz share/man/man1/podman-volume-mount.1.gz share/man/man1/podman-volume-prune.1.gz share/man/man1/podman-volume-reload.1.gz share/man/man1/podman-volume-rm.1.gz share/man/man1/podman-volume-unmount.1.gz share/man/man1/podman-volume.1.gz share/man/man1/podman-wait.1.gz share/man/man1/podman.1.gz share/man/man1/podmansh.1.gz -share/man/man5/quadlet.5.gz share/man/man5/podman-systemd.unit.5.gz +share/man/man5/quadlet.5.gz share/zsh/site-functions/_podman share/zsh/site-functions/_podman-remote +@dir libexec/podman