<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/95b63c3cf6e2ce5bf159554b251128d2a2edd2cf">https://github.com/macports/macports-ports/commit/95b63c3cf6e2ce5bf159554b251128d2a2edd2cf</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 95b63c3 haproxy: update to 1.8.10
</span>95b63c3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 95b63c3cf6e2ce5bf159554b251128d2a2edd2cf
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Jun 24 02:34:20 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> haproxy: update to 1.8.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes CVE-2018-11469
</span>---
net/haproxy/Portfile | 9 +++++----
net/haproxy/files/patch-Makefile.diff | 6 +++---
2 files changed, 8 insertions(+), 7 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 c415b4e..cdd84d6 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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.10
</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 7ae74f2b9113f9de64959470b25080834d784fc6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bcc05ab824bd2f89b8b21ac05459c0a0a0e02247b57ffe441d52cfe771daea92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2054534
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7d3edc4128309f52daa739e52d6719855bc3bd08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c93bd1a2d4595810a38315de9687b813bf7df790bd807faf8982a13596b0bc60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2058928
</span>
depends_lib path:lib/libssl.dylib:openssl \
port:pcre \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +44,7 @@ build.args CC="${configure.cc} [get_canonical_archflags]" \
</span> USE_LIBCRYPT=1 \
USE_OPENSSL=1 \
USE_PCRE=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_THREAD=1 \
</span> USE_ZLIB=1
destroot.args DOCDIR=${prefix}/share/doc/${name} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/haproxy/files/patch-Makefile.diff b/net/haproxy/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b883d0a..455f42f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/haproxy/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/haproxy/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2018-04-19 15:20:31.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-05-06 12:00:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-06-22 13:58:22.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-06-24 02:00:00.000000000 +0000
</span> @@ -473,8 +473,10 @@
ifneq ($(USE_LIBCRYPT),)
OPTIONS_CFLAGS += -DCONFIG_HAP_CRYPT
BUILD_OPTIONS += $(call ignore_implicit,USE_LIBCRYPT)
+ifneq ($(shell uname -s),Darwin)
OPTIONS_LDFLAGS += -lcrypt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span>
ifneq ($(USE_CRYPT_H),)
OPTIONS_CFLAGS += -DNEED_CRYPT_H
</pre><pre style='margin:0'>
</pre>