All of lore.kernel.org
 help / color / mirror / Atom feed
From: Baruch Siach via buildroot <buildroot@buildroot.org>
To: Bernd Kuhls <bernd@kuhls.net>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 2/2] package/kodi: Fix build with curl 8.16.0
Date: Thu, 11 Sep 2025 07:54:02 +0300	[thread overview]
Message-ID: <87plbxfv2t.fsf@tarshish> (raw)
In-Reply-To: <20250910200608.2114508-2-bernd@kuhls.net> (Bernd Kuhls's message of "Wed, 10 Sep 2025 22:06:08 +0200")

Hi Bernd,

Thanks for the libcurl security bump and this fix. A couple of comments
below.

On Wed, Sep 10 2025, Bernd Kuhls wrote:
> curl 8.16.0 bumped the enums to long, see
> https://github.com/curl/curl/pull/18054
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/kodi/0002-curl-8.16.0.patch | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>  create mode 100644 package/kodi/0002-curl-8.16.0.patch
>
> diff --git a/package/kodi/0002-curl-8.16.0.patch b/package/kodi/0002-curl-8.16.0.patch
> new file mode 100644
> index 0000000000..ad71f339ca
> --- /dev/null
> +++ b/package/kodi/0002-curl-8.16.0.patch
> @@ -0,0 +1,21 @@
> +Fix build with curl 8.16.0
> +
> +Downloaded from
> +https://gitlab.alpinelinux.org/alpine/aports/-/commit/106a02411488e3f71b9f2085a4a857e4be27b9ea
> +
> +Upstream: https://github.com/xbmc/xbmc/pull/27224

It would be nicer to apply this libcurl compatibility fix patch before
libcurl version bump for the sake of bisectability. I believe this patch
should to be compatible with libcurl older than 8.16.0.

I guess you can't use upstream pull request patch because it doesn't
apply to kodi version we have. This patch description should say that.

Thanks,
baruch

> +
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> +
> +--- a/xbmc/filesystem/CurlFile.cpp
> ++++ b/xbmc/filesystem/CurlFile.cpp
> +@@ -44,7 +44,7 @@ using namespace std::chrono_literals;
> + 
> + #define FITS_INT(a) (((a) <= INT_MAX) && ((a) >= INT_MIN))
> + 
> +-curl_proxytype proxyType2CUrlProxyType[] = {
> ++long proxyType2CUrlProxyType[] = {
> +     CURLPROXY_HTTP,   CURLPROXY_SOCKS4,          CURLPROXY_SOCKS4A,
> +     CURLPROXY_SOCKS5, CURLPROXY_SOCKS5_HOSTNAME, CURLPROXY_HTTPS,
> + };
> +

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      reply	other threads:[~2025-09-11  4:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-10 20:06 [Buildroot] [PATCH 1/2] package/libcurl: security bump version to 8.16.0 Bernd Kuhls
2025-09-10 20:06 ` [Buildroot] [PATCH 2/2] package/kodi: Fix build with curl 8.16.0 Bernd Kuhls
2025-09-11  4:54   ` Baruch Siach via buildroot [this message]

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=87plbxfv2t.fsf@tarshish \
    --to=buildroot@buildroot.org \
    --cc=baruch@tkos.co.il \
    --cc=bernd@kuhls.net \
    /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.