From nobody Sun Sep 01 12:34:44 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 4WxWYJ6bJZz5V8Zy; Sun, 01 Sep 2024 12:34:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WxWYJ62mfz4F7c; Sun, 1 Sep 2024 12:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725194084; 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=Hp9XD2YcwKXUtrGXiq+otoOIV9nJLcCjQ3Tq38eFHHo=; b=qKkd+x7JpoFfOd3Tobfvzxh+OqxfozIB84a+tVNyOjJycChoVLt19D8rmZgbCezzSyPg4R ZdyWciLrQ3VhXt9Bi+/kKK29vpn/dol7O23HWK9u6VIBhOnfj5ODLnK2+MLmRFH6FNKf2a nww5cYzCh5720vKOhDSyN1HvyoDpiz4i1QR0PIc2QJOHcECshoYjNJ/xCEWg3abWF8DdCG D8fjTjESOBKAnpWSDg1OInMslUQx5e4yMg8UxksYnYbEyT7I02312doCykwsm9WJeNW98F 3KNBCIXtUfGVK5Z4ySJhPm13oDzWNZcnUXKrQCROgINhrKPUKEdqzC1OnTjXhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725194084; a=rsa-sha256; cv=none; b=bUtJGCQHmf8GHwCSaQZt/g4Qjr8SHHpLLzlA7Y/Gpkzfegk0HBb5zuWJmT3KkZBjj76vgj 5cTKOHTitbSWEjZTXpxUaoiCH7zOCu6glm0bljk6tlU9a/w42WGipLiVxpyzBBl+r3j2LH 6ILekM/47jmfSt0CLHcp/awanhVHsW9cdZduh5I0HQ19DcRa1izZa7O81Lwp9sKuXb0i8Q 1mm3F3Ha2g4Cha9gZ3USLHOsKbsHnpLok3h0I5VqDO7BeomYepTNdkJlAlN/SV4ktCUMtR 1MRcU3AclVG6+zvZw69PG/oOAX7+xxDO0VtPBgwDumIsUlTSnTqFVMQR3GndUQ== 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=1725194084; 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=Hp9XD2YcwKXUtrGXiq+otoOIV9nJLcCjQ3Tq38eFHHo=; b=aI/3LhdzlP1cwQDvVdGZsrRBi6Yy47/JJKQH0kDhvRZIiTSjk4vH9tvRnVxecsqAU8wdbj obHGsGEcQeZbYjHH24cHHVwzlbLFUsYGhCV0+xpEuqN6wb6O0nEulVmaVSTYIAW+i3JfYh 6/ur2Cm8OEI4R8UThk8CX0X8YZOtgDj+0zJCUl3/WHmMzSUjFTogflJdue2ba4AdNnDEHK rqDcShCld4Oo7UAQC4MgUc62vxxrkr6joMqTwbio+mJrkRxHMx+FohHvWMdzGemgqAHIIG ZZmB5/yKQ5BVvW2/NFY5BKPi+ThKGp9cHSOe3lRdCt4gFM/RzfKQxZlE3RbgVg== 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 4WxWYJ5XpVzT0j; Sun, 1 Sep 2024 12:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 481CYicF045348; Sun, 1 Sep 2024 12:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 481CYiJI045345; Sun, 1 Sep 2024 12:34:44 GMT (envelope-from git) Date: Sun, 1 Sep 2024 12:34:44 GMT Message-Id: <202409011234.481CYiJI045345@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: f570a53c118d - main - sysutils/podman: minor fix to the output of 'podman inspect' 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: f570a53c118d2232e23509c4e3102ebee2366362 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=f570a53c118d2232e23509c4e3102ebee2366362 commit f570a53c118d2232e23509c4e3102ebee2366362 Author: Doug Rabson AuthorDate: 2024-08-28 12:56:45 +0000 Commit: Doug Rabson CommitDate: 2024-09-01 12:33:08 +0000 sysutils/podman: minor fix to the output of 'podman inspect' The HostConfig.Devices field was set to null which confused some code in ansible's podman_container module which expects this field to be an array of srtings. --- sysutils/podman/Makefile | 2 +- .../files/patch-libpod_container__inspect__freebsd.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 22743dcddeab..1f04f72cda93 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,7 @@ PORTNAME= podman DISTVERSIONPREFIX= v DISTVERSION= 5.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/files/patch-libpod_container__inspect__freebsd.go b/sysutils/podman/files/patch-libpod_container__inspect__freebsd.go new file mode 100644 index 000000000000..476307704a41 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__inspect__freebsd.go @@ -0,0 +1,17 @@ +--- libpod/container_inspect_freebsd.go.orig 2024-06-04 19:54:07 UTC ++++ libpod/container_inspect_freebsd.go +@@ -15,5 +15,14 @@ func (c *Container) platformInspectContainerHostConfig + // UTS namespace mode + hostConfig.UTSMode = c.NamespaceMode(spec.UTSNamespace, ctrSpec) + ++ // Devices ++ // Do not include if privileged - assumed that all devices will be ++ // included. ++ var err error ++ hostConfig.Devices, err = c.GetDevices(hostConfig.Privileged, *ctrSpec, map[string]string{}) ++ if err != nil { ++ return err ++ } ++ + return nil + }