<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0c7896fc54c7f178910d64c34c6fc1a1765b4aed">https://github.com/macports/macports-ports/commit/0c7896fc54c7f178910d64c34c6fc1a1765b4aed</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 0c7896f haproxy: update to 1.8.11
</span>0c7896f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0c7896fc54c7f178910d64c34c6fc1a1765b4aed
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Jun 27 12:40:54 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> haproxy: update to 1.8.11
</span>---
net/haproxy/Portfile | 9 +++---
.../files/patch-unbreak-build-without-threads.diff | 33 ----------------------
2 files changed, 4 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/haproxy/Portfile b/net/haproxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 015267a..ca15bc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/haproxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/haproxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name haproxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.11
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ long_description HAproxy is a high-performance and highly-robust TCP/HTTP \
</span> homepage https://www.haproxy.org/
master_sites ${homepage}download/${branch}/src/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7d3edc4128309f52daa739e52d6719855bc3bd08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c93bd1a2d4595810a38315de9687b813bf7df790bd807faf8982a13596b0bc60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2058928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9c423bf35f423989e267ea5a3841be1c0542584b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b4b403ceb5efe3c65c6d86e1a44fc0953189f12cdf0bd884e5df04bbabb27947 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2058936
</span>
depends_lib path:lib/libssl.dylib:openssl \
port:pcre \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,6 @@ build.args CC="${configure.cc} [get_canonical_archflags]" \
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
build.args-delete USE_THREAD=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-unbreak-build-without-threads.diff
</span> }
destroot.args DOCDIR=${prefix}/share/doc/${name} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/haproxy/files/patch-unbreak-build-without-threads.diff b/net/haproxy/files/patch-unbreak-build-without-threads.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7ebd5cb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/haproxy/files/patch-unbreak-build-without-threads.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0611c65b8e1c9c7c9f0f16c1542be904236c3fa7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: William Lallemand <wlallem...@haproxy.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 24 Jun 2018 09:37:03 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] BUG/BUILD: threads: unbreak build without threads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The build without threads was once again broken.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This issue was introduce in commit ba86c6c ("MINOR: threads: Be sure to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-remove threads from all_threads_mask on exit").
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This exactly the same problem that the last time it happened, because of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-all_threads_mask not being defined with USE_THREAD=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/haproxy.c | 3 +--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/haproxy.c src/haproxy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 11d1d47ce..4101cefa1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/haproxy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/haproxy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2473,9 +2473,8 @@ static void *run_thread_poll_loop(void *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list_for_each_entry(ptdf, &per_thread_deinit_list, list)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptdf->fct();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HA_ATOMIC_AND(&all_threads_mask, ~tid_bit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_THREAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HA_ATOMIC_AND(&all_threads_mask, ~tid_bit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (tid > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_exit(NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.16.1
</span></pre><pre style='margin:0'>
</pre>