From nobody Tue Feb 18 14:59:33 2025 X-Original-To: dev-commits-ports-all@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 4Yy2jx2pfMz5nkW6; Tue, 18 Feb 2025 14:59:33 +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 4Yy2jx1LCwz3QZ7; Tue, 18 Feb 2025 14:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739890773; 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=TllK7ZrCq7mz3PoZ5+amTj0NDabX5gsPoOJnk0lP+tA=; b=f3rdgJYFvtL//OcpFJRaBxh+VuLHaXLoojUwgLkvsC5ZnQaDUL2Ga1SbTcspNa8Jvo4qE8 EmwAXgoeNkHq0b28SVTd7T/cC8CA9hrj+h65Jx4R4l3XL0gUUWwsVQcv9DpYFyvmagE5Lo nWNvmE6DbVEj1env1/1BV96jahAzpGquQH/jTdY4Vad5syA4tIAkdaw3ARABCYIl3CYR6u YWwv0SK5Gw+QFmEfAJuJJf3u3OQ5pMOK/3q8ij/8efzHeQ/UlQ2jHCJ0jdzrLAuNaj9vml ju6xMcRHl/+6EYeE65dn1Kw+hw+Oix0g7eSN0TcuBhFuoBlF893a3ARM2fGY5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739890773; a=rsa-sha256; cv=none; b=hAC8+Sh6mh5+/q2iirP5VsmEYdmmqe7dYNWqgi/S01mYv8T8TAle2Coo7LlIJmlxxsIQXp uJT2XOQGDqfHl/+tNe+Lu9Vla5sQ/K4sD9077qVTpYZlU3mKp9vd8x/ypoPyOmMKNOv1Lv WS5BQ03x2Dnwj0Xtbofzu92G3iGZDtIj5G75SZDOOfoFjvRjH7xX/JaDDdyEo0gmbcNKXJ Y/Ft4U5DdDMR4H8ZgXr7HNovUoZtZF/auSBWXWf+cYvd1bWPyy+lBlzx9JjNNo+nd6Z/s3 tdrxBcYIFdzoVtqb0+H77wZ2NpL968kSlqNwjbmxvgQP9EIFj3bVaoOt6gcAOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739890773; 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=TllK7ZrCq7mz3PoZ5+amTj0NDabX5gsPoOJnk0lP+tA=; b=U7RneSox6mjT+ktngbncHR/Wvk23Urpb7E/DmyaJXU0wwk6rERLUlwnkflG/sYFJDI19oi r9xUPyeXep8/HcVL2yrsMiFmiAz0+9KZfIn/wXPqRQefiLyT4O8iAqw6moA5bqW2CdOB38 GHbejuILgvGkCiSVq4TeqXFpb+1YQj54OuSSSEyfLSp6NN7xnI0XZguioqwMQwcHnmciah Ck8iAB42C+/bTZQd1O9ujTfp/QhTQAEY6GqOP/Dbw51m8cVoY6GQR1meeq/8ukVB8cNIIg AJ/0TqbYrxvj1Rhab0dTo3+Mp0ZVoCHY8wI4QmtKkNsmzuoebXirUq2pGuZTHg== 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 4Yy2jx0sy5z8Qg; Tue, 18 Feb 2025 14:59:33 +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 51IExX3j003964; Tue, 18 Feb 2025 14:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IExXsZ003961; Tue, 18 Feb 2025 14:59:33 GMT (envelope-from git) Date: Tue, 18 Feb 2025 14:59:33 GMT Message-Id: <202502181459.51IExXsZ003961@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: 1a7906ff9256 - main - sysutils/buildah: update to 1.38.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 1a7906ff9256775632a3fe34b17a1657e28a1f46 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a7906ff9256775632a3fe34b17a1657e28a1f46 commit 1a7906ff9256775632a3fe34b17a1657e28a1f46 Author: Doug Rabson AuthorDate: 2025-02-03 16:38:02 +0000 Commit: Doug Rabson CommitDate: 2025-02-18 14:59:10 +0000 sysutils/buildah: update to 1.38.1 --- sysutils/buildah/Makefile | 11 ++++--- sysutils/buildah/distinfo | 6 ++-- sysutils/buildah/files/patch-run__freebsd.go | 11 ------- ...thub.com_containers_common_pkg_config_config.go | 35 ++++++++++++++++++++++ ...m_containers_common_pkg_config_config__linux.go | 33 ++++++++++++++++++++ ...ainers_common_pkg_config_config__unsupported.go | 12 ++++++++ ...ers_storage_pkg_chunked_storage__unsupported.go | 9 ++++++ 7 files changed, 97 insertions(+), 20 deletions(-) diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index 788ec05edf60..29c82e054508 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.37.5 -PORTREVISION= 1 +DISTVERSION= 1.38.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -11,16 +10,16 @@ WWW= https://buildah.io/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= bash:shells/bash \ +BUILD_DEPENDS= as:devel/binutils \ + bash:shells/bash \ go-md2man:textproc/go-md2man \ - gsed:textproc/gsed \ - as:devel/binutils + gsed:textproc/gsed LIB_DEPENDS= libgpgme.so:security/gpgme RUN_DEPENDS= containernetworking-plugins>=0:net/containernetworking-plugins \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail -USES= gmake go:no_targets pkgconfig +USES= gmake go:no_targets,1.22 pkgconfig USE_GITHUB= yes GH_ACCOUNT= containers diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo index 212d1e6db279..56588414a7d4 100644 --- a/sysutils/buildah/distinfo +++ b/sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733324771 -SHA256 (containers-buildah-v1.37.5_GH0.tar.gz) = 1cc94713976d5b580fdda6c523674237af17d2d48141dbf7d029de3e66592a08 -SIZE (containers-buildah-v1.37.5_GH0.tar.gz) = 19323742 +TIMESTAMP = 1738598545 +SHA256 (containers-buildah-v1.38.1_GH0.tar.gz) = d0d5996207b80de8ed39b0fe2563617e538309fefc1c0a707c43832d1cd82c9f +SIZE (containers-buildah-v1.38.1_GH0.tar.gz) = 18550893 diff --git a/sysutils/buildah/files/patch-run__freebsd.go b/sysutils/buildah/files/patch-run__freebsd.go deleted file mode 100644 index d920a21327eb..000000000000 --- a/sysutils/buildah/files/patch-run__freebsd.go +++ /dev/null @@ -1,11 +0,0 @@ ---- run_freebsd.go.orig 2024-08-18 10:59:26 UTC -+++ run_freebsd.go -@@ -244,7 +244,7 @@ func (b *Builder) Run(command []string, options RunOpt - // Only add entries here if we do not have to do setup network, - // if we do we have to do it much later after the network setup. - if !configureNetwork { -- err = b.addResolvConfEntries(resolvFile, nil, nil, false, true) -+ err = b.addResolvConfEntries(resolvFile, nil, spec, false, true) - if err != nil { - return err - } diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go new file mode 100644 index 000000000000..5e0faca26083 --- /dev/null +++ b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go @@ -0,0 +1,35 @@ +--- vendor/github.com/containers/common/pkg/config/config.go.orig 2025-01-20 18:22:54 UTC ++++ vendor/github.com/containers/common/pkg/config/config.go +@@ -12,7 +12,6 @@ import ( + + "github.com/containers/common/internal/attributedstring" + "github.com/containers/common/libnetwork/types" +- "github.com/containers/common/pkg/capabilities" + "github.com/containers/storage/pkg/fileutils" + "github.com/containers/storage/pkg/unshare" + units "github.com/docker/go-units" +@@ -963,24 +962,6 @@ func (c *Config) GetDefaultEnvEx(envHost, httpProxy bo + } + } + return append(env, c.Containers.Env.Get()...) +-} +- +-// Capabilities returns the capabilities parses the Add and Drop capability +-// list from the default capabilities for the container +-func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { +- userNotRoot := func(user string) bool { +- if user == "" || user == "root" || user == "0" { +- return false +- } +- return true +- } +- +- defaultCapabilities := c.Containers.DefaultCapabilities.Get() +- if userNotRoot(user) { +- defaultCapabilities = []string{} +- } +- +- return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) + } + + // Device parses device mapping string to a src, dest & permissions string diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go new file mode 100644 index 000000000000..2e60526c7ecd --- /dev/null +++ b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go @@ -0,0 +1,33 @@ +--- vendor/github.com/containers/common/pkg/config/config_linux.go.orig 2025-01-20 18:22:54 UTC ++++ vendor/github.com/containers/common/pkg/config/config_linux.go +@@ -1,6 +1,7 @@ import ( + package config + + import ( ++ "github.com/containers/common/pkg/capabilities" + selinux "github.com/opencontainers/selinux/go-selinux" + ) + +@@ -25,4 +26,22 @@ var defaultHelperBinariesDir = []string{ + "/usr/local/lib/podman", + "/usr/libexec/podman", + "/usr/lib/podman", ++} ++ ++// Capabilities returns the capabilities parses the Add and Drop capability ++// list from the default capabilities for the container ++func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { ++ userNotRoot := func(user string) bool { ++ if user == "" || user == "root" || user == "0" { ++ return false ++ } ++ return true ++ } ++ ++ defaultCapabilities := c.Containers.DefaultCapabilities.Get() ++ if userNotRoot(user) { ++ defaultCapabilities = []string{} ++ } ++ ++ return capabilities.MergeCapabilities(defaultCapabilities, addCapabilities, dropCapabilities) + } diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go new file mode 100644 index 000000000000..3940ab594954 --- /dev/null +++ b/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go @@ -0,0 +1,12 @@ +--- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig 2025-01-20 18:22:54 UTC ++++ vendor/github.com/containers/common/pkg/config/config_unsupported.go +@@ -5,3 +5,9 @@ func selinuxEnabled() bool { + func selinuxEnabled() bool { + return false + } ++ ++// Capabilities returns the capabilities parses the Add and Drop capability ++// list from the default capabilities for the container ++func (c *Config) Capabilities(user string, addCapabilities, dropCapabilities []string) ([]string, error) { ++ return nil, nil ++} diff --git a/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go b/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go new file mode 100644 index 000000000000..d17e29d695ee --- /dev/null +++ b/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go @@ -0,0 +1,9 @@ +--- vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go.orig 2025-02-04 11:32:21 UTC ++++ vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go +@@ -13,5 +13,5 @@ func GetDiffer(ctx context.Context, store storage.Stor + + // GetDiffer returns a differ than can be used with ApplyDiffWithDiffer. + func GetDiffer(ctx context.Context, store storage.Store, blobDigest digest.Digest, blobSize int64, annotations map[string]string, iss ImageSourceSeekable) (graphdriver.Differ, error) { +- return nil, errors.New("format not supported on this system") ++ return nil, newErrFallbackToOrdinaryLayerDownload(errors.New("format not supported on this system")) + }