Index: head/net/haproxy20/Makefile =================================================================== --- head/net/haproxy20/Makefile (revision 543861) +++ head/net/haproxy20/Makefile (revision 543862) @@ -1,64 +1,64 @@ # Created by: Hugo Saro # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 2.0.16 +DISTVERSION= 2.0.17 CATEGORIES= net www PKGNAMESUFFIX= 20 MASTER_SITES= http://www.haproxy.org/download/2.0/src/ MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]* USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \ CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX OPTIONS_RADIO= PCRE OPTIONS_RADIO_PCRE= DPCRE SPCRE DPCRE_DESC= Link dynamically SPCRE_DESC= Link statically DEVICEATLAS_DESC= DeviceAtlas Device Detection support PROMEX_DESC= Enable Prometheus exporter OPTIONS_DEFAULT= SPCRE OPENSSL DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include PROMEX_MAKE_ARGS= EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" OPENSSL_USES= ssl OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC} LUA_USES= lua:53 LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} .include .if ${ARCH} == "amd64" || ${ARCH} == "i386" MAKE_ARGS+= USE_REGPARM=1 .endif post-build: cd ${WRKSRC}/contrib/halog && ${MAKE_CMD} ${MAKE_ENV} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${WRKSRC}/contrib/halog/halog ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/net/haproxy20/distinfo =================================================================== --- head/net/haproxy20/distinfo (revision 543861) +++ head/net/haproxy20/distinfo (revision 543862) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595752587 -SHA256 (haproxy-2.0.16.tar.gz) = 8eda217f3bf82f7ad6353bfd0c2005c4ac2da6cdca0398cf98de0016cdb97385 -SIZE (haproxy-2.0.16.tar.gz) = 2675207 +TIMESTAMP = 1596201751 +SHA256 (haproxy-2.0.17.tar.gz) = e7e2d14a75cbe65f1ab8f7dad092b1ffae36a82436c55accd27530258fe4b194 +SIZE (haproxy-2.0.17.tar.gz) = 2676783 Index: head/net/haproxy20/files/patch-add-parenthesis =================================================================== --- head/net/haproxy20/files/patch-add-parenthesis (revision 543861) +++ head/net/haproxy20/files/patch-add-parenthesis (nonexistent) @@ -1,50 +0,0 @@ -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 */ Property changes on: head/net/haproxy20/files/patch-add-parenthesis ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/haproxy20/files/patch-ebtree-ebtree.c =================================================================== --- head/net/haproxy20/files/patch-ebtree-ebtree.c (revision 543861) +++ head/net/haproxy20/files/patch-ebtree-ebtree.c (nonexistent) @@ -1,35 +0,0 @@ -From: Willy Tarreau -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 ---- - -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 - #include "ebtree.h" - - void eb_delete(struct eb_node *node) Property changes on: head/net/haproxy20/files/patch-ebtree-ebtree.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property