<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/176155345f9f1f498e372160c816bc994c295864">https://github.com/macports/macports-ports/commit/176155345f9f1f498e372160c816bc994c295864</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 176155345f9 nghttp2: update one patch
</span>176155345f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 176155345f9f1f498e372160c816bc994c295864
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Feb 29 16:36:28 2024 +0700
<span style='display:block; white-space:pre;color:#404040;'> nghttp2: update one patch
</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/54446
</span>---
www/nghttp2/Portfile | 1 +
www/nghttp2/files/src-shrpx_config.diff | 70 ++++++++++++++++++++++-----------
2 files changed, 49 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/Portfile b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5990a29c160..540c6805747 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,7 @@ depends_build port:pkgconfig
</span> # See: https://trac.macports.org/ticket/57960
# See: https://github.com/nghttp2/nghttp2/issues/1309
# See: https://github.com/nghttp2/nghttp2/pull/1319
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/nghttp2/nghttp2/pull/2086
</span> patchfiles-append patch-src-shrpx_client_handler.cc.diff \
patch-src-shrpx_downstream_connection_pool.cc.diff \
src-shrpx_config.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/files/src-shrpx_config.diff b/www/nghttp2/files/src-shrpx_config.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a81bdee7b4d..4e6badc41e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/files/src-shrpx_config.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/files/src-shrpx_config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,50 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/shrpx_config.cc~ 2017-07-02 10:46:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/shrpx_config.cc 2017-07-09 22:29:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dirent.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a42253a08e3686a90e676773819f0dccd2f98fb0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 29 Feb 2024 02:26:33 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] shrpx_config.cc: if undefined, define AI_NUMERICSERV to 0
</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;'>+ src/shrpx_config.cc | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/shrpx_config.cc src/shrpx_config.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8bc3a280..1e9cd4c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/shrpx_config.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/shrpx_config.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,6 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ssl_compat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "xsi_strerror.h"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__ // this block only for Macs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifndef __MAC_OS_X_VERSION_MIN_REQUIRED // are AvailabilityMacros.h or Availability.h not yet included?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 // then for Leopard and later…
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <Availability.h> // …either include this…
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <AvailabilityMacros.h> // …or include that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if __MAC_OS_X_VERSION_MIN_REQUIRED < 1060 // and for some OS versions do this…
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define AI_NUMERICSERV 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif // finish OS version discrimination
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // finish Apple case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AI_NUMERICSERV 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cerrno>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace shrpx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1942eb8ffeee28efb46a7472f002b6e0aeedb8d5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 29 Feb 2024 02:29:36 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] shrpx_tls_test.cc: use AI_NUMERICSERV when defined
</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;'>+ src/shrpx_tls_test.cc | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/shrpx_tls_test.cc src/shrpx_tls_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7fe50dde..04d16daa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/shrpx_tls_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/shrpx_tls_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,7 +225,10 @@ static Address parse_addr(const char *ipaddr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addrinfo hints{};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hints.ai_family = AF_UNSPEC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hints.ai_flags = AI_NUMERICHOST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hints.ai_flags |= AI_NUMERICSERV;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addrinfo *res = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>