From nobody Sun Dec 01 07:00:25 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 4Y1HqY23yJz5f8cq; Sun, 01 Dec 2024 07:00:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1HqY1THPz4crx; Sun, 1 Dec 2024 07:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733036425; 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=Ne1mOmJZZUaxv2P3Obj6eDmOWekCqe0Bx33mZKJxC3c=; b=ckjnU2bgjURry/1xW5qi6zzW4rykxNXXvyQZGImzjfFNIL9QfAgPp74vloLcYhOoEqxFGu OMcI5+ItnrIT7lpELIbjVicnXDh2wcnvfT6Ze2Wj3YHqbPMLOreTzDYS+CVcU6A+rZKLOs ZMh2wXYW8UH5nC3zqZC27R5TRaOySJImQ6kgvrS0L8qo2hGpXyw42bEAgUv0QondML7cO6 16MAt2qb9X22rmbNwru7xUlIj1FHpPdud5D2dwO9QfIvjdD/EnsfMZNeZ/i9Z/NsgLrZQY +gKxknnJ4+nLlnixFTAiDZZpzc7if19Igs8CqNMuWxmfXzMprZdJzEjpe+Qb7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733036425; 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=Ne1mOmJZZUaxv2P3Obj6eDmOWekCqe0Bx33mZKJxC3c=; b=ho1R6TBzA/Zysa8xAvu0iEveDBC3FaOgt5/oCBZSl8ziWs/G0JBNWWQBNwsXAWEgjmKhxW hU9X7irM9nkMfbwmonuOgptpAv0Ry3AuN/pPtxQ2pgOOmDtaQxXPKwauhCz8S2K103DaxF 6kW6ZgJHNvJf6UAgw4tl6FkBTy0inGH0+5rSObD5HKCrKKFxFDDu1foV5yg2ZYVQbgpOZd UuwmkVJUs3c4ia7SuPllAOKAYZG5peYyjR1hK8n9SIcGe45Ka12lcxRcBz/tliGpOM4pD4 pj/i5rUBhA8gU7yND3GRp2RPeBUqFUIAA83yAMWfK8TBjsKicEH/OKMI8B+B9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733036425; a=rsa-sha256; cv=none; b=M/wN/PAyvpbM0IAgr0VOqk5qyAtSHKQjB6eXZXMVCKzf1B6SNJ0s8VT5a9mZOfirSCfEpY zewYoUQk1e+9MTfW1PhD94ZPjq7oIaiul4aqdTH6WP2UNL5XjfHHkWW1jFx/AwOP9uw2zS K2bnpgTFvDVDak9xdTJGQ0ngVgKEjpfAAY6RmlWXvM+J1g5ioiHwBq4dcVZ43NjwpXfWcu +8yfsS0e2kZbk9oVzVKJxyHH8bm26yv5yT8BNZFPJLvudlYTp1m1saY7NwwEAKy1+HoqBT g7zPd3y9W6HeooUs35aWQCxyes+udP1MoF74UYAamUipTjHomYPLk85lkGVnIg== 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 4Y1HqY14mgzhwn; Sun, 1 Dec 2024 07:00:25 +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 4B170Pm1031963; Sun, 1 Dec 2024 07:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B170PTL031960; Sun, 1 Dec 2024 07:00:25 GMT (envelope-from git) Date: Sun, 1 Dec 2024 07:00:25 GMT Message-Id: <202412010700.4B170PTL031960@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: 0c7aaa6e41f7 - main - sysutils/containerd: Update to 2.0.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: 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: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c7aaa6e41f759156fc19de8c82b14dbd64b4367 Auto-Submitted: auto-generated The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c7aaa6e41f759156fc19de8c82b14dbd64b4367 commit 0c7aaa6e41f759156fc19de8c82b14dbd64b4367 Author: Bernhard Froehlich AuthorDate: 2024-12-01 06:59:34 +0000 Commit: Bernhard Froehlich CommitDate: 2024-12-01 06:59:34 +0000 sysutils/containerd: Update to 2.0.0 --- sysutils/containerd/Makefile | 5 ++--- sysutils/containerd/distinfo | 6 +++--- sysutils/containerd/files/patch-Makefile | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile index 4101dc70b9d9..7f51772b0125 100644 --- a/sysutils/containerd/Makefile +++ b/sysutils/containerd/Makefile @@ -1,6 +1,6 @@ PORTNAME= containerd DISTVERSIONPREFIX=v -DISTVERSION= 1.7.23 +DISTVERSION= 2.0.0 CATEGORIES= sysutils MAINTAINER= decke@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash:shells/bash -USES= cpe gmake go:modules,no_targets +USES= cpe gmake go:1.22,modules,no_targets USE_GITHUB= yes GH_SUBDIR= src/github.com/containerd/containerd @@ -25,7 +25,6 @@ MAKE_ENV= ${GO_ENV} \ VERSION="${DISTVERSION}" PLIST_FILES= bin/containerd \ - bin/containerd-shim \ bin/containerd-stress \ bin/ctr diff --git a/sysutils/containerd/distinfo b/sysutils/containerd/distinfo index 878147e773cb..a2c0e73a17f5 100644 --- a/sysutils/containerd/distinfo +++ b/sysutils/containerd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729346175 -SHA256 (containerd-containerd-v1.7.23_GH0.tar.gz) = 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c -SIZE (containerd-containerd-v1.7.23_GH0.tar.gz) = 10192816 +TIMESTAMP = 1733035390 +SHA256 (containerd-containerd-v2.0.0_GH0.tar.gz) = 346d644e1b96e1f4a39bfe9d1eb0eb01ca676f806c12d95e5dbe35325bbc1780 +SIZE (containerd-containerd-v2.0.0_GH0.tar.gz) = 10420188 diff --git a/sysutils/containerd/files/patch-Makefile b/sysutils/containerd/files/patch-Makefile index f2f630dcb479..c97bcd9a07fe 100644 --- a/sysutils/containerd/files/patch-Makefile +++ b/sysutils/containerd/files/patch-Makefile @@ -1,13 +1,13 @@ ---- Makefile.orig 2022-03-02 18:52:57 UTC +--- Makefile.orig 2024-11-05 18:34:06 UTC +++ Makefile -@@ -30,8 +30,8 @@ MANDIR ?= $(DATADIR)/man +@@ -32,8 +32,8 @@ TEST_IMAGE_LIST ?= TEST_IMAGE_LIST ?= # Used to populate variables in version package. -VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always) --REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) -+VERSION?=unknown -+REVISION?=unknown - PACKAGE=github.com/containerd/containerd +-REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) ++VERSION ?= unknown ++REVISION ?= unknown + PACKAGE=github.com/containerd/containerd/v2 SHIM_CGO_ENABLED ?= 0