<pre style='margin:0'>
Vadim-Valdis Yudaev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d73dac96cd17e8787e3c62e6f748b9cc3a2af72">https://github.com/macports/macports-ports/commit/3d73dac96cd17e8787e3c62e6f748b9cc3a2af72</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 3d73dac96cd podman: Update to 3.4.3 and add patch
</span>3d73dac96cd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d73dac96cd17e8787e3c62e6f748b9cc3a2af72
</span>Author: Vadim-Valdis Yudaev <judaew@macports.org>
AuthorDate: Tue Dec 7 02:44:24 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> podman: Update to 3.4.3 and add patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CHANGES:
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch patch-getEdk2CodeFd-for-MacPorts.diff for fix path to QEMU
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/64131
</span>---
sysutils/podman/Portfile | 20 ++++++++------------
.../files/patch-getEdk2CodeFd-for-MacPorts.diff | 11 +++++++++++
2 files changed, 19 insertions(+), 12 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 68f09f11a72..3bc6f3ecbfd 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;'>@@ -3,16 +3,10 @@
</span> PortSystem 1.0
PortGroup golang 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup github.com/containers/podman 3.4.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/containers/podman 3.4.3 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${version} eq "3.4.2"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incr revision
</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;'>-
</span> categories sysutils
license Apache-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +21,9 @@ long_description Podman is a tool for running Linux containers. \
</span> maintainers {judaew @judaew} openmaintainer
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 17f8569e66c2e242be1cacb17865887065f3921c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10959727
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 877cab2e1c3fef990cefed06553a030e3f0def7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0571acd254c86091d65123a1c1d4286cab1d71a6f5ab62842e3fa5b29e10821 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10945852
</span>
depends_run port:gvisor-tap-vsock port:qemu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +31,13 @@ post-extract {
</span> reinplace "s|-mod=vendor||g" ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-defaultHelperBinariesDir-for-MacPorts.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-getEdk2CodeFd-for-MacPorts.diff
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/vendor/github.com/containers/common/pkg/config/config_darwin.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/vendor/github.com/containers/common/pkg/config/config_darwin.go \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pkg/machine/qemu/options_darwin_arm64.go
</span> }
build.cmd make
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..716656c21ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pkg/machine/qemu/options_darwin_arm64.go.orig 2021-12-06 21:09:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pkg/machine/qemu/options_darwin_arm64.go 2021-12-06 21:16:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ func getEdk2CodeFd(name string) string {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirs := []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@PREFIX@@/share/qemu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/local/share/qemu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/opt/homebrew/share/qemu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>