diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 98ac76fa0a15..94b3b9ec6195 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,72 +1,71 @@ # Created by: Hugo Saro PORTNAME= haproxy -DISTVERSION= 2.4.5 -PORTREVISION= 1 +DISTVERSION= 2.4.7 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/2.4/src/ MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi FLAVORS= default lua FLAVOR?= ${FLAVORS:[1]} default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy lua_PKGNAMESUFFIX= -lua CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy ALL_TARGET= all admin/halog/halog 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= USE_PROMEX=1 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} .if ${FLAVOR:U} == lua OPTIONS_DEFAULT+= LUA .endif .include .if ${ARCH} == "amd64" || ${ARCH} == "i386" MAKE_ARGS+= USE_REGPARM=1 .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${WRKSRC}/admin/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 diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index b3e7f2bd32df..a473f0a4c758 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633112215 -SHA256 (haproxy-2.4.5.tar.gz) = adf4fdacd29ef0cb39dc7b79288f3e56c4bc651eeab0c73bb02ab9090943027b -SIZE (haproxy-2.4.5.tar.gz) = 3595061 +TIMESTAMP = 1633352910 +SHA256 (haproxy-2.4.7.tar.gz) = 52af97f72f22ffd8a7a995fafc696291d37818feda50a23caef7dc0622421845 +SIZE (haproxy-2.4.7.tar.gz) = 3594183 diff --git a/net/haproxy/files/patch-src_filters.c b/net/haproxy/files/patch-src_filters.c deleted file mode 100644 index c716fec434bc..000000000000 --- a/net/haproxy/files/patch-src_filters.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/filters.c.orig 2021-10-03 17:40:24 UTC -+++ src/filters.c -@@ -475,7 +475,7 @@ flt_stream_start(struct stream *s) - } - if (strm_li(s) && (strm_li(s)->analysers & AN_REQ_FLT_START_FE)) { - s->req.flags |= CF_FLT_ANALYZE; -- s->req.analysers |= AN_RES_FLT_END; -+ s->req.analysers |= AN_REQ_FLT_END; - } - return 0; - }