<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1afa194432e57fdab9ba30468e12feec2696b75">https://github.com/macports/macports-ports/commit/f1afa194432e57fdab9ba30468e12feec2696b75</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 f1afa194432 elvish: Fix crash on go 1.17
</span>f1afa194432 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1afa194432e57fdab9ba30468e12feec2696b75
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Wed Aug 25 13:52:32 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> elvish: Fix crash on go 1.17
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/elves/elvish/issues/1389
</span>---
shells/elvish/Portfile | 17 +++++++-----
shells/elvish/files/patch-backport-x-sys.diff | 38 +++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/elvish/Portfile b/shells/elvish/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c38e3bdb3a0..8df8c670b6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/elvish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/elvish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup golang 1.0
</span>
go.setup github.com/elves/elvish 0.16.1 v
go.package src.elv.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
homepage https://elv.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,12 @@ variant plugin_support description {Enable experimental plugin support} {
</span> build.args-append ELVISH_PLUGIN_SUPPORT=1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove patch when this PR has been merge:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/elves/elvish/pull/1390
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-backport-x-sys.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> # The Makefile tries to call `git rev-parse` to determine the
# VersionSuffix. Since this is not a checked-out git repository, doing
# that will fail. Patch the Makefile to manually set the VersionSuffix:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +60,10 @@ checksums ${distname}${extract.suffix} \
</span> size 664779
go.vendors golang.org/x/sys \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock c12d262b63d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e96b9a22d4a7519872a78461337d9b9602b14f51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3432e1055b4990dc198ae92a1ad0676cf577c786d45897609949b58fbec74093 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1060953 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock 41cdb8703e55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1b61146b9b05b2065b2e3faf7267b938f220f11b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8c7729f6f4c4e0649a75eb973d95c8e5ac3bf5df5660ecfe14d8b49e0d8a46ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1210583 \
</span> go.etcd.io/bbolt \
repo github.com/etcd-io/bbolt \
lock v1.3.5 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/elvish/files/patch-backport-x-sys.diff b/shells/elvish/files/patch-backport-x-sys.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0196ea6a30e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/elvish/files/patch-backport-x-sys.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From aae0174d59f1bb7c54168fc57f71d4c2b8721838 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Stefan Baebler <stefan.baebler@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 25 Aug 2021 11:42:38 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Backport x/sys upgrade to 0.16 release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backport just x/sys upgrade from c99d6e1c9587d683c8a262925255d8609a9843d8 to v0.16-release branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Alternative to & closes #1388
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go.mod | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go.sum | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/go.mod b/go.mod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ef103663..b2693d63 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/go.mod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/go.mod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@ require (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.com/creack/pty v1.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.com/mattn/go-isatty v0.0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go.etcd.io/bbolt v1.3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go 1.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/go.sum b/go.sum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a21fa497..d8a7498d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/go.sum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/go.sum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,5 +6,5 @@ go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 h1:rw6UNGRMfarCepjI8qOepea/SXwIBVfTKjztZ5gBbq4=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</span></pre><pre style='margin:0'>
</pre>