From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Chris Packham <judge.packham@gmail.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/syslog-ng: fix libressl build
Date: Sat, 20 Aug 2022 10:30:27 +0200 [thread overview]
Message-ID: <20220820083027.GF2167049@scaer> (raw)
In-Reply-To: <20220817223612.218840-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2022-08-18 00:36 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure with libressl raised since bump to
> version 3.37.1 in commit 2546a31ccef6fed6c3bd40d6a1f13f4d0898cea9 and
> https://github.com/syslog-ng/syslog-ng/commit/c7ba645918480da06b9e065c62ebd630312b0c7f:
>
> /nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_client_sigalgs_list'
> /nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_sigalgs_list'
>
> Fixes:
> - http://autobuild.buildroot.org/results/84cf9f6a0f6de831a685b73c42eab868952c8b15
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...-lib-tlscontext.c-fix-libressl-build.patch | 85 +++++++++++++++++++
> 1 file changed, 85 insertions(+)
> create mode 100644 package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch
>
> diff --git a/package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch b/package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch
> new file mode 100644
> index 0000000000..2c438627a4
> --- /dev/null
> +++ b/package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch
> @@ -0,0 +1,85 @@
> +From 6f93484cea81ff8d45df213d5d2b4cffc4eadcad Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sat, 16 Jul 2022 18:09:25 +0200
> +Subject: [PATCH] lib/tlscontext.c: fix libressl build
> +
> +Fix the following build failure with libressl raised since version
> +3.37.1 and
> +https://github.com/syslog-ng/syslog-ng/commit/c7ba645918480da06b9e065c62ebd630312b0c7f:
> +
> +/nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_client_sigalgs_list'
> +/nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_sigalgs_list'
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/84cf9f6a0f6de831a685b73c42eab868952c8b15
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/syslog-ng/syslog-ng/pull/4081]
> +---
> + cmake/openssl_functions.cmake | 4 +++-
> + configure.ac | 2 ++
> + lib/tlscontext.c | 4 ++++
> + syslog-ng-config.h.in | 2 ++
> + 4 files changed, 11 insertions(+), 1 deletion(-)
> +
> +diff --git a/cmake/openssl_functions.cmake b/cmake/openssl_functions.cmake
> +index afd7b96bfe..319dcc2e23 100644
> +--- a/cmake/openssl_functions.cmake
> ++++ b/cmake/openssl_functions.cmake
> +@@ -42,7 +42,9 @@ function (openssl_set_defines)
> + DH_set0_pqg
> + BN_get_rfc3526_prime_2048
> + SSL_CTX_set_num_tickets
> +- SSL_CTX_set_ciphersuites)
> ++ SSL_CTX_set_ciphersuites
> ++ SSL_CTX_set1_sigalgs_list
> ++ SSL_CTX_set1_client_sigalgs_list)
> +
> + foreach (symbol ${symbol_list})
> + string(TOUPPER ${symbol} SYMBOL_UPPERCASE)
> +diff --git a/configure.ac b/configure.ac
> +index 8cfab2251e..ecffb84f06 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1055,6 +1055,8 @@ AC_CHECK_DECLS([ASN1_STRING_get0_data], [], [], [[#include <openssl/asn1.h>]])
> + AC_CHECK_DECLS([DH_set0_pqg], [], [], [[#include <openssl/dh.h>]])
> + AC_CHECK_DECLS([BN_get_rfc3526_prime_2048], [], [], [[#include <openssl/bn.h>]])
> + AC_CHECK_DECLS([SSL_CTX_set_num_tickets],[], [], [[#include <openssl/ssl.h>]])
> ++AC_CHECK_DECLS([SSL_CTX_set1_sigalgs_list],[], [], [[#include <openssl/ssl.h>]])
> ++AC_CHECK_DECLS([SSL_CTX_set1_client_sigalgs_list],[], [], [[#include <openssl/ssl.h>]])
> +
> + CPPFLAGS="$CPPFLAGS_SAVE"
> +
> +diff --git a/lib/tlscontext.c b/lib/tlscontext.c
> +index ddde21dcaf..dedcf1ce5a 100644
> +--- a/lib/tlscontext.c
> ++++ b/lib/tlscontext.c
> +@@ -598,11 +598,15 @@ tls_context_setup_cipher_suite(TLSContext *self)
> + static gboolean
> + tls_context_setup_sigalgs(TLSContext *self)
> + {
> ++#if SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_SIGALGS_LIST
> + if (self->sigalgs && !SSL_CTX_set1_sigalgs_list(self->ssl_ctx, self->sigalgs))
> + return FALSE;
> ++#endif
> +
> ++#if SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_CLIENT_SIGALGS_LIST
> + if (self->client_sigalgs && !SSL_CTX_set1_client_sigalgs_list(self->ssl_ctx, self->client_sigalgs))
> + return FALSE;
> ++#endif
> +
> + return TRUE;
> + }
> +diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in
> +index 1817deea50..004b0a7be6 100644
> +--- a/syslog-ng-config.h.in
> ++++ b/syslog-ng-config.h.in
> +@@ -57,6 +57,8 @@
> + #cmakedefine01 SYSLOG_NG_HAVE_DECL_ASN1_STRING_GET0_DATA
> + #cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_GET0_PARAM
> + #cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET_CIPHERSUITES
> ++#cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_SIGALGS_LIST
> ++#cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_CLIENT_SIGALGS_LIST
> + #cmakedefine01 SYSLOG_NG_HAVE_DECL_X509_STORE_CTX_GET0_CERT
> + #cmakedefine01 SYSLOG_NG_HAVE_DECL_X509_GET_EXTENSION_FLAGS
> + #cmakedefine01 SYSLOG_NG_HAVE_DECL_DH_SET0_PQG
> --
> 2.35.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-08-20 8:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 22:36 [Buildroot] [PATCH 1/1] package/syslog-ng: fix libressl build Fabrice Fontaine
2022-08-20 8:30 ` Yann E. MORIN [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-01 10:00 Fabrice Fontaine
2023-10-01 14:38 ` Peter Korsgaard
2023-10-13 14:38 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220820083027.GF2167049@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=fontaine.fabrice@gmail.com \
--cc=judge.packham@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.