Index: head/net/haproxy/Makefile =================================================================== --- head/net/haproxy/Makefile (revision 480167) +++ head/net/haproxy/Makefile (revision 480168) @@ -1,66 +1,65 @@ # Created by: Clement Laforet # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.8.13 -PORTREVISION= 1 +DISTVERSION= 1.8.14 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.8/src/ MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* USES= 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 OPTIONS_RADIO= PCRE OPTIONS_RADIO_PCRE= DPCRE SPCRE DPCRE_DESC= Link dynamically SPCRE_DESC= Link statically DEVICEATLAS_DESC= DeviceAtlas Device Detection support 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 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 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .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/haproxy/distinfo =================================================================== --- head/net/haproxy/distinfo (revision 480167) +++ head/net/haproxy/distinfo (revision 480168) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532977852 -SHA256 (haproxy-1.8.13.tar.gz) = 2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1 -SIZE (haproxy-1.8.13.tar.gz) = 2063046 +TIMESTAMP = 1537447373 +SHA256 (haproxy-1.8.14.tar.gz) = b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf +SIZE (haproxy-1.8.14.tar.gz) = 2070813 Index: head/net/haproxy/files/patch-fix-outofbounds =================================================================== --- head/net/haproxy/files/patch-fix-outofbounds (revision 480167) +++ head/net/haproxy/files/patch-fix-outofbounds (nonexistent) @@ -1,60 +0,0 @@ -diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h -index ffa866b..385f386 100644 ---- include/common/hpack-tbl.h -+++ include/common/hpack-tbl.h -@@ -155,7 +155,7 @@ static inline const struct hpack_dte *hpack_get_dte(const struct hpack_dht *dht, - } - - /* returns non-zero if is valid for table */ --static inline int hpack_valid_idx(const struct hpack_dht *dht, uint16_t idx) -+static inline int hpack_valid_idx(const struct hpack_dht *dht, uint32_t idx) - { - return idx < dht->used + HPACK_SHT_SIZE; - } -@@ -181,7 +181,7 @@ static inline struct ist hpack_get_value(const struct hpack_dht *dht, const stru - } - - /* takes an idx, returns the associated name */ --static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, int idx) -+static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, uint32_t idx) - { - const struct hpack_dte *dte; - -@@ -196,7 +196,7 @@ static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, int idx) - } - - /* takes an idx, returns the associated value */ --static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, int idx) -+static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, uint32_t idx) - { - const struct hpack_dte *dte; - -diff --git a/src/hpack-dec.c b/src/hpack-dec.c -index dfbcaff..99d40f9 100644 ---- src/hpack-dec.c -+++ src/hpack-dec.c -@@ -110,7 +110,7 @@ static inline int hpack_idx_to_phdr(uint32_t idx) - * allocated there. In case of allocation failure, returns a string whose - * pointer is NULL. - */ --static inline struct ist hpack_alloc_string(struct chunk *store, int idx, struct ist in) -+static inline struct ist hpack_alloc_string(struct chunk *store, uint32_t idx, struct ist in) - { - struct ist out; - -diff --git a/src/hpack-tbl.c b/src/hpack-tbl.c -index 9d6b764..e2d4426 100644 ---- src/hpack-tbl.c -+++ src/hpack-tbl.c -@@ -113,7 +113,7 @@ static inline unsigned int hpack_dht_get_tail(const struct hpack_dht *dht) - /* dump the whole dynamic header table */ - static void hpack_dht_dump(const struct hpack_dht *dht) - { -- int i; -+ unsigned int i; - unsigned int slot; - char name[4096], value[4096]; - --- -1.7.12.1 - Property changes on: head/net/haproxy/files/patch-fix-outofbounds ___________________________________________________________________ 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