From nobody Thu Jan 11 15:15:30 2024 X-Original-To: dev-commits-ports-all@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 4T9pBq24GZz56DkC; Thu, 11 Jan 2024 15:15:31 +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 4T9pBq1KKlz4hTy; Thu, 11 Jan 2024 15:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704986131; 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=ECa27zC47SkLpFh5BNc8VwDC3UB0q2W6jLQkSX61iqs=; b=JtLiK+KFx1Tzha8bgFbOwdVfiaUZOCLAfzPIjR0EuCv67uVZzpeFOwXfVYxvACsjbesJyN uBtvFeQZpYzUe9GzJ0ziKmM/dHvRx5/7hUUY0+jXKLiamRi4kqUjFBWK1efAD/yKdl4zRh 4TlWxpwApuSKgNBLHkyMsDO1S+dtFgtJbLksJlFC0Zl+qesRBOPTSc6XLhSVUADIgW9h8E TV5hetN5cejgzEGfObafGpvW+/Ku/HFudjhkin9ofUsrAxkGDJUvjdT7GXr1CiWUu5cDgS cBMgBoIIvBXCLmpCnPQzLuu9CJIz3KpW/Vj9xcUGDhzI6eE1onpxiy3vOZmhFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704986131; 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=ECa27zC47SkLpFh5BNc8VwDC3UB0q2W6jLQkSX61iqs=; b=P7Yq8ia4SmXpf5fOt6RwFw1DkzFOKFVee6cHOTuik6IssL9dsKpwyWBNHwk3BI63lOn6gA 1j8BniumND+y8lBjVWL+e8l7WfwLsruyI+bVsJDZA1wj36oOJeYAFb/gsmafkvZJS8HP7h hqTPhIzJOC94pD458M3iz2+JptOhaeIM6k0X6vim+GYDMf1KUk9qRODpNNOEMCP+MfPBqR QzsBbq0D6XOHCArDEE+6plYpWvK2Dzr7HL1vcMlYJzcTC79zVbzwrzlE1krH0oz2MJSAnt HWIV1G65b0K3ZZ4yvBRKcdcCbiY2/wA8iCnLfTe5UGLajiJig6gLK6ZbAErB0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704986131; a=rsa-sha256; cv=none; b=bkxobuxXGh8RSs+o98Np4o3bc829n2Odn5YNWfwc1LwH9FfA1wxwv7T9Cf9W80J0l/7ea1 ERfWJsTOuU5dabhuWCQXLskIAQcPtMNlvNTqxiaFULqSh8UPqhzRE7nbc6Yt3L7XsKN/le DciHyvdfaFT1ZwtVRlVvFMIPrCOXCBhW6BP4aboLG71Z/Q6dM2ymZcBiRp54p0AS0MtMu7 5+SRbkxKoah8OxA4xxNKSxReHmlehzgSRSDz21HyUOiOcMAmWPUSPRyCwHGdfDSsCa6Nz1 t57kHrOEeJHwYpW2UMZFlET3GMPxaufDtfVNrQhuarXCWv7gFzSxN3nOTJGQdg== 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 4T9pBq0QpmzP2d; Thu, 11 Jan 2024 15:15:31 +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 40BFFV60092928; Thu, 11 Jan 2024 15:15:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BFFUVs092925; Thu, 11 Jan 2024 15:15:30 GMT (envelope-from git) Date: Thu, 11 Jan 2024 15:15:30 GMT Message-Id: <202401111515.40BFFUVs092925@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: 094c6d2e9fe5 - main - sysutils/podman: update to 4.8.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 094c6d2e9fe5449d6ae20ad882136a64359053d2 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=094c6d2e9fe5449d6ae20ad882136a64359053d2 commit 094c6d2e9fe5449d6ae20ad882136a64359053d2 Author: Doug Rabson AuthorDate: 2023-12-09 16:55:35 +0000 Commit: Doug Rabson 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: <