From nobody Tue Jun 11 15:01:17 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VzBhG4lkqz5M4tT; Tue, 11 Jun 2024 15:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VzBhF6szqz4qqF; Tue, 11 Jun 2024 15:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718118078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7qtVvwlWXoJX1a0Ts3p1zqoJntwgpwZ9f7nPAmQrl64=; b=dh/2xIUAekM9zqObdI3x5AJmyZgBPxD1LiO3JW6kBlMSHBlVlweeAZrr1zrdu3KAP8pUv4 K8HhgyRQqStc7WVrHPZirMDv841GkMoof5jaSsdQXxFHGAqSXI/axOJwQK8f5qKnYVt1mg IbaGZsS5TEeKELEkBEFoXipdTloVvClmh3pw4Of2Gr2agWZji8ZebEzaWzZf/xuAsAX4VC PQ8tI0Af+YASTh8OIAQr919a7pva4GfyXR/q77JtYpllC860OZyKnIsfNIAgc8PCgsUzRf /hZRdzgIDKgXezVV74ZNm/53RNYQyHP4pL//FLSpTRpKxub/UtDIYwQFQhgDMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718118078; a=rsa-sha256; cv=none; b=VT2Df8X3VGhHzOBKP7OX9Ocv0xQSbmNoY6hJcyjsUTg0EOnUx+kIuW+hB51wzL/0sMJBTJ xR9c2xc9SINbTi8jKvKygfFfB9tRdgrM/deDa/3hYRIP0Y1U0mSZTW1eG2E9TM3XFGC3p/ Dv3l2B1SHdlqFsvyIqWVivaanb+JxJAA4f3DrVIwT9LWAWmRQkgRB9sA+zqiWIIV8bdxQd NNj1UoWvNC/UzRhVgOyv6F13ORNS43S/KZEviKrcUqdz6ZKyrrkME0S7h50L89NufEpeh6 wuE67KJqerh+15LPnu6tKdxiTctwiYwwXmIg1QKu9rZ8AHccL8potM++B5E2xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718118078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7qtVvwlWXoJX1a0Ts3p1zqoJntwgpwZ9f7nPAmQrl64=; b=YbqCqJtznpiV3Qg1H7gu21DXZ5eTY3ERLXZWS8IQGjy9WQ71oacHDDNdfs3U8XWn3jQ4r2 vBA2wTbnlxmh22qs3kW7ZiqLQ/6eTdTu5+QauedhNhiV4cjqHl8ilrjqU6DsO2dKZ17rmr sU9h2VmKWp/zCM8xAAMgnFxHXMfHTUZTSJWSf51wyxaaGW88OA2u4xonq3VNJYvMvlWtIw OJWiSMV/hQsIjmd6Uq5AgY/0ifzI4iihVa6FwBlq1khbp5+b8/rwXdtLTuIwybGzGKsERO m2PHkNS5RsWdubyouzWlEEXR9kQuSK8TX8WPVemvXS936FnmxjiibT+aN0OeOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VzBhF6Q5VzDgq; Tue, 11 Jun 2024 15:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45BF1HsH037128; Tue, 11 Jun 2024 15:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BF1H0M037125; Tue, 11 Jun 2024 15:01:17 GMT (envelope-from git) Date: Tue, 11 Jun 2024 15:01:17 GMT Message-Id: <202406111501.45BF1H0M037125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Doug Rabson Subject: git: a175b2c9d0e6 - main - sysutils/podman: update to 5.1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a175b2c9d0e62bd34b2c2ff80d89cc8a0b9b1aed Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=a175b2c9d0e62bd34b2c2ff80d89cc8a0b9b1aed commit a175b2c9d0e62bd34b2c2ff80d89cc8a0b9b1aed Author: Doug Rabson AuthorDate: 2024-06-05 11:59:35 +0000 Commit: Doug Rabson 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