| Message ID | dc1be561d66161495c91667e02c816e6d48880ac.1702320987.git.baruch@tkos.co.il |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/libcurl: fix build with GnuTLS and no verbose | expand |
On Mon, 11 Dec 2023 20:56:27 +0200 Baruch Siach via buildroot <buildroot@buildroot.org> wrote: > diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch > new file mode 100644 > index 000000000000..cc7f89f9762c > --- /dev/null > +++ b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch > @@ -0,0 +1,33 @@ > +From 3b1ed6573bbb95831e5acd01ecac95f2cb2b9a60 Mon Sep 17 00:00:00 2001 > +From: Baruch Siach <baruch@tkos.co.il> > +Date: Mon, 11 Dec 2023 20:45:01 +0200 > +Subject: [PATCH] gnutls: fix build with --disable-verbose > + > +infof() parameters must be defined event with --disable-verbose since > +commit dac293cfb702 ("lib: apache style infof and trace > +macros/functions"). > + > +Signed-off-by: Baruch Siach <baruch@tkos.co.il> > +Upstream: https://github.com/curl/curl/pull/12505 From what I can see at https://github.com/curl/curl/pull/12505, it seems like your patch has been merged, but you changed it compared to what you submitted here. Could you submit an updated patch to Buildroot, which adds the upstream applied version of your fix? Thanks a lot! Thomas
diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch new file mode 100644 index 000000000000..cc7f89f9762c --- /dev/null +++ b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch @@ -0,0 +1,33 @@ +From 3b1ed6573bbb95831e5acd01ecac95f2cb2b9a60 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Mon, 11 Dec 2023 20:45:01 +0200 +Subject: [PATCH] gnutls: fix build with --disable-verbose + +infof() parameters must be defined event with --disable-verbose since +commit dac293cfb702 ("lib: apache style infof and trace +macros/functions"). + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +Upstream: https://github.com/curl/curl/pull/12505 +--- + lib/vtls/gtls.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index f42b6d6691de..411def67f454 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -833,8 +833,10 @@ Curl_gtls_verifyserver(struct Curl_easy *data, + gnutls_cipher_get(session), + gnutls_mac_get(session)); + ++#ifndef CURL_DISABLE_VERBOSE_STRINGS + infof(data, "SSL connection using %s / %s", + gnutls_protocol_get_name(version), ptr); ++#endif + + /* This function will return the peer's raw certificate (chain) as sent by + the peer. These certificates are in raw format (DER encoded for +-- +2.42.0 +
A change of data logging introduced in version 8.5.0 broke the build. Add a patch to fix that. Fixes: http://autobuild.buildroot.net/results/c5b996696333c4ff1392dbb8e6b0edc9c5322ee4/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- ...nutls-fix-build-with-disable-verbose.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch