Some fixes for curl 8.11.0 #199
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
|
I actually expect the very same PR build problem here, too. |
|
dscho
force-pushed
the
curl-8.11.0-fixes
branch
from
869731a
to
fef1820
Compare
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 <[email protected]>
dscho
force-pushed
the
curl-8.11.0-fixes
branch
from
fef1820
to
d58b04a
Compare
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 <[email protected]>
This was referenced Nov 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main motivation for this is to fix the PR build problem encountered in #198. The symptom:
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
curlpackage of Git for Windows. While at it, this also drops a couple of unnecessary deviations from the MSYS2 project'scurlpackage definition.