sysutils/buildah: update to 1.38.1

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

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

sysutils/buildah/files/patch-run__freebsd.go

@@ -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
- 			}

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

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)
+ }

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
++}

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"))
+ }