Skip to content

Commit

Permalink
sysutils/podman: update to 4.8.3
Browse files Browse the repository at this point in the history
This also adds a fix for containers/podman#21117
which will be submitted upstream soon (credit to Ben Cooksley from KDE
for that one).
  • Loading branch information
Doug Rabson authored and Doug Rabson committed Jan 11, 2024
1 parent ab0dfa3 commit 094c6d2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 11 deletions.
3 changes: 1 addition & 2 deletions 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
Expand Down
6 changes: 3 additions & 3 deletions 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
11 changes: 11 additions & 0 deletions 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")
}

6 changes: 3 additions & 3 deletions 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.
6 changes: 3 additions & 3 deletions sysutils/podman/pkg-message
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 094c6d2

Please sign in to comment.