git: 0c7aaa6e41f7 - main - sysutils/containerd: Update to 2.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Dec 2024 07:00:25 UTC
The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c7aaa6e41f759156fc19de8c82b14dbd64b4367 commit 0c7aaa6e41f759156fc19de8c82b14dbd64b4367 Author: Bernhard Froehlich <decke@FreeBSD.org> AuthorDate: 2024-12-01 06:59:34 +0000 Commit: Bernhard Froehlich <decke@FreeBSD.org> 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