Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes for curl 8.11.0 #199

Merged
merged 5 commits into from
Nov 14, 2024
Merged

Conversation

dscho
Copy link
Member

@dscho dscho commented Nov 14, 2024

The main motivation for this is to fix the PR build problem encountered in #198. The symptom:

assertion "s->init == 0xbee51da" failed: file "dynbuf.c", line 242, function: Curl_dyn_ptr

Turns out that this was reported and diagnosed as a curl bug, and fixed via msys2#5005 (thanks @lazka for figuring this all out for me!).

This here PR ports that fix to the curl package of Git for Windows. While at it, this also drops a couple of unnecessary deviations from the MSYS2 project's curl package definition.

vszakats and others added 4 commits November 14, 2024 09:00
Cherry-picked from a31a085 (curl: update homepage, 2024-06-11) and
amended with the `license` update that slipped into 24ece8b (curl:
Update to 7.87.0, 2022-12-21).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
For some reason, 43cf462 (curl: Fix dependencies, 2017-09-07) forgot
to adjust the `--with-libidn` option in the `./configure` call. This was
fixed in 14e490a (curl: update to 7.77.0, 2021-07-20), as well as
other adjustments to the `./configure` options. Let's cherry-pick these
particular changes.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
They dropped the old GPG key of Daniel's, and they use `-v` with
`autoreconf`; Let's do that, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Nov 14, 2024

I actually expect the very same PR build problem here, too.

@dscho
Copy link
Member Author

dscho commented Nov 14, 2024

I actually expect the very same PR build problem here, too.

And so it is.

@dscho dscho force-pushed the curl-8.11.0-fixes branch from 869731a to fef1820 Compare November 14, 2024 09:47
With libcurl v8.11.0, `git fetch` fails (curiously only with the MSYS
version, the MINGW version seems to have no problems in Git for Windows'
CI builds).

This would cause problems e.g. in the `CI-Build` step of the PR builds
in MSYS2-packages, which by itself would prevent an upgrade of libcurl
to a working version! Catch 22.

Work around that by detecting the situation and force-downgrading in
that case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the curl-8.11.0-fixes branch from fef1820 to d58b04a Compare November 14, 2024 09:59
@dscho
Copy link
Member Author

dscho commented Nov 14, 2024

/deploy curl

The x86_64 and the i686 workflow runs were started.

dscho added a commit to git-for-windows/git-for-windows-automation that referenced this pull request Nov 14, 2024
In order to deploy the bug fix for curl, we need to work around the bug
that this fix addresses... because the bug breaks the deployment of all
MSYS2-packages, including `libcurl`.

Let's work around this by downgrading `libcurl` specifically for this
deployment.

See git-for-windows/MSYS2-packages#199 for more
details.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Nov 14, 2024

/deploy curl

The x86_64 and the i686 workflow runs were started.

@dscho dscho merged commit 4dc37bf into git-for-windows:main Nov 14, 2024
5 checks passed
@dscho dscho deleted the curl-8.11.0-fixes branch November 14, 2024 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants