<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/2fa05fab8a7082704cc6e97a7442914351663362">https://github.com/macports/macports-ports/commit/2fa05fab8a7082704cc6e97a7442914351663362</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2fa05fab8a7082704cc6e97a7442914351663362
</span>Author: Vadym-Valdis Yudaiev <judaew@outlook.de>
AuthorDate: Sun Feb 12 20:24:39 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> podman: update to 4.4.1 and sync patches
</span>---
sysutils/podman/Portfile | 13 +++++--------
sysutils/podman/files/patch-Makefile.diff | 22 ----------------------
...atch-defaultHelperBinariesDir-for-MacPorts.diff | 6 +++---
.../files/patch-getEdk2CodeFd-for-MacPorts.diff | 6 +++---
4 files changed, 11 insertions(+), 36 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 e353354d9c1..4e890239344 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,9 +6,9 @@ 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.3.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/containers/podman 4.4.1 v
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories sysutils
license Apache-2
<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 9af9788b65b6fb746af87a2984f89b61a89e311b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12674902
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dacbebd93ac23e5c44e7cbb1433ba3955ca45008 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0b84dbc3ca1d3cc75708635e3a322c481bb679103040866024b1fa2be6826455 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14396828
</span>
set py_ver 3.11
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,6 @@ depends_run port:gvisor-tap-vsock port:qemu
</span> patchfiles patch-defaultHelperBinariesDir-for-MacPorts.diff \
patch-getEdk2CodeFd-for-MacPorts.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove in next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
${worksrcpath}/vendor/github.com/containers/common/pkg/config/config_darwin.go \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/files/patch-Makefile.diff b/sysutils/podman/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2b15bd62087..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 85ceb7fb5c8ee2eec7239a043662802fc4d08959 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Vadym-Valdis Yudaiev <judaew@outlook.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 22 Dec 2022 23:32:01 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] make: Use PYTHON var for .install.pre-commit
</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;'>- Makefile | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a88fdd4044c..f2bc0389015 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -937,7 +937,7 @@ install.tools: .install.golangci-lint .install.swagger ## Install needed tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: .install.pre-commit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .install.pre-commit:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -z "$(PRE_COMMIT)" ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- python3 -m pip install --user pre-commit; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(PYTHON) -m pip install --user pre-commit; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: uninstall
</span><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 34153b2f666..d2f8c4ba49a 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><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig 2021-10-15 14:07:21.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/github.com/containers/common/pkg/config/config_darwin.go 2021-10-15 14:10:41.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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:#e0ffe0;'>+@@ -29,6 +29,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 6b0a947d817..57f790f3a8e 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ pkg/machine/qemu/options_darwin_arm64.go 2021-12-06 21:16:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ pkg/machine/qemu/options_darwin_arm64.go 2023-02-12 20:04:29.796668348 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,6 +74,7 @@
</span> func getEdk2CodeFd(name string) string {
dirs := []string{
getEdk2CodeFdPathFromQemuBinaryPath(),
</pre><pre style='margin:0'>
</pre>