net/haproxy24: GC obsoleted haproxy version.

10 files changed, 0 insertions, 640 deletions

diff --git a/net/Makefile b/net/Makefile
index 1ea3316a6f94..83bf22fd264a 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -246,7 +246,6 @@
     SUBDIR += hanstunnel
     SUBDIR += haproxy
     SUBDIR += haproxy-devel
-    SUBDIR += haproxy24
     SUBDIR += haproxy26
     SUBDIR += haproxy28
     SUBDIR += haproxy30
diff --git a/net/haproxy24/Makefile b/net/haproxy24/Makefile
deleted file mode 100644
index 7b4ee4c3f7ee..000000000000
--- a/net/haproxy24/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-PORTNAME=	haproxy
-DISTVERSION=	2.4.35
-CATEGORIES=	net www
-PKGNAMESUFFIX=	24
-MASTER_SITES=	http://www.haproxy.org/download/2.4/src/
-
-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]}
-
-default_CONFLICTS_INSTALL=	haproxy-lua
-lua_CONFLICTS_INSTALL=		haproxy
-lua_PKGNAMESUFFIX=		24-lua
-
-CONFLICTS_INSTALL=	haproxy haproxy-devel haproxy26 haproxy28
-
-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}" \
-		${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 SPCRE
-DPCRE_DESC=		Link dynamically
-SPCRE_DESC=		Link statically
-DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
-PROMEX_DESC=		Enable Prometheus exporter
-OPTIONS_DEFAULT=	SPCRE OPENSSL PROMEX
-
-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 <bsd.port.pre.mk>
-
-.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}${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 <bsd.port.post.mk>
diff --git a/net/haproxy24/distinfo b/net/haproxy24/distinfo
deleted file mode 100644
index 38bb4543151b..000000000000
--- a/net/haproxy24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1778529912
-SHA256 (haproxy-2.4.35.tar.gz) = 931ad4de3f036ac8f18a5f1370460aed69dc5b0b0d3fa228dddb7211970fb44a
-SIZE (haproxy-2.4.35.tar.gz) = 3688410
diff --git a/net/haproxy24/files/haproxy.in b/net/haproxy24/files/haproxy.in
deleted file mode 100644
index e13077b01dc3..000000000000
--- a/net/haproxy24/files/haproxy.in
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: haproxy
-# REQUIRE: DAEMON LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable haproxy:
-#
-# haproxy_enable (bool):	default: "NO"
-#				Set to "YES" to enable haproxy
-# haproxy_pidfile (str):	default: /var/run/haproxy.pid
-#				Set to the full path of the pid file
-# haproxy_config (str):		default: %%PREFIX%%/etc/haproxy.conf
-#				Set to the full path of the config file
-# haproxy_flags (str):		default: Autogenerated using pidfile and config options
-#				Set to override with your own options
-# haproxy_profiles (str):	default: empty
-# Set to space-separated list of profiles: for each profile separate haproxy
-# process will be spawned, with haproxy-${profile}.conf config file.
-# You can override default pidfile and config file for each profile with
-# haproxy_${profile}_config and haproxy_${profile}_pidfile.
-
-. /etc/rc.subr
-
-name="haproxy"
-rcvar=haproxy_enable
-command="%%PREFIX%%/sbin/haproxy"
-extra_commands="reload configtest hardstop hardreload softreload"
-reload_cmd="haproxy_reload"
-hardreload_cmd="haproxy_reload"
-hardreload_precmd="def_hardreload_option"
-softreload_cmd="haproxy_reload"
-softreload_precmd="def_softreload_option"
-stop_cmd="haproxy_stop"
-hardstop_cmd="haproxy_stop"
-hardstop_precmd="def_hardstop_signal"
-
-: ${haproxy_enable:="NO"}
-: ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"}
-: ${haproxy_socket:="/var/run/${name}/socket"}
-pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"}
-
-def_hardreload_option()
-{
-    reload_opt="-st"
-}
-
-def_softreload_option()
-{
-    reload_opt="-x ${haproxy_socket} -sf"
-}
-
-def_hardstop_signal()
-{
-    sig_stop="TERM"
-}
-
-load_rc_config $name
-
-is_valid_profile() {
-    local profile
-    for profile in $haproxy_profiles; do
-        if [ "$profile" = "$1" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-if [ -n "$2" ]; then
-    profile=$2
-    if ! is_valid_profile $profile; then
-        echo "$0: no such profile ($profile) defined in ${name}_profiles."
-        exit 1
-    fi
-    eval haproxy_config="\${haproxy_${profile}_config:-%%PREFIX%%/etc/haproxy-${profile}.conf}"
-    eval haproxy_fib="\${haproxy_${profile}_fib:${haproxy_fib}}"
-    eval pidfile="\${haproxy_${profile}_pidfile:-/var/run/haproxy-${profile}.pid}"
-else
-    if [ "x${haproxy_profiles}" != "x" -a "x$1" != "x" ]; then
-        for profile in ${haproxy_profiles}; do
-            echo "===> ${name} profile: ${profile}"
-            %%PREFIX%%/etc/rc.d/haproxy $1 ${profile}
-            retcode="$?"
-            if [ ${retcode} -ne 0 ]; then
-                failed="${profile} (${retcode}) ${failed:-}"
-            else
-                success="${profile} ${success:-}"
-            fi
-        done
-        exit 0
-    fi
-fi
-
-: ${haproxy_flags:="-q -f ${haproxy_config} -p ${pidfile}"}
-configtest_cmd="$command -c -f $haproxy_config"
-start_precmd="$command -q -c -f $haproxy_config"
-required_files=$haproxy_config
-sig_stop=SIGUSR1
-reload_opt="-sf"
-
-haproxy_reload()
-{
-	${command} -q -c -f ${haproxy_config}
-	if [ $? -ne 0 ]; then
-	    err 1 "Error found in ${haproxy_config} - not reloading current process!"
-	fi
-	rc_pid=$(check_pidfile ${pidfile} ${command})
-	if [ $rc_pid ]; then
-		${command} ${haproxy_flags} $reload_opt $(cat ${pidfile})
-	else
-		_run_rc_notrunning
-		return 1
-	fi
-}
-
-haproxy_stop()
-{
-	rc_pid=$(check_pidfile ${pidfile} ${command})
-	if [ $rc_pid ]; then
-		rc_pid=$(cat ${pidfile})
-		kill -$sig_stop $rc_pid
-		wait_for_pids $rc_pid
-	else
-		_run_rc_notrunning
-		return 1
-	fi
-}
-
-run_rc_command "$1"
diff --git a/net/haproxy24/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat b/net/haproxy24/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat
deleted file mode 100644
index e6f0291f8c89..000000000000
--- a/net/haproxy24/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat
+++ /dev/null
@@ -1,78 +0,0 @@
-From ce5ca630697a069ffbd81169663e5dbeb554179a Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@1wt.eu>
-Date: Wed, 6 Oct 2021 11:23:32 +0200
-Subject: CLEANUP: servers: do not include openssl-compat
-
-This is exactly the same as for listeners, servers only include
-openssl-compat to provide the SSL_CTX type to use as two pointers to
-contexts, and to detect if NPN, ALPN, and cipher suites are supported,
-and save up to 5 pointers in the ssl_ctx struct if not supported. This
-is pointless, as these ones have all been supported for about a decade,
-and including this file comes with a long dependency chain that impacts
-lots of other files. The ctx was made a void*.
-
-Now the build time was significantly reduced, from 9.2 to 8.1 seconds,
-thanks to opensslconf.h being included "only" 456 times instead of 2424
-previously!
-
-The total number of lines of code compiled was reduced by 15%.
-
-(cherry picked from commit 340ef2502eae2a37781e460d3590982c0e437fbd)
-[wt: this is backported to get rid of the painful #ifdef around SSL
- fields that regularly break backports]
-Signed-off-by: Willy Tarreau <w@1wt.eu>
----
- include/haproxy/server-t.h | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
-index 429195388..32b649bf3 100644
---- include/haproxy/server-t.h
-+++ include/haproxy/server-t.h
-@@ -35,9 +35,7 @@
- #include <haproxy/freq_ctr-t.h>
- #include <haproxy/listener-t.h>
- #include <haproxy/obj_type-t.h>
--#include <haproxy/openssl-compat.h>
- #include <haproxy/resolvers-t.h>
--#include <haproxy/ssl_sock-t.h>
- #include <haproxy/stats-t.h>
- #include <haproxy/task-t.h>
- #include <haproxy/thread-t.h>
-@@ -341,7 +339,7 @@ struct server {
- #ifdef USE_OPENSSL
- 	char *sni_expr;             /* Temporary variable to store a sample expression for SNI */
- 	struct {
--		SSL_CTX *ctx;
-+		void *ctx;
- 		struct {
- 			unsigned char *ptr;
- 			int size;
-@@ -353,9 +351,7 @@ struct server {
- 		__decl_thread(HA_RWLOCK_T lock); /* lock the cache and SSL_CTX during commit operations */
- 
- 		char *ciphers;			/* cipher suite to use if non-null */
--#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
- 		char *ciphersuites;			/* TLS 1.3 cipher suite to use if non-null */
--#endif
- 		int options;			/* ssl options */
- 		int verify;			/* verify method (set of SSL_VERIFY_* flags) */
- 		struct tls_version_filter methods;	/* ssl methods */
-@@ -363,14 +359,10 @@ struct server {
- 		char *ca_file;			/* CAfile to use on verify */
- 		char *crl_file;			/* CRLfile to use on verify */
- 		struct sample_expr *sni;        /* sample expression for SNI */
--#ifdef OPENSSL_NPN_NEGOTIATED
- 		char *npn_str;                  /* NPN protocol string */
- 		int npn_len;                    /* NPN protocol string length */
--#endif
--#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
- 		char *alpn_str;                 /* ALPN protocol string */
- 		int alpn_len;                   /* ALPN protocol string length */
--#endif
- 	} ssl_ctx;
- #ifdef USE_QUIC
- 	struct quic_transport_params quic_params; /* QUIC transport parameters */
--- 
-2.28.0
-
diff --git a/net/haproxy24/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se b/net/haproxy24/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se
deleted file mode 100644
index 8e5064790cba..000000000000
--- a/net/haproxy24/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se
+++ /dev/null
@@ -1,163 +0,0 @@
-From 6d395b766fd816cf2e7feea3286a689e635e35f9 Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@1wt.eu>
-Date: Wed, 6 Oct 2021 14:48:37 +0200
-Subject: CLEANUP: server: always include the storage for SSL settings
-
-The SSL stuff in struct server takes less than 3% of it and requires
-lots of annoying ifdefs in the code just to take care of the cases
-where the field is absent. Let's get rid of this and stop including
-openssl-compat from server.c to detect NPN and ALPN capabilities.
-
-This reduces the total LoC by another 0.4%.
-
-(cherry picked from commit 80527bcb9d51d8506c8e7ef95de9c30d30722719)
-Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
-(cherry picked from commit 5279e61cee28b7012619906048edd2c8a9c89059)
-[wt: backported again to fix backport issues around SSL fields. It
- previously broke due to the absence of 'CLEANUP: servers: do not
- include openssl-compat' that was backported now]
-Signed-off-by: Willy Tarreau <w@1wt.eu>
----
- include/haproxy/server-t.h |  2 --
- src/server.c               | 21 +++------------------
- 2 files changed, 3 insertions(+), 20 deletions(-)
-
-diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
-index 32b649bf3..90485f0c4 100644
---- include/haproxy/server-t.h
-+++ include/haproxy/server-t.h
-@@ -336,7 +336,6 @@ struct server {
- 	unsigned int init_addr_methods;		/* initial address setting, 3-bit per method, ends at 0, enough to store 10 entries */
- 	enum srv_log_proto log_proto;		/* used proto to emit messages on server lines from ring section */
- 
--#ifdef USE_OPENSSL
- 	char *sni_expr;             /* Temporary variable to store a sample expression for SNI */
- 	struct {
- 		void *ctx;
-@@ -367,7 +366,6 @@ struct server {
- #ifdef USE_QUIC
- 	struct quic_transport_params quic_params; /* QUIC transport parameters */
- 	struct eb_root cids;        /* QUIC connections IDs. */
--#endif
- #endif
- 	struct resolv_srvrq *srvrq;		/* Pointer representing the DNS SRV requeest, if any */
- 	struct list srv_rec_item;		/* to attach server to a srv record item */
-diff --git a/src/server.c b/src/server.c
-index 54637dc9c..ea3271957 100644
---- src/server.c
-+++ src/server.c
-@@ -1943,7 +1943,6 @@ const char *server_parse_maxconn_change_request(struct server *sv,
- 	return NULL;
- }
- 
--#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
- static struct sample_expr *srv_sni_sample_parse_expr(struct server *srv, struct proxy *px,
-                                                      const char *file, int linenum, char **err)
- {
-@@ -1983,7 +1982,6 @@ static int server_parse_sni_expr(struct server *newsrv, struct proxy *px, char *
- 
- 	return 0;
- }
--#endif
- 
- static void display_parser_err(const char *file, int linenum, char **args, int cur_arg, int err_code, char **err)
- {
-@@ -2080,14 +2078,11 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
- 	if (src->ssl_ctx.methods.max)
- 		srv->ssl_ctx.methods.max = src->ssl_ctx.methods.max;
- 
--#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
- 	if (src->ssl_ctx.ciphersuites != NULL)
- 		srv->ssl_ctx.ciphersuites = strdup(src->ssl_ctx.ciphersuites);
--#endif
- 	if (src->sni_expr != NULL)
- 		srv->sni_expr = strdup(src->sni_expr);
- 
--#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
- 	if (src->ssl_ctx.alpn_str) {
- 		srv->ssl_ctx.alpn_str = malloc(src->ssl_ctx.alpn_len);
- 		if (srv->ssl_ctx.alpn_str) {
-@@ -2096,8 +2091,7 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
- 			srv->ssl_ctx.alpn_len = src->ssl_ctx.alpn_len;
- 		}
- 	}
--#endif
--#ifdef OPENSSL_NPN_NEGOTIATED
-+
- 	if (src->ssl_ctx.npn_str) {
- 		srv->ssl_ctx.npn_str = malloc(src->ssl_ctx.npn_len);
- 		if (srv->ssl_ctx.npn_str) {
-@@ -2106,7 +2100,6 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
- 			srv->ssl_ctx.npn_len = src->ssl_ctx.npn_len;
- 		}
- 	}
--#endif
- }
- #endif
- 
-@@ -2463,13 +2456,13 @@ static int _srv_parse_tmpl_init(struct server *srv, struct proxy *px)
- 
- 		srv_settings_cpy(newsrv, srv, 1);
- 		srv_prepare_for_resolution(newsrv, srv->hostname);
--#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-+
- 		if (newsrv->sni_expr) {
- 			newsrv->ssl_ctx.sni = srv_sni_sample_parse_expr(newsrv, px, NULL, 0, NULL);
- 			if (!newsrv->ssl_ctx.sni)
- 				goto err;
- 		}
--#endif
-+
- 		/* append to list of servers available to receive an hostname */
- 		if (newsrv->srvrq)
- 			LIST_APPEND(&newsrv->srvrq->attached_servers, &newsrv->srv_rec_item);
-@@ -2488,9 +2481,7 @@ static int _srv_parse_tmpl_init(struct server *srv, struct proxy *px)
-  err:
- 	_srv_parse_set_id_from_prefix(srv, srv->tmpl_info.prefix, srv->tmpl_info.nb_low);
- 	if (newsrv)  {
--#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
- 		release_sample_expr(newsrv->ssl_ctx.sni);
--#endif
- 		free_check(&newsrv->agent);
- 		free_check(&newsrv->check);
- 		LIST_DELETE(&newsrv->global_list);
-@@ -2748,7 +2739,6 @@ static int _srv_parse_kw(struct server *srv, char **args, int *cur_arg,
- 	return err_code;
- }
- 
--#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
- /* This function is first intended to be used through parse_server to
-  * initialize a new server on startup.
-  */
-@@ -2767,7 +2757,6 @@ static int _srv_parse_sni_expr_init(char **args, int cur_arg,
- 
- 	return ret;
- }
--#endif
- 
- /* Server initializations finalization.
-  * Initialize health check, agent check and SNI expression if enabled.
-@@ -2780,9 +2769,7 @@ static int _srv_parse_finalize(char **args, int cur_arg,
-                                struct server *srv, struct proxy *px,
-                                int parse_flags, char **errmsg)
- {
--#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
- 	int ret;
--#endif
- 
- 	if (srv->do_check && srv->trackit) {
- 		memprintf(errmsg, "unable to enable checks and tracking at the same time!");
-@@ -2795,10 +2782,8 @@ static int _srv_parse_finalize(char **args, int cur_arg,
- 		return ERR_ALERT | ERR_FATAL;
- 	}
- 
--#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
- 	if ((ret = _srv_parse_sni_expr_init(args, cur_arg, srv, px, errmsg)) != 0)
- 		return ret;
--#endif
- 
- 	/* A dynamic server is disabled on startup. It must not be counted as
- 	 * an active backend entry.
--- 
-2.28.0
-
diff --git a/net/haproxy24/files/patch-src-tools.c b/net/haproxy24/files/patch-src-tools.c
deleted file mode 100644
index ebdf24de0fc0..000000000000
--- a/net/haproxy24/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/haproxy24/files/patch-src_cpuset.c b/net/haproxy24/files/patch-src_cpuset.c
deleted file mode 100644
index 42f04b37e6f6..000000000000
--- a/net/haproxy24/files/patch-src_cpuset.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/cpuset.c.orig	2021-12-23 16:47:51 UTC
-+++ src/cpuset.c
-@@ -53,7 +53,11 @@ void ha_cpuset_and(struct hap_cpuset *dst, const struc
- 	CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset);
- 
- #elif defined(CPUSET_USE_FREEBSD_CPUSET)
-+#if defined(CPU_ALLOC)
-+	CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset);
-+#else
- 	CPU_AND(&dst->cpuset, &src->cpuset);
-+#endif
- 
- #elif defined(CPUSET_USE_ULONG)
- 	dst->cpuset &= src->cpuset;
diff --git a/net/haproxy24/pkg-descr b/net/haproxy24/pkg-descr
deleted file mode 100644
index da6bc0e2c38c..000000000000
--- a/net/haproxy24/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-HAProxy is a free, very fast and reliable solution offering high
-availability, load balancing, and proxying for TCP and HTTP-based
-applications. It is particularly suited for web sites crawling under
-very high loads while needing persistence or Layer7 processing.
diff --git a/net/haproxy24/pkg-plist b/net/haproxy24/pkg-plist
deleted file mode 100644
index 41afc2bfcdd0..000000000000
--- a/net/haproxy24/pkg-plist
+++ /dev/null
@@ -1,110 +0,0 @@
-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%%/close-options.txt
-%%PORTDOCS%%%%DOCSDIR%%/coding-style.txt
-%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
-%%PORTDOCS%%%%DOCSDIR%%/cookie-options.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/binding-possibilities.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-reuse.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-sharing.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/dynamic-buffers.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/entities-v2.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http2.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/rate-shaping.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/haproxy.1
-%%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-api.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.fig
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/fd-migration.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/filters.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/htx-api.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/initcalls.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/naming.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/notes-layers.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia
-%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf
-%%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig
-%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/sequence.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/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%%/acl-content-sw.cfg
-%%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%%/option-http_proxy.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quick-test.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks4.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg