Date: Tue, 11 Jun 2024 15:01:17 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: a175b2c9d0e6 - main - sysutils/podman: update to 5.1.1 Message-ID: <202406111501.45BF1H0M037125@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=a175b2c9d0e62bd34b2c2ff80d89cc8a0b9b1aed commit a175b2c9d0e62bd34b2c2ff80d89cc8a0b9b1aed Author: Doug Rabson <dfr@FreeBSD.org> AuthorDate: 2024-06-05 11:59:35 +0000 Commit: Doug Rabson <dfr@FreeBSD.org> CommitDate: 2024-06-11 14:42:29 +0000 sysutils/podman: update to 5.1.1 --- sysutils/podman/Makefile | 3 +-- sysutils/podman/distinfo | 6 +++--- sysutils/podman/files/patch-libpod_container__inspect.go | 11 ----------- sysutils/podman/files/patch-libpod_kube.go | 11 +++++++++++ sysutils/podman/pkg-plist | 2 ++ 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index a6963384b303..cbdc25c94100 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,6 @@ PORTNAME= podman DISTVERSIONPREFIX= v -DISTVERSION= 4.8.3 -PORTREVISION= 4 +DISTVERSION= 5.1.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index 49326a2db7fa..c3e793311228 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704471600 -SHA256 (containers-podman-v4.8.3_GH0.tar.gz) = 3a99b6c82644fa52929cf4143943c63d6784c84094892bc0e14197fa38a1c7fa -SIZE (containers-podman-v4.8.3_GH0.tar.gz) = 21565162 +TIMESTAMP = 1717584025 +SHA256 (containers-podman-v5.1.1_GH0.tar.gz) = ba1022c467dbc3e551e4d391dc6a5c03f33040a0764304b334afd7c6217c4894 +SIZE (containers-podman-v5.1.1_GH0.tar.gz) = 23794366 diff --git a/sysutils/podman/files/patch-libpod_container__inspect.go b/sysutils/podman/files/patch-libpod_container__inspect.go deleted file mode 100644 index 1777fa6ef104..000000000000 --- a/sysutils/podman/files/patch-libpod_container__inspect.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/patch-libpod_kube.go b/sysutils/podman/files/patch-libpod_kube.go new file mode 100644 index 000000000000..64ae53b72347 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_kube.go @@ -0,0 +1,11 @@ +--- 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/pkg-plist b/sysutils/podman/pkg-plist index 42ccf77bfde4..bfe3ee194bcc 100644 --- a/sysutils/podman/pkg-plist +++ b/sysutils/podman/pkg-plist @@ -56,6 +56,7 @@ 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 @@ -116,6 +117,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406111501.45BF1H0M037125>