svn commit: r543454 - in head/net/haproxy20: . files
Dmitry Sivachenko
demon at FreeBSD.org
Sun Jul 26 08:57:30 UTC 2020
Author: demon
Date: Sun Jul 26 08:57:29 2020
New Revision: 543454
URL: https://svnweb.freebsd.org/changeset/ports/543454
Log:
Update to version 2.0.16.
Added:
head/net/haproxy20/files/patch-add-parenthesis (contents, props changed)
head/net/haproxy20/files/patch-ebtree-ebtree.c (contents, props changed)
Modified:
head/net/haproxy20/Makefile
head/net/haproxy20/distinfo
Modified: head/net/haproxy20/Makefile
==============================================================================
--- head/net/haproxy20/Makefile Sun Jul 26 08:56:37 2020 (r543453)
+++ head/net/haproxy20/Makefile Sun Jul 26 08:57:29 2020 (r543454)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haproxy
-DISTVERSION= 2.0.14
+DISTVERSION= 2.0.16
CATEGORIES= net www
PKGNAMESUFFIX= 20
MASTER_SITES= http://www.haproxy.org/download/2.0/src/
Modified: head/net/haproxy20/distinfo
==============================================================================
--- head/net/haproxy20/distinfo Sun Jul 26 08:56:37 2020 (r543453)
+++ head/net/haproxy20/distinfo Sun Jul 26 08:57:29 2020 (r543454)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585832617
-SHA256 (haproxy-2.0.14.tar.gz) = 552a708b8b6efd0f241f5d9fd7ad4168d37ce17cdb6dcb6239c2e519f0a63c75
-SIZE (haproxy-2.0.14.tar.gz) = 2651320
+TIMESTAMP = 1595752587
+SHA256 (haproxy-2.0.16.tar.gz) = 8eda217f3bf82f7ad6353bfd0c2005c4ac2da6cdca0398cf98de0016cdb97385
+SIZE (haproxy-2.0.16.tar.gz) = 2675207
Added: head/net/haproxy20/files/patch-add-parenthesis
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/haproxy20/files/patch-add-parenthesis Sun Jul 26 08:57:29 2020 (r543454)
@@ -0,0 +1,50 @@
+X-Git-Url: http://git.haproxy.org/?p=haproxy-2.0.git;a=blobdiff_plain;f=include%2Fcommon%2Fhathreads.h;h=7b94ba18b6909fc2d6b1e363aec4b306c6eb6dcb;hp=6d8716b870b37508cda74072216ea84c36105528;hb=7ef9a3a4cff7b630de2aea16be4a066726a2ee5d;hpb=d3a82110a0835b361a8ebf147e8400271ea165da
+
+diff --git a/include/common/hathreads.h b/include/common/hathreads.h
+index 6d8716b..7b94ba1 100644
+--- include/common/hathreads.h
++++ include/common/hathreads.h
+@@ -626,7 +626,7 @@ extern struct lock_stat lock_stats[LOCK_LABELS];
+ #define __SPIN_INIT(l) ({ (*l) = 0; })
+ #define __SPIN_DESTROY(l) ({ (*l) = 0; })
+ #define __SPIN_LOCK(l) pl_take_s(l)
+-#define __SPIN_TRYLOCK(l) !pl_try_s(l)
++#define __SPIN_TRYLOCK(l) (!pl_try_s(l))
+ #define __SPIN_UNLOCK(l) pl_drop_s(l)
+
+ #define __HA_RWLOCK_T unsigned long
+@@ -634,10 +634,10 @@ extern struct lock_stat lock_stats[LOCK_LABELS];
+ #define __RWLOCK_INIT(l) ({ (*l) = 0; })
+ #define __RWLOCK_DESTROY(l) ({ (*l) = 0; })
+ #define __RWLOCK_WRLOCK(l) pl_take_w(l)
+-#define __RWLOCK_TRYWRLOCK(l) !pl_try_w(l)
++#define __RWLOCK_TRYWRLOCK(l) (!pl_try_w(l))
+ #define __RWLOCK_WRUNLOCK(l) pl_drop_w(l)
+ #define __RWLOCK_RDLOCK(l) pl_take_r(l)
+-#define __RWLOCK_TRYRDLOCK(l) !pl_try_r(l)
++#define __RWLOCK_TRYRDLOCK(l) (!pl_try_r(l))
+ #define __RWLOCK_RDUNLOCK(l) pl_drop_r(l)
+
+ #define HA_SPINLOCK_T struct ha_spinlock
+@@ -1023,7 +1023,7 @@ static inline void __spin_unlock(enum lock_label lbl, struct ha_spinlock *l,
+ #define HA_SPIN_INIT(l) ({ (*l) = 0; })
+ #define HA_SPIN_DESTROY(l) ({ (*l) = 0; })
+ #define HA_SPIN_LOCK(lbl, l) pl_take_s(l)
+-#define HA_SPIN_TRYLOCK(lbl, l) !pl_try_s(l)
++#define HA_SPIN_TRYLOCK(lbl, l) (!pl_try_s(l))
+ #define HA_SPIN_UNLOCK(lbl, l) pl_drop_s(l)
+
+ #define HA_RWLOCK_T unsigned long
+@@ -1031,10 +1031,10 @@ static inline void __spin_unlock(enum lock_label lbl, struct ha_spinlock *l,
+ #define HA_RWLOCK_INIT(l) ({ (*l) = 0; })
+ #define HA_RWLOCK_DESTROY(l) ({ (*l) = 0; })
+ #define HA_RWLOCK_WRLOCK(lbl,l) pl_take_w(l)
+-#define HA_RWLOCK_TRYWRLOCK(lbl,l) !pl_try_w(l)
++#define HA_RWLOCK_TRYWRLOCK(lbl,l) (!pl_try_w(l))
+ #define HA_RWLOCK_WRUNLOCK(lbl,l) pl_drop_w(l)
+ #define HA_RWLOCK_RDLOCK(lbl,l) pl_take_r(l)
+-#define HA_RWLOCK_TRYRDLOCK(lbl,l) !pl_try_r(l)
++#define HA_RWLOCK_TRYRDLOCK(lbl,l) (!pl_try_r(l))
+ #define HA_RWLOCK_RDUNLOCK(lbl,l) pl_drop_r(l)
+
+ #endif /* DEBUG_THREAD */
Added: head/net/haproxy20/files/patch-ebtree-ebtree.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/haproxy20/files/patch-ebtree-ebtree.c Sun Jul 26 08:57:29 2020 (r543454)
@@ -0,0 +1,35 @@
+From: Willy Tarreau <w at 1wt.eu>
+Date: Mon, 20 Jul 2020 19:40:14 +0000 (+0200)
+Subject: BUILD: ebtree: fix build on libmusl after recent introduction of eb_memcmp()
+X-Git-Url: http://git.haproxy.org/?p=haproxy-2.0.git;a=commitdiff_plain;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370;hp=8e020e77ed8b30dad6dc0d0be2d287737823d856
+
+BUILD: ebtree: fix build on libmusl after recent introduction of eb_memcmp()
+
+In order to address a corner case with memory compares, commit 853926a
+("BUG/MEDIUM: ebtree: use a byte-per-byte memcmp() to compare memory
+blocks") introduced a new eb_memcmp() function, which uses ssize_t for
+an offset. However this one is not known by default in ebtree for versions
+prior to 2.2, and it depends on the libs. Musl requires unistd to be included
+to have it.
+
+This patch just adds this harmless include, which was verified to address
+issue #760. There is no mainline commit ID as 2.2 and above already include
+unistd.h as part of haproxy/api.h. It must be backported to older versions
+(2.0 already has the commit above).
+
+(cherry picked from commit c926085c7e01a93e326e8081f466d23304767a36)
+Signed-off-by: Willy Tarreau <w at 1wt.eu>
+---
+
+diff --git a/ebtree/ebtree.c b/ebtree/ebtree.c
+index e82ed59..10cc2ff 100644
+--- ebtree/ebtree.c
++++ ebtree/ebtree.c
+@@ -18,6 +18,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include <unistd.h>
+ #include "ebtree.h"
+
+ void eb_delete(struct eb_node *node)
More information about the svn-ports-all
mailing list