diff options
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/Makefile | 11 | ||||
| -rw-r--r-- | net/haproxy/distinfo | 6 | ||||
| -rw-r--r-- | net/haproxy/files/patch-src_tools.c | 62 | ||||
| -rw-r--r-- | net/haproxy/pkg-plist | 1 |
4 files changed, 10 insertions, 70 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 5964d0f1adc3..c8584acda314 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,7 +1,7 @@ PORTNAME= haproxy -DISTVERSION= 2.9.11 +DISTVERSION= 3.0.5 CATEGORIES= net www -MASTER_SITES= http://www.haproxy.org/download/2.9/src/ +MASTER_SITES= http://www.haproxy.org/download/3.0/src/ MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer @@ -17,18 +17,19 @@ USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy default_CONFLICTS_INSTALL= haproxy-lua -lua_CONFLICTS_INSTALL= haproxy +lua_CONFLICTS_INSTALL= haproxy-devel lua_PKGNAMESUFFIX= -lua -CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 haproxy25 haproxy26 haproxy27 +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_i386= USE_LIBATOMIC= MAKE_ARGS_powerpc= USE_LIBATOMIC= OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index fc55c7b5fd56..ce5c3089bc38 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727339246 -SHA256 (haproxy-2.9.11.tar.gz) = 2375281ddf81e201b531d4119c686356d1d37d0afc4bc0e3b6dcec9f2e5568ba -SIZE (haproxy-2.9.11.tar.gz) = 4540689 +TIMESTAMP = 1727339663 +SHA256 (haproxy-3.0.5.tar.gz) = ae38221e85aeba038a725efbef5bfe5e76671ba7959e5eb74c39fd079e5d002e +SIZE (haproxy-3.0.5.tar.gz) = 4698022 diff --git a/net/haproxy/files/patch-src_tools.c b/net/haproxy/files/patch-src_tools.c deleted file mode 100644 index ebdf24de0fc0..000000000000 --- a/net/haproxy/files/patch-src_tools.c +++ /dev/null @@ -1,62 +0,0 @@ -From c03a02388257e21810c534d50a93658e61a83494 Mon Sep 17 00:00:00 2001 -From: Brooks Davis <brooks@one-eyed-alien.net> -Date: Wed, 28 Feb 2024 18:12:40 +0000 -Subject: [PATCH] MINOR: tools: use public interface for FreeBSD - get_exec_path() - -Where possible (FreeBSD 13+), use the public, documented interface to -the ELF auxiliary argument vector: elf_aux_info(). - -__elf_aux_vector is a private interface exported so that the runtime -linker can set its value during process startup and not intended for -public consumption. In FreeBSD 15 it has been removed from libc and -moved to libsys. ---- - src/tools.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/tools.c b/src/tools.c -index e1ba241..4759222 100644 ---- src/tools.c -+++ src/tools.c -@@ -17,9 +17,14 @@ - #endif - - #if defined(__FreeBSD__) -+#include <sys/param.h> -+#if __FreeBSD_version < 1300058 - #include <elf.h> - #include <dlfcn.h> - extern void *__elf_aux_vector; -+#else -+#include <sys/auxv.h> -+#endif - #endif - - #if defined(__NetBSD__) -@@ -5018,6 +5023,7 @@ const char *get_exec_path() - if (execfn && execfn != ENOENT) - ret = (const char *)execfn; - #elif defined(__FreeBSD__) -+#if __FreeBSD_version < 1300058 - Elf_Auxinfo *auxv; - for (auxv = __elf_aux_vector; auxv->a_type != AT_NULL; ++auxv) { - if (auxv->a_type == AT_EXECPATH) { -@@ -5025,6 +5031,14 @@ const char *get_exec_path() - break; - } - } -+#else -+ static char execpath[MAXPATHLEN]; -+ -+ if (execpath[0] == '\0') -+ elf_aux_info(AT_EXECPATH, execpath, MAXPATHLEN); -+ if (execpath[0] != '\0') -+ ret = execpath; -+#endif - #elif defined(__NetBSD__) - AuxInfo *auxv; - for (auxv = _dlauxinfo(); auxv->a_type != AT_NULL; ++auxv) { --- -1.7.10.4 - diff --git a/net/haproxy/pkg-plist b/net/haproxy/pkg-plist index 57768e435751..91f1e23ce14c 100644 --- a/net/haproxy/pkg-plist +++ b/net/haproxy/pkg-plist @@ -15,6 +15,7 @@ sbin/haproxy %%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 |