<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c703b962e8860fe26d3cc32f245abc168b81131e">https://github.com/macports/macports-ports/commit/c703b962e8860fe26d3cc32f245abc168b81131e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c703b962e88 podman: update to 4.8.2; add myself as co-maintainer
</span>c703b962e88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c703b962e8860fe26d3cc32f245abc168b81131e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Dec 31 20:55:26 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> podman: update to 4.8.2; add myself as co-maintainer
</span>---
sysutils/podman/Portfile | 10 +++++-----
.../patch-defaultHelperBinariesDir-for-MacPorts.diff | 17 ++++++++---------
.../podman/files/patch-getEdk2CodeFd-for-MacPorts.diff | 8 ++++----
3 files changed, 17 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/Portfile b/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2157ac7da41..e4170c65c3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,13 +6,13 @@ PortGroup golang 1.0
</span> # After the upgrade, it is highly recommended to test the `podman machine`.
# This port has problems with this command from time to time.
# See https://gist.github.com/judaew/85c6e8a62bf0e7f5be5188e020492e21
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup github.com/containers/podman 4.7.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/containers/podman 4.8.2 v
</span> github.tarball_from archive
revision 0
categories sysutils
license Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {judaew @judaew} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {judaew @judaew} {@catap korins.ky:kirill} openmaintainer
</span>
description Tool for managing OCI containers and pods.
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description \
</span> install the remote client and then setup ssh connection information.
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 585babd7c79c70c3cecdacf4c17dcb7a29941884 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b785fe69041a0f222a8e1f8165816d767cb9bff5418f3f559547da82c0c279cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20557503
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 31a25388a288a82d9db422247237988761bdd918 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 994537a8535f3e4d2f03ced8b0dd58fda44c9d44cef6ba5bf15a970ddfeaf6f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21561815
</span>
set py_ver 3.11
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff b/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d2f8c4ba49a..e9fea1bab0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig 2023-02-08 21:03:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/github.com/containers/common/pkg/config/config_darwin.go 2023-02-12 20:02:19.697007565 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- var defaultHelperBinariesDir = []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/github.com/containers/common/pkg/config/config_darwin.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/github.com/containers/common/pkg/config/config_darwin.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,9 @@ var defaultHelperBinariesDir = []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Relative to the binary directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$BINDIR/../libexec/podman",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Homebrew install paths
</span> + // MacPorts install paths
+ "@@PREFIX@@/libexec",
+ "@@PREFIX@@/bin",
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Homebrew install paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/usr/local/opt/podman/libexec",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/local/opt/podman/libexec/podman",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/opt/homebrew/opt/podman/libexec/podman",
</span> "/opt/homebrew/bin",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff b/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 57f790f3a8e..84931d42ac0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pkg/machine/qemu/options_darwin_arm64.go.orig 2023-02-08 21:03:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pkg/machine/qemu/options_darwin_arm64.go 2023-02-12 20:04:29.796668348 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pkg/machine/qemu/options_darwin_arm64.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pkg/machine/qemu/options_darwin_arm64.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,7 @@ func getEdk2CodeFdPathFromQemuBinaryPath() string {
</span> func getEdk2CodeFd(name string) string {
dirs := []string{
getEdk2CodeFdPathFromQemuBinaryPath(),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@PREFIX@@/share/qemu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@PREFIX@@/share/qemu",
</span> "/opt/homebrew/opt/podman/libexec/share/qemu",
"/usr/local/share/qemu",
"/opt/homebrew/share/qemu",
</pre><pre style='margin:0'>
</pre>