sysutils/podman: update from 5.1.1 to 5.2.5

Approved by:		dfr (maintainer)
Differential Revision:	https://reviews.freebsd.org/D47877

5 files changed, 9 insertions, 50 deletions

diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index b6e1e314eed6..0377fd95331f 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	podman
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.1.1
-PORTREVISION=	7
+DISTVERSION=	5.2.5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo
index c3e793311228..dacdb9d58acc 100644
--- a/sysutils/podman/distinfo
+++ b/sysutils/podman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717584025
-SHA256 (containers-podman-v5.1.1_GH0.tar.gz) = ba1022c467dbc3e551e4d391dc6a5c03f33040a0764304b334afd7c6217c4894
-SIZE (containers-podman-v5.1.1_GH0.tar.gz) = 23794366
+TIMESTAMP = 1733223741
+SHA256 (containers-podman-v5.2.5_GH0.tar.gz) = 18bbf2c26534229c030590d65da88154bed31f0207041d30fed5f508b933a66c
+SIZE (containers-podman-v5.2.5_GH0.tar.gz) = 23834863
diff --git a/sysutils/podman/files/patch-libpod_kube.go b/sysutils/podman/files/patch-libpod_kube.go
deleted file mode 100644
index 64ae53b72347..000000000000
--- a/sysutils/podman/files/patch-libpod_kube.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpod/kube.go.orig	2024-06-05 10:44:10 UTC
-+++ libpod/kube.go
-@@ -1308,7 +1308,7 @@ func generateKubeSecurityContext(c *Container) (*v1.Se
- 		scHasData = true
- 		sc.ReadOnlyRootFilesystem = &ro
- 	}
--	if c.config.Spec.Linux.MaskedPaths == nil {
-+	if c.config.Spec.Linux != nil && c.config.Spec.Linux.MaskedPaths == nil {
- 		scHasData = true
- 		unmask := v1.UnmaskedProcMount
- 		sc.ProcMount = &unmask
diff --git a/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go b/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go
deleted file mode 100644
index 869f92f72b7e..000000000000
--- a/sysutils/podman/files/patch-vendor_github.com_containers_buildah_run__common.go
+++ /dev/null
@@ -1,30 +0,0 @@
---- vendor/github.com/containers/buildah/run_common.go.orig	2024-08-20 09:45:05 UTC
-+++ vendor/github.com/containers/buildah/run_common.go
-@@ -83,12 +83,17 @@ func (b *Builder) addResolvConfEntries(file string, ne
- 
- // addResolvConf copies files from host and sets them up to bind mount into container
- func (b *Builder) addResolvConfEntries(file string, networkNameServer []string,
--	namespaces []specs.LinuxNamespace, keepHostServers, ipv6 bool) error {
-+	spec *specs.Spec, keepHostServers, ipv6 bool) error {
- 	defaultConfig, err := config.Default()
- 	if err != nil {
- 		return fmt.Errorf("failed to get config: %w", err)
- 	}
- 
-+	var namespaces []specs.LinuxNamespace
-+	if spec.Linux != nil {
-+		namespaces = spec.Linux.Namespaces
-+	}
-+
- 	dnsServers, dnsSearch, dnsOptions := b.CommonBuildOpts.DNSServers, b.CommonBuildOpts.DNSSearch, b.CommonBuildOpts.DNSOptions
- 	nameservers := make([]string, 0, len(defaultConfig.Containers.DNSServers.Get())+len(dnsServers))
- 	nameservers = append(nameservers, defaultConfig.Containers.DNSServers.Get()...)
-@@ -1253,7 +1258,7 @@ func (b *Builder) runUsingRuntimeSubproc(isolation def
- 			}
- 
- 			if resolvFile != "" {
--				err = b.addResolvConfEntries(resolvFile, netResult.dnsServers, spec.Linux.Namespaces, netResult.keepHostResolvers, netResult.ipv6)
-+				err = b.addResolvConfEntries(resolvFile, netResult.dnsServers, spec, netResult.keepHostResolvers, netResult.ipv6)
- 				if err != nil {
- 					return err
- 				}
diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist
index bfe3ee194bcc..892b3c724663 100644
--- a/sysutils/podman/pkg-plist
+++ b/sysutils/podman/pkg-plist
@@ -1,7 +1,6 @@
 bin/podman
-bin/podmansh
 bin/podman-remote
-@dir libexec/podman
+bin/podmansh
 share/bash-completion/completions/podman
 share/bash-completion/completions/podman-remote
 share/fish/vendor_completions.d/podman-remote.fish
@@ -185,14 +184,15 @@ share/man/man1/podman-secret.1.gz
 share/man/man1/podman-start.1.gz
 share/man/man1/podman-stats.1.gz
 share/man/man1/podman-stop.1.gz
+share/man/man1/podman-system-check.1.gz
 share/man/man1/podman-system-connection-add.1.gz
 share/man/man1/podman-system-connection-default.1.gz
 share/man/man1/podman-system-connection-list.1.gz
 share/man/man1/podman-system-connection-remove.1.gz
 share/man/man1/podman-system-connection-rename.1.gz
 share/man/man1/podman-system-connection.1.gz
-share/man/man1/podman-system-events.1.gz
 share/man/man1/podman-system-df.1.gz
+share/man/man1/podman-system-events.1.gz
 share/man/man1/podman-system-info.1.gz
 share/man/man1/podman-system-migrate.1.gz
 share/man/man1/podman-system-prune.1.gz
@@ -224,7 +224,8 @@ share/man/man1/podman-volume.1.gz
 share/man/man1/podman-wait.1.gz
 share/man/man1/podman.1.gz
 share/man/man1/podmansh.1.gz
-share/man/man5/quadlet.5.gz
 share/man/man5/podman-systemd.unit.5.gz
+share/man/man5/quadlet.5.gz
 share/zsh/site-functions/_podman
 share/zsh/site-functions/_podman-remote
+@dir libexec/podman