Date: Thu, 11 Jan 2024 15:15:30 GMT From: Doug Rabson <dfr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 094c6d2e9fe5 - main - sysutils/podman: update to 4.8.3 Message-ID: <202401111515.40BFFUVs092925@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=094c6d2e9fe5449d6ae20ad882136a64359053d2 commit 094c6d2e9fe5449d6ae20ad882136a64359053d2 Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2023-12-09 16:55:35 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2024-01-11 15:14:54 +0000 sysutils/podman: update to 4.8.3 This also adds a fix for https://github.com/containers/podman/issues/21117 which will be submitted upstream soon (credit to Ben Cooksley from KDE for that one). --- sysutils/podman/Makefile | 3 +-- sysutils/podman/distinfo | 6 +++--- sysutils/podman/files/patch-libpod_container__inspect.go | 11 +++++++++++ sysutils/podman/pkg-descr | 6 +++--- sysutils/podman/pkg-message | 6 +++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 9e9b487140ea..22cafa36c4e1 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 4.7.2 -PORTREVISION= 1 +DISTVERSION= 4.8.3 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index 1c9f0a2685a4..49326a2db7fa 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699000346 -SHA256 (containers-podman-v4.7.2_GH0.tar.gz) = 10346c5603546427bd809b4d855d1e39b660183232309128ad17a64969a0193d -SIZE (containers-podman-v4.7.2_GH0.tar.gz) = 20554551 +TIMESTAMP = 1704471600 +SHA256 (containers-podman-v4.8.3_GH0.tar.gz) = 3a99b6c82644fa52929cf4143943c63d6784c84094892bc0e14197fa38a1c7fa +SIZE (containers-podman-v4.8.3_GH0.tar.gz) = 21565162 diff --git a/sysutils/podman/files/patch-libpod_container__inspect.go b/sysutils/podman/files/patch-libpod_container__inspect.go new file mode 100644 index 000000000000..1777fa6ef104 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__inspect.go @@ -0,0 +1,11 @@ +--- libpod/container_inspect.go.orig 2024-01-07 16:19:52 UTC ++++ libpod/container_inspect.go +@@ -316,7 +316,7 @@ func (c *Container) GetSecurityOptions() []string { + if apparmor, ok := ctrSpec.Annotations[define.InspectAnnotationApparmor]; ok { + SecurityOpt = append(SecurityOpt, fmt.Sprintf("apparmor=%s", apparmor)) + } +- if c.config.Spec.Linux.MaskedPaths == nil { ++ if c.config.Spec.Linux != nil && c.config.Spec.Linux.MaskedPaths == nil { + SecurityOpt = append(SecurityOpt, "unmask=all") + } + diff --git a/sysutils/podman/pkg-descr b/sysutils/podman/pkg-descr index 9a5014234e7c..565b0a317ddf 100644 --- a/sysutils/podman/pkg-descr +++ b/sysutils/podman/pkg-descr @@ -1,9 +1,9 @@ -podman (Pod Manager) is a fully featured container engine that is a -simple daemonless tool. podman provides a Docker-CLI comparable +Podman (Pod Manager) is a fully featured container engine that is a +simple daemonless tool. Podman provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=podman. -podman uses Buildah(1) internally to create container images. Both +Podman uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. diff --git a/sysutils/podman/pkg-message b/sysutils/podman/pkg-message index 283d379aeb6b..87f7a9b03d8c 100644 --- a/sysutils/podman/pkg-message +++ b/sysutils/podman/pkg-message @@ -2,12 +2,12 @@ { type: install message: <<EOM -The FreeBSD port of the podman container engine is experimental and should be +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 -podman can restart containers after a host is rebooted. To enable this, use: +Podman can restart containers after a host is rebooted. To enable this, use: $ sudo sysrc podman_enable=YES @@ -27,7 +27,7 @@ EOM type: upgrade maximum_version: 4.7.1 message: <<EOM -In podman-4.7.0 and later, registry authentication creds moved from +In Podman-4.7.0 and later, registry authentication creds moved from /run/containers/0/auth.json to /root/.config/containers/auth.json. Either move the file to the new location or just re-authenticate to the required registries. EOM
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401111515.40BFFUVs092925>