<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6b8770d1044fd4f6a55a4ff6283172bdd2addb4">https://github.com/macports/macports-ports/commit/b6b8770d1044fd4f6a55a4ff6283172bdd2addb4</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 b6b8770d104 libgit2-devel: patch for errSSLNetworkTimeout
</span>b6b8770d104 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b6b8770d1044fd4f6a55a4ff6283172bdd2addb4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Jul 24 20:25:35 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libgit2-devel: patch for errSSLNetworkTimeout
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/67774
</span>---
devel/libgit2-devel/Portfile | 7 ++++++-
.../files/patch-errSSLNetworkTimeout.diff | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgit2-devel/Portfile b/devel/libgit2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49f6c6f05f1..65ae02d2ab0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgit2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgit2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set my_name libgit2
</span> # don't forget to update py-pygit2 and libgit2-glib as well
github.setup libgit2 libgit2 1.7.0 v
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,11 @@ depends_lib-append \
</span> # See: https://trac.macports.org/ticket/65585
patchfiles-append patch-tests-no-error.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix for upstream issue: constant errSSLNetworkTimeout only available in 10.12+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/67774
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/libgit2/libgit2/pull/6535#issuecomment-1643859900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-errSSLNetworkTimeout.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Clear optflags; controlled by project, via cmake build type
configure.optflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgit2-devel/files/patch-errSSLNetworkTimeout.diff b/devel/libgit2-devel/files/patch-errSSLNetworkTimeout.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4961659e587
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgit2-devel/files/patch-errSSLNetworkTimeout.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libgit2/streams/stransport.c.orig 2023-07-24 20:17:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libgit2/streams/stransport.c 2023-07-24 20:20:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ st->error = ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (ret == GIT_TIMEOUT) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- errSSLNetworkTimeout :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -9853 /* errSSLNetworkTimeout */:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -36 /* ioErr */;
</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;'>+@@ -214,7 +214,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ st->error = ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = (ret == GIT_TIMEOUT) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- errSSLNetworkTimeout :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -9853 /* errSSLNetworkTimeout */:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -36 /* ioErr */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (ret == 0) {
</span></pre><pre style='margin:0'>
</pre>