net/haproxy-devel: update to version 3.0-dev6

This commit is contained in:
Dmitry Sivachenko 2024-04-02 12:45:46 +00:00
parent 9ef9b13ad9
commit 51ce4b0fb8
4 changed files with 5 additions and 36 deletions

View file

@ -1,5 +1,5 @@
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

View file

@ -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

View file

@ -1,32 +0,0 @@
--- src/tools.c.orig
+++ src/tools.c
@@ -17,9 +17,7 @@
#endif
#if defined(__FreeBSD__)
-#include <elf.h>
-#include <dlfcn.h>
-extern void *__elf_aux_vector;
+#include <sys/auxv.h>
#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) {

View file

@ -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