From nobody Tue Apr 02 12:59:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V87JQ4c1yz5GYQQ; Tue, 2 Apr 2024 12:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V87JQ48P1z3xT3; Tue, 2 Apr 2024 12:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712062790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HjxoWkCQQbHds5s/7Jc77qhXzWiNRSlxgnPt/mQ0IyQ=; b=cCeiSCQ6VKtFovp4sjHwDGddYGHyFwC9vzneqYdJpEJvugKHiccpQqk9hHXuoQsaa1j7AQ QC6enuFXESXmH5w6TlIJPLI5aAvSZ5CwFeXu6a07WYVip+5ZBDWGReHjZqtXC+RVF3aTpg kLBdCGqm5UrlZJDo3tIoHvM6RdUx2/2gZT/OXBfT/yST2s67hIFOBVjdmd8rki63dkKetl oD/GIalyFx3ciyn5fqaBfGAytfOT4ShajCQRholA5bgvipHv3VI2v1ZRnuVA/xqlhBggD9 Up56nchBJmOkdYNiCIYELtLl8SiCB/wPz7M70h2osNHSLYlhgcZKky6Y3ucj/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712062790; a=rsa-sha256; cv=none; b=Jjh1zUSQ/jTr+p2Ioux9S2IFtynPsqmllb2ibadl8uO3ghIv/BCu17IlRR6E2nNvnZFfi4 KG1BHkZhoPykptya5m2T42/jhIItJsn/Pr9K5fox8UmgdBSSlhYYLkR9LRe1Z9iwvQLqVC n6TutiNxz6oCNIz5F5bQhZJYOqIi9el/6uiCRFg0TG0r6bKUFfRgIMNINk8nY9x5OzgpkJ mW9UEiJT3MTyVwJE86QUcm/zGhPNdOPlX+w6TTEjm3vIdfqOMgs+MZqBhiciteJwgJENKk Y0sZ3oRwVwAJKUcOdulawe5hRONAVRAggKFJZIu9ZBxlq+9fqUg612FyaTfmBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712062790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HjxoWkCQQbHds5s/7Jc77qhXzWiNRSlxgnPt/mQ0IyQ=; b=HQP7bf6PQZTq7l+qvjyrQ14evRLSn216OU3uo8CNPBU7ZC9D1FpGCrcUmdNIzCzbKQN3yY UC79hDJIEutFSOVUHbTTk8oYmzB6XaAdCWgbutctaMZbhbdtZ0Lev5ikFB/2KWKM0lamiN wl8ctHqsCt+e3eL89/DOQ/1dlVio4Y3F5wli0ygxJFWmO8G+rvsrQy1fC5kpJLqC4ae6Re svDuVheS9qyveEJK0VEQU1TKihqTcOMGtpXS1d9zljXxIQ9hENIpc/rf46Q0vapR5oKTe5 y6hzGNAXmD2KuTBpjTo6AmHSPRp+CdWhXTIqqZPHg3VIo25zbXM2NLelXM3ZFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V87JQ3dZkzqc9; Tue, 2 Apr 2024 12:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432CxoYi020301; Tue, 2 Apr 2024 12:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432Cxo3Q020298; Tue, 2 Apr 2024 12:59:50 GMT (envelope-from git) Date: Tue, 2 Apr 2024 12:59:50 GMT Message-Id: <202404021259.432Cxo3Q020298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Sivachenko Subject: git: 51ce4b0fb8ec - main - net/haproxy-devel: update to version 3.0-dev6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: demon X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51ce4b0fb8ec64617642fa860ff278c7e2826dc7 Auto-Submitted: auto-generated The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=51ce4b0fb8ec64617642fa860ff278c7e2826dc7 commit 51ce4b0fb8ec64617642fa860ff278c7e2826dc7 Author: Dmitry Sivachenko AuthorDate: 2024-04-02 12:45:46 +0000 Commit: Dmitry Sivachenko 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 --#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 @@ -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