<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/7c69f2364f95985e969d43af5c656e588539618e">https://github.com/macports/macports-ports/commit/7c69f2364f95985e969d43af5c656e588539618e</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 7c69f2364f9 podman: Update to 4.2.0
</span>7c69f2364f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c69f2364f95985e969d43af5c656e588539618e
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Sun Aug 14 11:38:14 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> podman: Update to 4.2.0
</span>---
sysutils/podman/Portfile | 14 +++++---------
.../podman/files/patch-getEdk2CodeFd-for-MacPorts.diff | 4 ++--
2 files changed, 7 insertions(+), 11 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 06a17ec76f2..84f19760742 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.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/containers/podman 4.2.0 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,17 +22,13 @@ 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 7d6e1525b296f515f5b877b9710bf0a74845d74e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 27bf32e9b1afee94cb08ebd59389104788d687f402a541f3631f94c7916b10a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10905391
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 024c99edd9aae245dd6b981f830261bb44c590d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15f8bc59025ccd97dc9212a552e7274dfb79e1633b02d6a2a7f63d747eadb2f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13019518
</span>
depends_build-append port:go-md2man
depends_run port:gvisor-tap-vsock port:qemu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-mod=vendor||g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-defaultHelperBinariesDir-for-MacPorts.diff \
patch-getEdk2CodeFd-for-MacPorts.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +42,7 @@ post-patch {
</span> }
build.cmd make
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target ${name}-remote-darwin ${name}-mac-helper docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target ${name}-remote ${name}-mac-helper docs
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/bin/darwin/${name} \
<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 6c626c1d548..6b0a947d817 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,9 +1,9 @@
</span> --- pkg/machine/qemu/options_darwin_arm64.go.orig 2021-12-06 21:09:38.000000000 +0100
+++ pkg/machine/qemu/options_darwin_arm64.go 2021-12-06 21:16:09.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,7 @@
</span> func getEdk2CodeFd(name string) string {
dirs := []string{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ getEdk2CodeFdPathFromQemuBinaryPath(),
</span> + "@@PREFIX@@/share/qemu",
"/opt/homebrew/opt/podman/libexec/share/qemu",
"/usr/local/share/qemu",
</pre><pre style='margin:0'>
</pre>