From nobody Wed Mar 15 10:05:02 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 4Pc5by3l5yz3yJwM; Wed, 15 Mar 2023 10:05:02 +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 4Pc5by33tTz41ct; Wed, 15 Mar 2023 10:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678874702; 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=lc3aXuZcAsbX01r4zf424sFFNNjO0+4CmxI1LuRyON0=; b=BdgA3pP/Rg2bRBV4hc8GB4P+OhYzGIzYo9Bb4e09YgND+AGECTLjJ8P9vyoQIswLORO84G RA/A99MbrErTVy4EySWtuhoTs6jYx/hMJF8so3JRh0fqqWy14U3HmgN4gmYFnpQPf1JVMT WPGaQXyrgEdi3ojGhbkOE72GU9g+Bwi9rpgCbnrzpQP19eB+/44qhAtVxO9Fw5yOQYrxwT BIx7AWNC1ZfF4GgyRby7KQEfAj3whpwLfG6ldVv5oROzemT2plmeie0wglObScND/FWtw0 O12RIS53pfv8Q2gbixLbnNwTcpihf2yZtsia43N/02p2XQZzD1C+eoiGbVyPcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678874702; 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=lc3aXuZcAsbX01r4zf424sFFNNjO0+4CmxI1LuRyON0=; b=S5NZ9VthwC4+5ynb7y0b99vaqML81405exiW7CAReFejdSXH2vm1YsxPqTFrrcDdKKvrCJ 1qp57nIpjFonbIgDJWAAcIk+AoNC572vRXGYtc1tz7KKFr56RkWt3sbyqgAXGc/Js/NYwj oMog7lwX6ts8W7h6Dfo3JXaT5MtQJoHLJL1Uk3glVkBE9Jy3sZ/fxtADdYLFuR8r2oSBhB /KG63p/BON3yCJGLnD1dAKnt32/1l3WiJXQg5fsiFEBumKIcywpBRmHGoF5PaawcdEqheD fU5nQi4DX0iZE82Rlii/stsfsCqIaWye7LsKZGA6WzX0oF8XwKUCYgbSHucSOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678874702; a=rsa-sha256; cv=none; b=Y4RRl5XVKy9JXsO43Sy+9MsVcKOP7O+KxcNVIIoE7RvtshYeIdZxnzEj/HuI1qQacOnkog MDlEtZ8vHQ2zdZQqBUMVsmrtMhCVSb6AIR6Avh74fPoK8oHyQze8OW8U/lfs91+MUeg+Ss 0XWyWEyEZPNZBUgQ4zgcz9wFs/b4Nghu0wysiZp0Uvtmkc0yfJcHRO41k8L2fWTLSOSeQq uqKEtBGYhvD0Yih59Kvctph6nbMCz4hEcKMaQ8FF7RarRo0677J0gfw3q7Bn2t2CMZt8YY 5/aezzfYNLgnzZ5PdVFNFtihxTC4QFmrQg0xXbAwnPH+ESf9EKGnkp/0VW9ahw== 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 4Pc5by21R9z1CCg; Wed, 15 Mar 2023 10:05:02 +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 32FA52mj001348; Wed, 15 Mar 2023 10:05:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32FA52Sn001347; Wed, 15 Mar 2023 10:05:02 GMT (envelope-from git) Date: Wed, 15 Mar 2023 10:05:02 GMT Message-Id: <202303151005.32FA52Sn001347@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: 1c91b0de39b0 - main - sysutils/containerd: Update to 1.7.0 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: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c91b0de39b03b844be454d99a0202cf5f0e0e26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c91b0de39b03b844be454d99a0202cf5f0e0e26 commit 1c91b0de39b03b844be454d99a0202cf5f0e0e26 Author: Bernhard Froehlich AuthorDate: 2023-03-15 10:04:40 +0000 Commit: Bernhard Froehlich CommitDate: 2023-03-15 10:04:40 +0000 sysutils/containerd: Update to 1.7.0 --- sysutils/containerd/Makefile | 3 +- sysutils/containerd/distinfo | 6 +- .../files/patch-LinuxContainersOnFreeBSD | 155 --------------------- 3 files changed, 4 insertions(+), 160 deletions(-) diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile index d9c717abd41d..e67399544612 100644 --- a/sysutils/containerd/Makefile +++ b/sysutils/containerd/Makefile @@ -1,7 +1,6 @@ PORTNAME= containerd DISTVERSIONPREFIX=v -DISTVERSION= 1.6.19 -PORTREVISION= 1 +DISTVERSION= 1.7.0 CATEGORIES= sysutils MAINTAINER= decke@FreeBSD.org diff --git a/sysutils/containerd/distinfo b/sysutils/containerd/distinfo index 7ad589cc69e7..74306e9f0abe 100644 --- a/sysutils/containerd/distinfo +++ b/sysutils/containerd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677748658 -SHA256 (containerd-containerd-v1.6.19_GH0.tar.gz) = 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 -SIZE (containerd-containerd-v1.6.19_GH0.tar.gz) = 8706434 +TIMESTAMP = 1678874063 +SHA256 (containerd-containerd-v1.7.0_GH0.tar.gz) = c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 +SIZE (containerd-containerd-v1.7.0_GH0.tar.gz) = 9648706 diff --git a/sysutils/containerd/files/patch-LinuxContainersOnFreeBSD b/sysutils/containerd/files/patch-LinuxContainersOnFreeBSD deleted file mode 100644 index 876c8527e4c5..000000000000 --- a/sysutils/containerd/files/patch-LinuxContainersOnFreeBSD +++ /dev/null @@ -1,155 +0,0 @@ -Linux containers on FreeBSD - -Obtained from: https://github.com/containerd/containerd/pull/7000 ---- oci/spec_opts.go.orig 2022-06-06 17:19:23 UTC -+++ oci/spec_opts.go -@@ -365,6 +365,7 @@ func WithImageConfigArgs(image Image, args []string) S - return fmt.Errorf("unknown image config media type %s", ic.MediaType) - } - -+ appendOSMounts(s, ociimage.OS) - setProcess(s) - if s.Linux != nil { - defaults := config.Env ---- oci/spec_opts_darwin.go.orig 2022-06-11 11:16:33 UTC -+++ oci/spec_opts_darwin.go -@@ -0,0 +1,21 @@ -+/* -+ Copyright The containerd Authors. -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+*/ -+ -+package oci -+ -+func appendOSMounts(s *Spec, os string) error { -+ return nil -+} ---- oci/spec_opts_freebsd.go.orig 2022-06-11 11:16:33 UTC -+++ oci/spec_opts_freebsd.go -@@ -0,0 +1,50 @@ -+/* -+ Copyright The containerd Authors. -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+*/ -+ -+package oci -+ -+import ( -+ specs "github.com/opencontainers/runtime-spec/specs-go" -+) -+ -+// appendOSMounts modifies the mount spec to mount emulated Linux filesystems on FreeBSD, -+// as per: https://wiki.freebsd.org/LinuxJails -+func appendOSMounts(s *Spec, os string) error { -+ // No-op for FreeBSD containers -+ if os != "linux" { -+ return nil -+ } -+ /* The nosuid noexec options are for consistency with Linux mounts: on FreeBSD it is -+ by default impossible to execute anything from these filesystems. -+ */ -+ var mounts = []specs.Mount{ -+ { -+ Destination: "/proc", -+ Type: "linprocfs", -+ Source: "linprocfs", -+ Options: []string{"nosuid", "noexec"}, -+ }, -+ { -+ Destination: "/sys", -+ Type: "linsysfs", -+ Source: "linsysfs", -+ Options: []string{"nosuid", "noexec", "nodev"}, -+ }, -+ } -+ -+ s.Mounts = append(mounts, s.Mounts...) -+ return nil -+} ---- oci/spec_opts_linux.go.orig 2022-06-06 17:19:23 UTC -+++ oci/spec_opts_linux.go -@@ -153,3 +153,7 @@ func WithRdt(closID, l3CacheSchema, memBwSchema string - return nil - } - } -+ -+func appendOSMounts(s *Spec, os string) error { -+ return nil -+} ---- platforms/defaults_freebsd.go.orig 2022-06-11 11:16:33 UTC -+++ platforms/defaults_freebsd.go -@@ -0,0 +1,42 @@ -+/* -+ Copyright The containerd Authors. -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+*/ -+ -+package platforms -+ -+import ( -+ specs "github.com/opencontainers/image-spec/specs-go/v1" -+ "runtime" -+) -+ -+// DefaultSpec returns the current platform's default platform specification. -+func DefaultSpec() specs.Platform { -+ return specs.Platform{ -+ OS: runtime.GOOS, -+ Architecture: runtime.GOARCH, -+ // The Variant field will be empty if arch != ARM. -+ Variant: cpuVariant(), -+ } -+} -+ -+// Default returns the default matcher for the platform. -+func Default() MatchComparer { -+ return Ordered(DefaultSpec(), specs.Platform{ -+ OS: "linux", -+ Architecture: runtime.GOARCH, -+ // The Variant field will be empty if arch != ARM. -+ Variant: cpuVariant(), -+ }) -+} ---- platforms/defaults_unix.go.orig 2022-06-06 17:19:23 UTC -+++ platforms/defaults_unix.go -@@ -1,5 +1,5 @@ --//go:build !windows && !darwin --// +build !windows,!darwin -+//go:build !windows && !darwin && !freebsd -+// +build !windows,!darwin,!freebsd - - /* - Copyright The containerd Authors.