From nobody Tue Mar 14 11:43:53 2023 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 4PbWrT2lmhz3y9jm; Tue, 14 Mar 2023 11:43:53 +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 4PbWrT2K56z3rGx; Tue, 14 Mar 2023 11:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678794233; 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=POTUHC0oYI6XzH5PpQDJbLPGaELrhRiSYE3+ZJas3/o=; b=BRwFLu/zM5Yq84EAWGZ6mAzlLsSq6YaMU5zLOm2LQrrCrlbHupAROr6yx02+sTK+5JjjL5 oAKziU5NBHDHJTXa9uY0dOtRNMBTxErmMd5jYNJyN8HOg/LWo9FI3go4SXv2sZS8i5Xns4 daSPNN5YHJFnHqUP1tWaXgizgjO8BvwT3Sqw+rz4jTh+hmc8rQQgqif2DB6Tg3/9yd8Gal RzoQlM4NE/OpqfJAbHdKQFb6+aPJkgQn2+B/N/qRTqTtAjMyIozkbyOJmiYSbhMyPLouHd 4jH7cWtwOZNGtQvp4hqg93xlY2dfiOiCPeT6IL+lbBUUKcOvexLSftuvxQ5fyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678794233; 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=POTUHC0oYI6XzH5PpQDJbLPGaELrhRiSYE3+ZJas3/o=; b=Xdy8KsVI5WTTZMQqrLBiyJhhg19xkZnQYGtY4oAsKS7eHdFtqyDDAvB/VK2TGJxphJXwZD Thh84Z7tf+pUdQum5gd8sHRVp8UmVOqkknK9wPgO5Iu8mVykQtEZpY4Q7WWDno4K/ZeIJ2 K4eaQM3ZNrrSnXujm/ryw35U9eUp+dF10pBuV4SMYWFVQcqgk+z2CjHLXFUaQAFk2mrTcq lW3NwGeRxGIr9kc4nmhViQ7qB//0VRkgxzy7JnxSsndPzFHV0tpi8CBzpdHm5d0tIR1kxR iheNe6oCZ6/cQ2Xw+DgEQ5gjgTAQX0pxyJhkvpVXEWows2eMlHaktWAmxxzlIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678794233; a=rsa-sha256; cv=none; b=ifz6+VhaOgtupYRXbecQOqEgIH/8zARYGgOMoi8it7WHoAFiIplp8O1iTSWnYJLhmuqC+v rWzlBn++iyes5DkAV+r2box2Y50+qo7cPVCm+8sR6kwqJCrPshpd9dAg7RKP7F1l2FKnDT 3p8nfeiMYrEmSIpIGzWIAc4XeMHAB2tCobEormMzp7BTSU4on9DCmmj3ekL/QTrwmBeg/T d2pGBxn2HZVvMVs+2lR+BEh6IVy1644Rkp85KhbueRYhJKYnN/jt4uOeTjSuWGfjNoOJd0 68BtJI1bPSssVMvatgcQMjIv8771G3ZXy2Qrz7PHBwT7MZp4xzXz4kVaGSwxnw== 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 4PbWrT1PvczYt2; Tue, 14 Mar 2023 11:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32EBhr3s097102; Tue, 14 Mar 2023 11:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32EBhrZR097101; Tue, 14 Mar 2023 11:43:53 GMT (envelope-from git) Date: Tue, 14 Mar 2023 11:43:53 GMT Message-Id: <202303141143.32EBhrZR097101@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: 14403871facf - main - sysutils/podman: update to 4.4.2 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 14403871facfa01847a2d4d7efac23c1ed736d9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=14403871facfa01847a2d4d7efac23c1ed736d9e commit 14403871facfa01847a2d4d7efac23c1ed736d9e Author: Doug Rabson AuthorDate: 2023-03-06 08:04:47 +0000 Commit: Doug Rabson CommitDate: 2023-03-14 11:30:53 +0000 sysutils/podman: update to 4.4.2 Changes: https://github.com/containers/podman/releases/tag/v4.4.2 Approved by: dch --- sysutils/podman/Makefile | 5 ++--- sysutils/podman/distinfo | 6 +++--- sysutils/podman/files/patch-libpod_container__api.go | 19 +++++++++++++++++++ sysutils/podman/pkg-message | 4 ++-- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index cc4098f7f499..82877ad1e1c2 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,6 +1,6 @@ PORTNAME= podman -PORTVERSION= 4.4.0.dev -PORTREVISION= 6 +DISTVERSIONPREFIX= v +DISTVERSION= 4.4.2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -29,7 +29,6 @@ MAKE_JOBS_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= containers GH_PROJECT= podman -GH_TAGNAME= b294b7c3 INSTALL_TARGET= install install.completions diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo index e4e0d4997ff5..3fb40bc89c3d 100644 --- a/sysutils/podman/distinfo +++ b/sysutils/podman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669815845 -SHA256 (containers-podman-4.4.0.dev-b294b7c3_GH0.tar.gz) = 359c711ae275f432e4648d63944effa1779ff333828a4f7f46066081911e6232 -SIZE (containers-podman-4.4.0.dev-b294b7c3_GH0.tar.gz) = 13077012 +TIMESTAMP = 1678027489 +SHA256 (containers-podman-v4.4.2_GH0.tar.gz) = 59cec158438efa8a3e651b19e150d9afd90f7e3f07c30605a997e18b8c54b67c +SIZE (containers-podman-v4.4.2_GH0.tar.gz) = 14401422 diff --git a/sysutils/podman/files/patch-libpod_container__api.go b/sysutils/podman/files/patch-libpod_container__api.go new file mode 100644 index 000000000000..b6573d8a5467 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_container__api.go @@ -0,0 +1,19 @@ +--- libpod/container_api.go.orig 2023-02-23 15:59:21 UTC ++++ libpod/container_api.go +@@ -788,10 +788,12 @@ func (c *Container) Cleanup(ctx context.Context) error + + // make sure all the container processes are terminated if we are running without a pid namespace. + hasPidNs := false +- for _, i := range c.config.Spec.Linux.Namespaces { +- if i.Type == spec.PIDNamespace { +- hasPidNs = true +- break ++ if c.config.Spec.Linux != nil { ++ for _, i := range c.config.Spec.Linux.Namespaces { ++ if i.Type == spec.PIDNamespace { ++ hasPidNs = true ++ break ++ } + } + } + if !hasPidNs { diff --git a/sysutils/podman/pkg-message b/sysutils/podman/pkg-message index 6b311a50f0a1..30efe34d4a9c 100644 --- a/sysutils/podman/pkg-message +++ b/sysutils/podman/pkg-message @@ -1,4 +1,4 @@ -This port of the podman container engine is based on unreleased -sources and should be used for evaluation and testing purposes only. +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