Date: Tue, 2 Apr 2024 12:59:50 GMT From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 51ce4b0fb8ec - main - net/haproxy-devel: update to version 3.0-dev6 Message-ID: <202404021259.432Cxo3Q020298@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=51ce4b0fb8ec64617642fa860ff278c7e2826dc7 commit 51ce4b0fb8ec64617642fa860ff278c7e2826dc7 Author: Dmitry Sivachenko <demon@FreeBSD.org> AuthorDate: 2024-04-02 12:45:46 +0000 Commit: Dmitry Sivachenko <demon@FreeBSD.org> CommitDate: 2024-04-02 12:59:42 +0000 net/haproxy-devel: update to version 3.0-dev6 --- net/haproxy-devel/Makefile | 2 +- net/haproxy-devel/distinfo | 6 +++--- net/haproxy-devel/files/patch-src_tools.c | 32 ------------------------------- net/haproxy-devel/pkg-plist | 1 + 4 files changed, 5 insertions(+), 36 deletions(-) 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,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 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 <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) { 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 @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404021259.432Cxo3Q020298>