<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/d72c188837a27691b48387f460c0cc4343625249">https://github.com/macports/macports-ports/commit/d72c188837a27691b48387f460c0cc4343625249</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 d72c188837a podman: update to 4.1.0 and update patches
</span>d72c188837a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d72c188837a27691b48387f460c0cc4343625249
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Mon May 30 21:56:45 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> podman: update to 4.1.0 and update patches
</span>---
sysutils/podman/Portfile | 11 ++++++-----
.../files/patch-defaultHelperBinariesDir-for-MacPorts.diff | 2 +-
sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff | 3 +--
.../podman/files/patch-remove-hvf-accel-option-for-qemu.diff | 2 +-
4 files changed, 9 insertions(+), 9 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 7beadcd544d..22e5d082a80 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,7 +6,7 @@ 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.0.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/containers/podman 4.1.0 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,12 @@ 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 646c088d70c49dbe4aba02d8738afc28bd62d442 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11377152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0a2a2319d835e58c1d1f97160c099c1ba8fdfbbf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f814e12a7311d486c1ccdc4eb021bc6dd24499569de7a572e436342876f70e95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10904727
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:gvisor-tap-vsock port:qemu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:go-md2man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gvisor-tap-vsock port:qemu
</span>
post-extract {
reinplace "s|-mod=vendor||g" ${worksrcpath}/Makefile
<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 4793d02a5b5..34153b2f666 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,6 +1,6 @@
</span> --- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig 2021-10-15 14:07:21.000000000 +0300
+++ vendor/github.com/containers/common/pkg/config/config_darwin.go 2021-10-15 14:10:41.000000000 +0300
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,9 @@
</span> }
var defaultHelperBinariesDir = []string{
<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 716656c21ab..6c626c1d548 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;'>@@ -5,7 +5,6 @@
</span> func getEdk2CodeFd(name string) string {
dirs := []string{
+ "@@PREFIX@@/share/qemu",
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/opt/homebrew/opt/podman/libexec/share/qemu",
</span> "/usr/local/share/qemu",
"/opt/homebrew/share/qemu",
<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;color:#808080;'>diff --git a/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff b/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index efaaa0c5980..f108b2fb744 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span> +++ pkg/machine/qemu/options_darwin_arm64.go 2021-12-07 02:28:44.000000000 +0200
@@ -13,7 +13,6 @@
func (v *MachineVM) addArchOptions() []string {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ovmfDir := getOvmfDir(v.ImagePath, v.Name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ovmfDir := getOvmfDir(v.ImagePath.GetPath(), v.Name)
</span> opts := []string{
- "-accel", "hvf",
"-accel", "tcg",
</pre><pre style='margin:0'>
</pre>