From nobody Sat Mar 2 17:38:22 2024 X-Original-To: dev-commits-ports-all@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 4TnBy72rrQz5Cdmj; Sat, 2 Mar 2024 17:38:23 +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 4TnBy660JQz4Gm9; Sat, 2 Mar 2024 17:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709401102; 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=Ln6Rug2cI42DghJfOFTwby5wCBIyWp4i0ob9J3yGLvQ=; b=xg1kw5n4Sw8CXl3VibegTfUa2v/pget0kRYFPsPVbgnhYciEu6YipAQzaogOqf8LhQ94dy ULWdbG3K6mWJ3EyO/LJrt2FDYo/ahvAuly4ioDVt28hKn31e9Iv7W2rbiMKvGvRD7XvSXP uxI8YE7WQtx53oURmLt36w4YeaIdNta5ITWxv+Q5yIJ0OlWPOK3XoVHWhhOTEJ3hbZ0Q8M m2mb2AuqxaXgNu5OJmUHLYP6s+VNg7AvAw88TJNmZRntYE+9qjMB0UzRVVAgsWq/W2mNZh /AwK0whx1Y9J5dbq4zXaszPc1wxXIVygTmYyrQrqWrTvFT6DYwTiV0M+9V6kXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709401102; a=rsa-sha256; cv=none; b=aaV1bJEz3uchMVLzwXdcoaW+eL6tfKCOeiX7NyzNyEONwgUtZHhgE04gRmWKsu/6DX1FP8 hrIq4B2GE20Cq4MnR2ZAyCQfAxfq6DFPL41iAnUfFf4QM2lf8co4+UjTHeohFfnj2NkZh+ afoVjqH9pvAUnIQoh6164M88Si0BKbmnDkfUnH8QzdYe86J56ZZireHpuOCFo90Q7leYAQ G/w5IZ9Gj1iSZTtl93k1e0C7eCnNyGhofUm7QS8/vl+3PgLMQ18A2tDXgJgNXv4f0TQHNZ Jpi7ytK5gfHjL38HmUnvgVHgdQ0e9IvJJts3NH8b6rkcUCQ9D0e7CXD/5Jrflw== 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=1709401102; 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=Ln6Rug2cI42DghJfOFTwby5wCBIyWp4i0ob9J3yGLvQ=; b=sZFgwuwamx6fBMa5SnhnELGi4rnHHYW+5fa4YKtP61YyT/rvOKxsIk0+NPD9kr313MXY4u SPL/1sl6kHrhkjHdQJWwySWXNZBQrY0rEF+osZUXF7cQS0djlp4A4no0A4TagE3vZQwH+f 06Q8qIhVEe214XuGWNLWS1TK0lX6Z+l8y/7uElRZQMm/0mQFfXDcrAyoBzT+qGuVUr69Yv aCYcD8Eo4Q/TAHMbDd6rlNKAl/Pd4Z1hhH9nLbbxY8VL3ZNrQ1QOZ1dOJBy4OSpiL1QqcE S9U2oKCNuKWY8w9XQPoxrwqhZ5QMZCqMfzrtN2OOdKINem4KtW9zKIf+mbG8SA== 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 4TnBy65TdLz1JZB; Sat, 2 Mar 2024 17:38:22 +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 422HcMAs020052; Sat, 2 Mar 2024 17:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 422HcMXq020049; Sat, 2 Mar 2024 17:38:22 GMT (envelope-from git) Date: Sat, 2 Mar 2024 17:38:22 GMT Message-Id: <202403021738.422HcMXq020049@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: d4a8c16f3c4b - main - net/haproxy: fix build on recent -current. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: d4a8c16f3c4b322708444d6f245d15d12bfc5c8b Auto-Submitted: auto-generated The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4a8c16f3c4b322708444d6f245d15d12bfc5c8b commit d4a8c16f3c4b322708444d6f245d15d12bfc5c8b Author: Dmitry Sivachenko AuthorDate: 2024-03-02 17:37:03 +0000 Commit: Dmitry Sivachenko CommitDate: 2024-03-02 17:38:16 +0000 net/haproxy: fix build on recent -current. Submitted by: brooks --- net/haproxy-devel/files/patch-src_tools.c | 32 +++++++++++++++++++++++++++++++ net/haproxy/files/patch-src_tools.c | 32 +++++++++++++++++++++++++++++++ net/haproxy25/files/patch-src_tools.c | 32 +++++++++++++++++++++++++++++++ net/haproxy26/files/patch-src_tools.c | 32 +++++++++++++++++++++++++++++++ net/haproxy27/files/patch-src_tools.c | 32 +++++++++++++++++++++++++++++++ net/haproxy28/files/patch-src_tools.c | 32 +++++++++++++++++++++++++++++++ 6 files changed, 192 insertions(+) diff --git a/net/haproxy-devel/files/patch-src_tools.c b/net/haproxy-devel/files/patch-src_tools.c new file mode 100644 index 000000000000..598f50cbe965 --- /dev/null +++ b/net/haproxy-devel/files/patch-src_tools.c @@ -0,0 +1,32 @@ +--- 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/files/patch-src_tools.c b/net/haproxy/files/patch-src_tools.c new file mode 100644 index 000000000000..598f50cbe965 --- /dev/null +++ b/net/haproxy/files/patch-src_tools.c @@ -0,0 +1,32 @@ +--- 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/haproxy25/files/patch-src_tools.c b/net/haproxy25/files/patch-src_tools.c new file mode 100644 index 000000000000..598f50cbe965 --- /dev/null +++ b/net/haproxy25/files/patch-src_tools.c @@ -0,0 +1,32 @@ +--- 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/haproxy26/files/patch-src_tools.c b/net/haproxy26/files/patch-src_tools.c new file mode 100644 index 000000000000..598f50cbe965 --- /dev/null +++ b/net/haproxy26/files/patch-src_tools.c @@ -0,0 +1,32 @@ +--- 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/haproxy27/files/patch-src_tools.c b/net/haproxy27/files/patch-src_tools.c new file mode 100644 index 000000000000..598f50cbe965 --- /dev/null +++ b/net/haproxy27/files/patch-src_tools.c @@ -0,0 +1,32 @@ +--- 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/haproxy28/files/patch-src_tools.c b/net/haproxy28/files/patch-src_tools.c new file mode 100644 index 000000000000..598f50cbe965 --- /dev/null +++ b/net/haproxy28/files/patch-src_tools.c @@ -0,0 +1,32 @@ +--- 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) {