freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysutils/*: update podman-suite to the 20250618

Browse Source 
These components have been updated:
- buildah from 1.38.1 to 1.40.1
- podman from 5.3.2 to 5.5.1
- skopeo from 1.17.0 to 1.19.0

PR:			287607
Approved by:		dfr (maintainer)
Differential Revision:	https://reviews.freebsd.org/D49184
This commit is contained in:
Sergey A. Osokin
2025-06-24 12:03:31 -04:00
parent a527f5544c
commit 9ee49c5fdf
22 changed files with 49 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysutils/buildah/Makefile
+2 -3
View File
@@ -1,7 +1,6 @@
PORTNAME= buildah
DISTVERSIONPREFIX= v
DISTVERSION= 1.38.1
PORTREVISION= 3
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
sysutils/buildah/distinfo
+3 -3
View File
@@ -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
sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config.go
-35
View File
@@ -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
sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go
-33
View File
@@ -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)
}
sysutils/buildah/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go
-12
View File
@@ -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
+}
sysutils/buildah/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
-9
View File
@@ -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"))
}
sysutils/containers-common/Makefile
+4 -4
View File
@@ -1,6 +1,6 @@
PORTNAME= containers-common
DISTVERSIONPREFIX= v
DISTVERSION= 0.61.1
DISTVERSION= 0.63.1
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -25,9 +25,9 @@ GH_TAGNAME= v${DISTVERSION}:common v${IMAGEVERSION}:image \
NO_ARCH= yes
IMAGEVERSION= 5.33.1
SKOPEOVERSION= 1.17.0
STORAGEVERSION= 1.56.1
IMAGEVERSION= 5.35.0
SKOPEOVERSION= 1.19.0
STORAGEVERSION= 1.58.0
do-build:
${GMAKE} -C ${WRKSRC_common}/docs
sysutils/containers-common/distinfo
+9 -9
View File
@@ -1,9 +1,9 @@
TIMESTAMP = 1738598026
SHA256 (containers-common-v0.61.1_GH0.tar.gz) = 3eb531f28564ac78067945c59fa69a0c7c79131ad1e9cfc9f6404e6e8f907b53
SIZE (containers-common-v0.61.1_GH0.tar.gz) = 13216471
SHA256 (containers-image-v5.33.1_GH0.tar.gz) = c54581c03a950543fdeaa38296b98086d8ee15d359f375344e9b15145e8fa54b
SIZE (containers-image-v5.33.1_GH0.tar.gz) = 738022
SHA256 (containers-storage-v1.56.1_GH0.tar.gz) = 88feb5c4bf572cc92cec065f1edb388209c0094794f32eead438c09d640aaf05
SIZE (containers-storage-v1.56.1_GH0.tar.gz) = 4227161
SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69
SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765
TIMESTAMP = 1750104348
SHA256 (containers-common-v0.63.1_GH0.tar.gz) = 6090742e60ebf99e1d9e1580711a9bb556b250551eeef7058aa2f681e93651b9
SIZE (containers-common-v0.63.1_GH0.tar.gz) = 13515794
SHA256 (containers-image-v5.35.0_GH0.tar.gz) = 1c2c4a87cd47d9c56d2794b71ae58d7b8f7dde284afb54abfab5f6c85f7ef4ec
SIZE (containers-image-v5.35.0_GH0.tar.gz) = 766486
SHA256 (containers-skopeo-v1.19.0_GH0.tar.gz) = 043e9f568440accf1aafca122a25c4d21441f16de49475192ec4abeef7430358
SIZE (containers-skopeo-v1.19.0_GH0.tar.gz) = 10819827
SHA256 (containers-storage-v1.58.0_GH0.tar.gz) = 51c689bcfcdcbb4c0192c9a99354db145b65bf4ced3a0f70efd01ec99f39f3f8
SIZE (containers-storage-v1.58.0_GH0.tar.gz) = 4256083
sysutils/podman-suite/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
PORTNAME= podman-suite
PORTVERSION= 20250203
PORTVERSION= 20250618
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
sysutils/podman/Makefile
+2 -3
View File
@@ -1,7 +1,6 @@
PORTNAME= podman
DISTVERSIONPREFIX= v
DISTVERSION= 5.3.2
PORTREVISION= 3
DISTVERSION= 5.5.1
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -21,7 +20,7 @@ RUN_DEPENDS= conmon:sysutils/conmon \
containers-common>=0:sysutils/containers-common \
ocijail:sysutils/ocijail
USES= gmake go:no_targets,1.22 pkgconfig python:build shebangfix
USES= gmake go:no_targets,1.23 pkgconfig python:build shebangfix
USE_RC_SUBR= podman podman_service
SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess
sysutils/podman/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1738598697
SHA256 (containers-podman-v5.3.2_GH0.tar.gz) = e7d7abf2d4ecae7217af017a4199d555563721bf6c3ae52e68704ee8268c432b
SIZE (containers-podman-v5.3.2_GH0.tar.gz) = 24207488
TIMESTAMP = 1750101580
SHA256 (containers-podman-v5.5.1_GH0.tar.gz) = 00d02f85ad27a46e77456fef1be81865a43147544ed2487e6c4c8decd0e3748f
SIZE (containers-podman-v5.5.1_GH0.tar.gz) = 21338501
sysutils/podman/files/patch-libpod_container__internal__common.go
+11
View File
@@ -0,0 +1,11 @@
--- libpod/container_internal_common.go.orig 2025-06-18 16:07:27 UTC
+++ libpod/container_internal_common.go
@@ -192,7 +192,7 @@ func (c *Container) createInitRootfs() error {
}
c.config.Rootfs = tmpDir
- c.config.RootfsOverlay = true
+ //c.config.RootfsOverlay = true
return nil
}
sysutils/podman/files/patch-libpod_runtime__migrate__freebsd.go
-18
View File
@@ -1,18 +0,0 @@
--- 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")
+}
sysutils/podman/files/patch-libpod_runtime__migrate__unsupported.go
-8
View File
@@ -1,8 +0,0 @@
--- 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
sysutils/podman/files/patch-vendor_github.com_containers_common_pkg_config_config.go
-35
View File
@@ -1,35 +0,0 @@
--- vendor/github.com/containers/common/pkg/config/config.go.orig 2025-01-21 18:41:34 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/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__linux.go
-33
View File
@@ -1,33 +0,0 @@
--- vendor/github.com/containers/common/pkg/config/config_linux.go.orig 2025-01-21 18:41:34 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/podman/files/patch-vendor_github.com_containers_common_pkg_config_config__unsupported.go
-12
View File
@@ -1,12 +0,0 @@
--- vendor/github.com/containers/common/pkg/config/config_unsupported.go.orig 2025-01-21 18:41:34 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/podman/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
-9
View File
@@ -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"))
}
sysutils/podman/pkg-plist
+9
View File
@@ -5,6 +5,14 @@ share/bash-completion/completions/podman
share/bash-completion/completions/podman-remote
share/fish/vendor_completions.d/podman-remote.fish
share/fish/vendor_completions.d/podman.fish
share/man/man1/podman-artifact-add.1.gz
share/man/man1/podman-artifact-extract.1.gz
share/man/man1/podman-artifact-inspect.1.gz
share/man/man1/podman-artifact-ls.1.gz
share/man/man1/podman-artifact-pull.1.gz
share/man/man1/podman-artifact-push.1.gz
share/man/man1/podman-artifact-rm.1.gz
share/man/man1/podman-artifact.1.gz
share/man/man1/podman-attach.1.gz
share/man/man1/podman-auto-update.1.gz
share/man/man1/podman-build.1.gz
@@ -109,6 +117,7 @@ share/man/man1/podman-load.1.gz
share/man/man1/podman-login.1.gz
share/man/man1/podman-logout.1.gz
share/man/man1/podman-logs.1.gz
share/man/man1/podman-machine-cp.1.gz
share/man/man1/podman-machine-info.1.gz
share/man/man1/podman-machine-init.1.gz
share/man/man1/podman-machine-inspect.1.gz
sysutils/skopeo/Makefile
+2 -3
View File
@@ -1,7 +1,6 @@
PORTNAME= skopeo
DISTVERSIONPREFIX= v
DISTVERSION= 1.17.0
PORTREVISION= 3
DISTVERSION= 1.19.0
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -17,7 +16,7 @@ BUILD_DEPENDS= bash:shells/bash \
LIB_DEPENDS= libgpgme.so:security/gpgme
RUN_DEPENDS= ${LOCALBASE}/etc/containers/containers.conf.sample:sysutils/containers-common
USES= gmake go:modules,no_targets,1.22 pkgconfig
USES= gmake go:modules,no_targets,1.23 pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= containers
sysutils/skopeo/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1738598110
SHA256 (containers-skopeo-v1.17.0_GH0.tar.gz) = e548c044c7b644ba455f482df387ec90aceea432b9c61a0bab0ec8534970eb69
SIZE (containers-skopeo-v1.17.0_GH0.tar.gz) = 10682765
TIMESTAMP = 1750104581
SHA256 (containers-skopeo-v1.19.0_GH0.tar.gz) = 043e9f568440accf1aafca122a25c4d21441f16de49475192ec4abeef7430358
SIZE (containers-skopeo-v1.19.0_GH0.tar.gz) = 10819827
sysutils/skopeo/files/patch-vendor_github.com_containers_storage_pkg_chunked_storage__unsupported.go
-9
View File
@@ -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"))
}