From nobody Thu Oct 03 15:29:27 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 4XKFw801Mlz5YSWw; Thu, 03 Oct 2024 15:29:28 +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 4XKFw76Y71z4j0M; Thu, 3 Oct 2024 15:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727969367; 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=OLZAD74bk0maCGrdBtdStqA+YDagAFtgwFd1UdLVmp8=; b=fXNIGpMwYtkCtcSTHoZ31AEdgnFHukptMGhT/7dkEemUDtd/9bZNpr8ouu+wwkhnEBgPVs ECeMZmfE/ku/fmhqARWE7JVb1oDIomK3KMczjIE0ZRTbSHUuRZLxE2EZW/k7ld/aQjkpE6 B1dGNHIvrplIQcOom2IsaX8Ze75/aN1lrYHN58jPafIrs3mPje5kiZcWH8lCe0cPddct6Z TiKef1rSEu97iLlEFy7H55cKhRQJl5xKU+QobZ0bgqAWJU1JirZIGazaCBml8XJu0u7eyX 9LfVxflmmEet5A5//6OSwzBdC3yUSerjjzVAoKUoP26Sh0M8d57Syb7+YEsB/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727969367; 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=OLZAD74bk0maCGrdBtdStqA+YDagAFtgwFd1UdLVmp8=; b=DjT7P9X5PiBc3zjPDw5V6NMqo4O66haiZq0YczQNQ9K/9Jge6wpLT9uGN+eyBLqbDCQuRv x/pAvqFK+mFS8LB4hSCbKMZMUo3xm8TwWHc0CSpbW5CrWiE3DWAzLXFUU/ESywXdGbCdWi VcRWbIEssemUxTl55fkBhNHPtvX4PW2d6bFlaDgGOdxanwr7jsSqDr0B2PP7PatvfIvxM9 xr2ZC164xbx8xJGkkzD6be7NHdJTFDIDN4MblQBoo0gfUlvPEY4mpdAxkAlfEOrEPHD0YV YYHZu8aQ6x+rCCYQFeu3JKHip6iTUIJKsz0Z8Tuq/demClYcDDJ01UAsMd+HfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727969367; a=rsa-sha256; cv=none; b=PzUT4Pa7Yo5mpsnPOeDKT/P9HfbSp9/umAr4txA1rekqJT42GIOE8KcRwvoBbrnlKxIaqN LZ5rRzRal9sRZn8YTmU0Y1EUDRO8sNO8MJsa+wP+sHYlTtHYFbRYXEqY5g9Edcd862aP71 2dR8AQBMOG74W3U3LulFe/wR+OhzxbFAI8KR0exj54FEJeLbLx6skn0IzEUB8NvwyGCI0P PGxxzZaFZADK8Pej+gyjKpvPeulQ3ldsjYSOP1xNUQjglM8zijpZ8+6A4hTGjYUPZ3nMUC 5bWFYFpLElL4BQHcmVVwzZVZ/TNqmBstXdOkZVAWPQ+Qie7hW07gNETaW+OTlQ== 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 4XKFw761btzwSw; Thu, 3 Oct 2024 15:29:27 +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 493FTRb6052262; Thu, 3 Oct 2024 15:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493FTR6Y052259; Thu, 3 Oct 2024 15:29:27 GMT (envelope-from git) Date: Thu, 3 Oct 2024 15:29:27 GMT Message-Id: <202410031529.493FTR6Y052259@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: 859efd10b6a2 - main - sysutils/podman: fix a confusing error message from 'podman system reset' 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: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 859efd10b6a2f330e57a65153e99583a5e11efa2 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=859efd10b6a2f330e57a65153e99583a5e11efa2 commit 859efd10b6a2f330e57a65153e99583a5e11efa2 Author: Doug Rabson AuthorDate: 2024-10-03 15:29:04 +0000 Commit: Doug Rabson CommitDate: 2024-10-03 15:29:04 +0000 sysutils/podman: fix a confusing error message from 'podman system reset' --- sysutils/podman/Makefile | 2 +- .../files/patch-libpod_runtime__migrate__freebsd.go | 18 ++++++++++++++++++ .../patch-libpod_runtime__migrate__unsupported.go | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile index 1f04f72cda93..b6e1e314eed6 100644 --- a/sysutils/podman/Makefile +++ b/sysutils/podman/Makefile @@ -1,7 +1,7 @@ PORTNAME= podman DISTVERSIONPREFIX= v DISTVERSION= 5.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go b/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go new file mode 100644 index 000000000000..5908c595098c --- /dev/null +++ b/sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go @@ -0,0 +1,18 @@ +--- libpod/runtime_migrate_freebsd.go.orig 2024-10-03 14:39:32 UTC ++++ libpod/runtime_migrate_freebsd.go +@@ -0,0 +1,15 @@ ++//go:build !remote ++ ++package libpod ++ ++import ( ++ "errors" ++) ++ ++func (r *Runtime) stopPauseProcess() error { ++ return nil ++} ++ ++func (r *Runtime) Migrate(newRuntime string) error { ++ return errors.New("not implemented (*Runtime) migrate") ++} diff --git a/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go b/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go new file mode 100644 index 000000000000..0c38a6d35a56 --- /dev/null +++ b/sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go @@ -0,0 +1,8 @@ +--- libpod/runtime_migrate_unsupported.go.orig 2024-10-03 14:38:54 UTC ++++ libpod/runtime_migrate_unsupported.go +@@ -1,4 +1,4 @@ +-//go:build !remote && !linux ++//go:build !remote && !linux && !freebsd + + package libpod +