diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index fd4d04bfd4ea..b7032f5e40eb 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -1,85 +1,85 @@ PORTNAME= haproxy -DISTVERSION= 3.0-dev4 +DISTVERSION= 3.0-dev6 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/3.0/src/devel/ PKGNAMESUFFIX= -devel DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer WWW= https://www.haproxy.org LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi FLAVORS= default lua FLAVOR?= ${FLAVORS:[1]} USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy default_CONFLICTS_INSTALL= haproxy-devel-lua lua_CONFLICTS_INSTALL= haproxy-devel lua_PKGNAMESUFFIX= devel-lua CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 haproxy25 haproxy26 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 \ USE_TFO=1 USE_THREAD_DUMP=1 \ CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" \ ${MAKE_ARGS_${ARCH}} MAKE_ARGS_i386= USE_LIBATOMIC= MAKE_ARGS_powerpc= USE_LIBATOMIC= OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX OPTIONS_RADIO= PCRE OPTIONS_RADIO_PCRE= DPCRE DPCRE2 SPCRE SPCRE2 DPCRE_DESC= Link pcre(1) dynamically DPCRE2_DESC= Link pcre2 dynamically SPCRE_DESC= Link pcre(1) statically SPCRE2_DESC= Link pcre2 statically DEVICEATLAS_DESC= DeviceAtlas Device Detection support PROMEX_DESC= Enable Prometheus exporter OPTIONS_DEFAULT= DPCRE2 OPENSSL PROMEX DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 DPCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 DPCRE2_MAKE_ARGS= USE_PCRE2=1 USE_PCRE2_JIT=1 SPCRE_BUILD_DEPENDS= ${LOCALBASE}/lib/libpcre.a:devel/pcre SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 SPCRE2_BUILD_DEPENDS= ${LOCALBASE}/lib/libpcre2-8.a:devel/pcre2 SPCRE2_MAKE_ARGS= USE_PCRE2=1 USE_STATIC_PCRE2=1 USE_PCRE2_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 ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:M*quictls} OPENSSL_MAKE_ARGS+= USE_QUIC=1 .else OPENSSL_MAKE_ARGS+= USE_QUIC=1 USE_QUIC_OPENSSL_COMPAT=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}${PREFIX}/share/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-devel/distinfo b/net/haproxy-devel/distinfo index 66aaeb9f518b..4c987ff0bd74 100644 --- a/net/haproxy-devel/distinfo +++ b/net/haproxy-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708974978 -SHA256 (haproxy-3.0-dev4.tar.gz) = 8a5f5eb499ddd651a4ab4a50458332884cc87233cad10b2f4af73ba4c5d403b8 -SIZE (haproxy-3.0-dev4.tar.gz) = 4574646 +TIMESTAMP = 1712061572 +SHA256 (haproxy-3.0-dev6.tar.gz) = 067af946e881f3bab598a46c8d4507a7a87b755c579812095827467d6c0ddd61 +SIZE (haproxy-3.0-dev6.tar.gz) = 4603458 diff --git a/net/haproxy-devel/files/patch-src_tools.c b/net/haproxy-devel/files/patch-src_tools.c deleted file mode 100644 index 598f50cbe965..000000000000 --- a/net/haproxy-devel/files/patch-src_tools.c +++ /dev/null @@ -1,32 +0,0 @@ ---- src/tools.c.orig -+++ src/tools.c -@@ -17,9 +17,7 @@ - #endif - - #if defined(__FreeBSD__) --#include --#include --extern void *__elf_aux_vector; -+#include - #endif - - #if defined(__NetBSD__) -@@ -5018,13 +5016,11 @@ - if (execfn && execfn != ENOENT) - ret = (const char *)execfn; - #elif defined(__FreeBSD__) -- Elf_Auxinfo *auxv; -- for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) { -- if (auxv->a_type == AT_EXECPATH) { -- ret = (const char *)auxv->a_un.a_ptr; -- break; -- } -- } -+ static char execpath[MAXPATHLEN]; -+ if (execpath[0] == '\0') -+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN); -+ if (execpath[0] != '\0') -+ ret = execpath; - #elif defined(__NetBSD__) - AuxInfo *auxv; - for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) { diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist index 57768e435751..91f1e23ce14c 100644 --- a/net/haproxy-devel/pkg-plist +++ b/net/haproxy-devel/pkg-plist @@ -1,100 +1,101 @@ share/man/man1/haproxy.1.gz sbin/halog sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt %%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt %%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol.txt %%PORTDOCS%%%%DOCSDIR%%/SPOE.txt %%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt %%PORTDOCS%%%%DOCSDIR%%/acl.fig %%PORTDOCS%%%%DOCSDIR%%/architecture.txt %%PORTDOCS%%%%DOCSDIR%%/coding-style.txt %%PORTDOCS%%%%DOCSDIR%%/configuration.txt %%PORTDOCS%%%%DOCSDIR%%/cookie-options.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/binding-possibilities.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-reuse.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/pool-debugging.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/ring-v2.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/thread-group.txt %%PORTDOCS%%%%DOCSDIR%%/gpl.txt %%PORTDOCS%%%%DOCSDIR%%/haproxy.1 %%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/appctx.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/buffer-api.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/event_hdl.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/filters.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/htx-api.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/initcalls.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/ist.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/layers.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/list.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/pools.txt %%PORTDOCS%%%%DOCSDIR%%/internals/api/scheduler.txt %%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt %%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt %%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt %%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt %%PORTDOCS%%%%DOCSDIR%%/internals/fd-migration.txt %%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt %%PORTDOCS%%%%DOCSDIR%%/internals/list.fig %%PORTDOCS%%%%DOCSDIR%%/internals/list.png %%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig %%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/muxes.fig %%PORTDOCS%%%%DOCSDIR%%/internals/muxes.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/muxes.png %%PORTDOCS%%%%DOCSDIR%%/internals/muxes.svg %%PORTDOCS%%%%DOCSDIR%%/internals/notes-layers.txt %%PORTDOCS%%%%DOCSDIR%%/internals/notes-poll-connect.txt %%PORTDOCS%%%%DOCSDIR%%/internals/notes-pollhup.txt %%PORTDOCS%%%%DOCSDIR%%/internals/notes-polling.txt %%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia %%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig %%PORTDOCS%%%%DOCSDIR%%/internals/sched.fig %%PORTDOCS%%%%DOCSDIR%%/internals/sched.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/sched.png %%PORTDOCS%%%%DOCSDIR%%/internals/sched.svg %%PORTDOCS%%%%DOCSDIR%%/internals/ssl_cert.dia %%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt %%PORTDOCS%%%%DOCSDIR%%/internals/stconn-close.txt %%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig %%PORTDOCS%%%%DOCSDIR%%/intro.txt %%PORTDOCS%%%%DOCSDIR%%/lgpl.txt %%PORTDOCS%%%%DOCSDIR%%/linux-syn-cookies.txt %%PORTDOCS%%%%DOCSDIR%%/lua-api/Makefile %%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.fig %%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.png %%PORTDOCS%%%%DOCSDIR%%/lua-api/conf.py %%PORTDOCS%%%%DOCSDIR%%/lua-api/index.rst %%PORTDOCS%%%%DOCSDIR%%/lua.txt %%PORTDOCS%%%%DOCSDIR%%/management.txt %%PORTDOCS%%%%DOCSDIR%%/netscaler-client-ip-insertion-protocol.txt %%PORTDOCS%%%%DOCSDIR%%/network-namespaces.txt %%PORTDOCS%%%%DOCSDIR%%/peers.txt %%PORTDOCS%%%%DOCSDIR%%/peers-v2.0.txt %%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt %%PORTDOCS%%%%DOCSDIR%%/queuing.fig %%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt %%PORTDOCS%%%%DOCSDIR%%/seamless_reload.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic-config-edge.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/500.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/502.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lua/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lua/event_handler.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lua/mailers.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quick-test.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks4.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg