diff options
Diffstat (limited to 'sysutils/buildah')
6 files changed, 5 insertions, 95 deletions
diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index 356794f4a3d4..eefbf3cf2881 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.38.1 -PORTREVISION= 2 +DISTVERSION= 1.40.1 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org @@ -20,7 +19,7 @@ RUN_DEPENDS= containernetworking-plugins>=0:net/containernetworking-plugins \ containers-common>=0:sysutils/containers-common \ ocijail:sysutils/ocijail -USES= gmake go:no_targets,1.22 pkgconfig +USES= gmake go:no_targets,1.23 pkgconfig USE_GITHUB= yes GH_ACCOUNT= containers diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo index 56588414a7d4..116b4b83ced5 100644 --- a/sysutils/buildah/distinfo +++ b/sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738598545 -SHA256 (containers-buildah-v1.38.1_GH0.tar.gz) = d0d5996207b80de8ed39b0fe2563617e538309fefc1c0a707c43832d1cd82c9f -SIZE (containers-buildah-v1.38.1_GH0.tar.gz) = 18550893 +TIMESTAMP = 1750102691 +SHA256 (containers-buildah-v1.40.1_GH0.tar.gz) = 27678b7ced9f096c34d19c12922d8cc9eea2464e4c59dcb249f0f717b80c50bc +SIZE (containers-buildah-v1.40.1_GH0.tar.gz) = 12329760 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 deleted file mode 100644 index 5e0faca26083..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 deleted file mode 100644 index 2e60526c7ecd..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 deleted file mode 100644 index 3940ab594954..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index d17e29d695ee..000000000000 --- a/sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go +++ /dev/null @@ -1,9 +0,0 @@ ---- 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")) - } |