From bda678976e43a9e614d9b61257e830408ec8cd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Wed, 12 Nov 2025 18:24:48 +0000
Subject: [PATCH] podman: 5.6.2 -> 5.7.0

---
 pkgs/by-name/po/podman/hardcode-paths.patch      | 16 ++++++++--------
 pkgs/by-name/po/podman/package.nix               |  4 ++--
 .../po/podman/rm-podman-mac-helper-msg.patch     | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/po/podman/hardcode-paths.patch b/pkgs/by-name/po/podman/hardcode-paths.patch
index ea7288436190..f3e8c987840c 100644
--- a/pkgs/by-name/po/podman/hardcode-paths.patch
+++ b/pkgs/by-name/po/podman/hardcode-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
-index 02ff128..d3254ba 100644
---- a/vendor/github.com/containers/common/pkg/config/default.go
-+++ b/vendor/github.com/containers/common/pkg/config/default.go
-@@ -378,75 +378,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
+diff --git a/vendor/go.podman.io/common/pkg/config/default.go b/vendor/go.podman.io/common/pkg/config/default.go
+index 3bf0bc1..05496ae 100644
+--- a/vendor/go.podman.io/common/pkg/config/default.go
++++ b/vendor/go.podman.io/common/pkg/config/default.go
+@@ -389,75 +389,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
  	c.Retry = 3
  	c.OCIRuntimes = map[string][]string{
  		"crun": {
@@ -87,11 +87,11 @@ index 02ff128..d3254ba 100644
 +			"@bin_path@/bin/ocijail",
  		},
  	}
- 	c.PlatformToOCIRuntime = map[string]string{
-@@ -457,26 +416,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
+ 	c.OCIRuntimesFlags = map[string][]string{}
+@@ -469,26 +428,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
  	// Needs to be called after populating c.OCIRuntimes.
  	c.OCIRuntime = c.findRuntime()
- 
+
 -	c.ConmonEnvVars.Set([]string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
 +	c.ConmonEnvVars.Set([]string{})
  	c.ConmonPath.Set([]string{
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 19ec18e3dbab..4b71a8464bae 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -76,13 +76,13 @@ let
 in
 buildGoModule rec {
   pname = "podman";
-  version = "5.6.2";
+  version = "5.7.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
     rev = "v${version}";
-    hash = "sha256-VVPwnzcGOm3UDHtoLbP1I+9NIluMU/wHuerM+ePiKhg=";
+    hash = "sha256-SHIWfY8eKdimwpLfB1NtpF1DBh6qaR5KCDTU4vWAMFw=";
   };
 
   patches = [
diff --git a/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch b/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
index aff013565deb..0aaf9b1a99df 100644
--- a/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
+++ b/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
@@ -1,14 +1,14 @@
 diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
-index d2ba418..5098cdc 100644
+index 44773f2..eba7b46 100644
 --- a/pkg/machine/machine_common.go
 +++ b/pkg/machine/machine_common.go
-@@ -34,13 +34,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
+@@ -31,13 +31,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
  // WaitAPIAndPrintInfo prints info about the machine and does a ping test on the
  // API socket
- func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) {
+ func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, _ bool) {
 -	suffix := ""
  	var fmtString string
- 
+
 -	if name != define.DefaultMachineName {
 -		suffix = " " + name
 -	}
@@ -16,8 +16,8 @@ index d2ba418..5098cdc 100644
  	if forwardState == NoForwarding {
  		return
  	}
-@@ -62,14 +57,6 @@ address can't be used by podman. `
- 
+@@ -59,14 +54,6 @@ address can't be used by podman. `
+
  				if len(helper) < 1 {
  					fmt.Print(fmtString)
 -				} else {