From nobody Tue Apr 02 13:12:44 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 4V87bJ6Hd7z5GZPN; Tue, 2 Apr 2024 13:12:44 +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 4V87bJ5TMgz41J1; Tue, 2 Apr 2024 13:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712063564; 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=De1o1vIgMH851i8lt8PwRsxvE0Tyc/CQXUzXcNYvUpY=; b=i/Fjxrfbf2j2VFJFhZI5zA31vVQlPaoppqG6izR6HARjvI1LRMO1mW+4l5YdkBwdtTTteN 6HEOdXxlwKP8LTnhU2RWeEwrCjdU3uKi8wvPxpU7yuG9Wyp0g0WA8N62ghHCizqbdmw4xr qnSwB8r+wWQTkHGErXIlHCUIHwc2SvzYAc4OJKzBAGj7ZqOw6MeeHBPjPRqpTi/wkS0AvC s58/2E1AmZjXwYre1aAfNY6Ioq82TnE54Kkr5znv4BCbHdWwB3abTYdFG0aYaLzwYUbtJr 55IZpgBeuZSVkEWgdupfkjNkNeZZ5O/TI1A1DkSBNhPknF/Lk/LA+9pDCBkscw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712063564; a=rsa-sha256; cv=none; b=HCt7y79IbJ0w2lmQTbDKA0XjIrShgDv7D2XgeSblqwcmSJkl/NXe7DInI6qm7acuNCubtQ ifOklzQ03jxdktjCcu0GLAs4F62CIiLT2VKoT1wfsEmwxIWNxoG3TcJ8BP2JIM2yuUnuTi kayt3ure2ZLzX5vf0FD7r+qSXAnujMl4Dlr81gA05F9mAUvlpkPHkidAzzPvWKLXah8cZO 8SfXxqcGk2JG02JUxFicMPc762tyy4FzCnAM0uRTpsINVqT9utZEvYCf3DVpbhAQwAh7b3 FgnGDHVwKq6i+aEbGVxbEI86Sd1Ov8mlpztdT06tXhsPkPQ6e30dNKo65m2RrQ== 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=1712063564; 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=De1o1vIgMH851i8lt8PwRsxvE0Tyc/CQXUzXcNYvUpY=; b=Pp4+J4ghyyJF2tSoYekGrHfPA7WGzdoaluhI95GrEVlkdFRA4/Df8rwfb/tDK7LJzs4yxi zJTGFrgyX8XliqQofgfqidXqHushO/jJTcm7mkZWRD7LpBNoWZ/iid96BbUCCyJP2hSDBr ZvmTBtdch+ZyPToVXJNrtTOxwM/RG8VXpBCpZ22T5StB6hc5BZePNFp487hJ5/o7He8kif tvcupdKp52fXrnlNhWiVTRUGaZu02WP1lkPutmSVtcMr4xjsa7FHjUTol+NSsgLr4RQ/6p Mc2mQMsNFmoP8P2Z5thmf8suEkZ99QAzw599XSLbQ6SWSS2VGOSfyY/mGO9ROg== 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 4V87bJ547Jzr7t; Tue, 2 Apr 2024 13:12:44 +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 432DCiF4054384; Tue, 2 Apr 2024 13:12:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432DCi9q054381; Tue, 2 Apr 2024 13:12:44 GMT (envelope-from git) Date: Tue, 2 Apr 2024 13:12:44 GMT Message-Id: <202404021312.432DCi9q054381@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: c4a32bb1a84e - main - net/haproxy: update patch from upstream, no functional changes. 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: c4a32bb1a84e718231d47871d6073c18f0471ae4 Auto-Submitted: auto-generated The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4a32bb1a84e718231d47871d6073c18f0471ae4 commit c4a32bb1a84e718231d47871d6073c18f0471ae4 Author: Dmitry Sivachenko AuthorDate: 2024-04-02 13:05:40 +0000 Commit: Dmitry Sivachenko CommitDate: 2024-04-02 13:05:40 +0000 net/haproxy: update patch from upstream, no functional changes. --- net/haproxy/files/patch-src_tools.c | 56 +++++++++++++++++++++++++++-------- net/haproxy25/files/patch-src_tools.c | 56 +++++++++++++++++++++++++++-------- net/haproxy26/files/patch-src_tools.c | 56 +++++++++++++++++++++++++++-------- net/haproxy27/files/patch-src_tools.c | 56 +++++++++++++++++++++++++++-------- net/haproxy28/files/patch-src_tools.c | 56 +++++++++++++++++++++++++++-------- 5 files changed, 215 insertions(+), 65 deletions(-) diff --git a/net/haproxy/files/patch-src_tools.c b/net/haproxy/files/patch-src_tools.c index 598f50cbe965..ebdf24de0fc0 100644 --- a/net/haproxy/files/patch-src_tools.c +++ b/net/haproxy/files/patch-src_tools.c @@ -1,32 +1,62 @@ ---- src/tools.c.orig +From c03a02388257e21810c534d50a93658e61a83494 Mon Sep 17 00:00:00 2001 +From: Brooks Davis +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,7 @@ +@@ -17,9 +17,14 @@ #endif #if defined(__FreeBSD__) --#include --#include --extern void *__elf_aux_vector; ++#include ++#if __FreeBSD_version < 1300058 + #include + #include + extern void *__elf_aux_vector; ++#else +#include ++#endif #endif #if defined(__NetBSD__) -@@ -5018,13 +5016,11 @@ +@@ -5018,6 +5023,7 @@ const char *get_exec_path() 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; -- } -- } ++#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/haproxy25/files/patch-src_tools.c b/net/haproxy25/files/patch-src_tools.c index 598f50cbe965..ebdf24de0fc0 100644 --- a/net/haproxy25/files/patch-src_tools.c +++ b/net/haproxy25/files/patch-src_tools.c @@ -1,32 +1,62 @@ ---- src/tools.c.orig +From c03a02388257e21810c534d50a93658e61a83494 Mon Sep 17 00:00:00 2001 +From: Brooks Davis +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,7 @@ +@@ -17,9 +17,14 @@ #endif #if defined(__FreeBSD__) --#include --#include --extern void *__elf_aux_vector; ++#include ++#if __FreeBSD_version < 1300058 + #include + #include + extern void *__elf_aux_vector; ++#else +#include ++#endif #endif #if defined(__NetBSD__) -@@ -5018,13 +5016,11 @@ +@@ -5018,6 +5023,7 @@ const char *get_exec_path() 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; -- } -- } ++#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/haproxy26/files/patch-src_tools.c b/net/haproxy26/files/patch-src_tools.c index 598f50cbe965..ebdf24de0fc0 100644 --- a/net/haproxy26/files/patch-src_tools.c +++ b/net/haproxy26/files/patch-src_tools.c @@ -1,32 +1,62 @@ ---- src/tools.c.orig +From c03a02388257e21810c534d50a93658e61a83494 Mon Sep 17 00:00:00 2001 +From: Brooks Davis +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,7 @@ +@@ -17,9 +17,14 @@ #endif #if defined(__FreeBSD__) --#include --#include --extern void *__elf_aux_vector; ++#include ++#if __FreeBSD_version < 1300058 + #include + #include + extern void *__elf_aux_vector; ++#else +#include ++#endif #endif #if defined(__NetBSD__) -@@ -5018,13 +5016,11 @@ +@@ -5018,6 +5023,7 @@ const char *get_exec_path() 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; -- } -- } ++#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/haproxy27/files/patch-src_tools.c b/net/haproxy27/files/patch-src_tools.c index 598f50cbe965..ebdf24de0fc0 100644 --- a/net/haproxy27/files/patch-src_tools.c +++ b/net/haproxy27/files/patch-src_tools.c @@ -1,32 +1,62 @@ ---- src/tools.c.orig +From c03a02388257e21810c534d50a93658e61a83494 Mon Sep 17 00:00:00 2001 +From: Brooks Davis +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,7 @@ +@@ -17,9 +17,14 @@ #endif #if defined(__FreeBSD__) --#include --#include --extern void *__elf_aux_vector; ++#include ++#if __FreeBSD_version < 1300058 + #include + #include + extern void *__elf_aux_vector; ++#else +#include ++#endif #endif #if defined(__NetBSD__) -@@ -5018,13 +5016,11 @@ +@@ -5018,6 +5023,7 @@ const char *get_exec_path() 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; -- } -- } ++#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/haproxy28/files/patch-src_tools.c b/net/haproxy28/files/patch-src_tools.c index 598f50cbe965..ebdf24de0fc0 100644 --- a/net/haproxy28/files/patch-src_tools.c +++ b/net/haproxy28/files/patch-src_tools.c @@ -1,32 +1,62 @@ ---- src/tools.c.orig +From c03a02388257e21810c534d50a93658e61a83494 Mon Sep 17 00:00:00 2001 +From: Brooks Davis +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,7 @@ +@@ -17,9 +17,14 @@ #endif #if defined(__FreeBSD__) --#include --#include --extern void *__elf_aux_vector; ++#include ++#if __FreeBSD_version < 1300058 + #include + #include + extern void *__elf_aux_vector; ++#else +#include ++#endif #endif #if defined(__NetBSD__) -@@ -5018,13 +5016,11 @@ +@@ -5018,6 +5023,7 @@ const char *get_exec_path() 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; -- } -- } ++#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 +