mingw-w64-curl: update to 8.20.0#195
Merged
Merged
Conversation
Drop the 70bb0db76720c152f6a55bbe12cf162b55cb105b.patch backport (curl/curl@70bb0db): the schannel renegotiation timeout fix it carried is now part of curl 8.20.0 itself, so the backport is no longer needed. Re-export the remaining four patches against curl-8.20.0 with stable commit OIDs while we are touching the series. Per AGENTS.md, that is done by importing the 8.19.0 and 8.20.0 tarballs into a throw-away git repository via `contrib/fast-import/import-tars.perl`, `git am`-ing the patches, running git rebase --empty=drop --onto curl-8.20.0 curl-8.19.0 (which drops the schannel-timeout commit automatically once its diff turns empty against 8.20.0), forcing committer = author with git fast-export --no-data refs/tags/curl-8.20.0 HEAD | awk '/^author /{a=$0} /^committer /{$0="committer " substr(a,8)} 1' | git fast-import --force --quiet and finally `git format-patch --no-signature curl-8.20.0..HEAD` back into the package directory. The single manual conflict, in `lib/curl_config.h.in`, is resolved by placing `CURL_BINDIR` before `CURL_CA_BUNDLE` instead of after `CURL_CA_SEARCH_SAFE`: the file is otherwise alphabetical, and upstream's recently-added `CURL_DEBUG_GLOBAL_MEM` was placed in alphabetical order, so anchoring our addition the same way avoids re-encountering the conflict on future curl bumps. Assisted-by: Claude Opus 4.7 (1M context)(Internal only) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
mingw-w64-curl-8.20.0
branch
from
b168f70 to
b8c80a6
Compare
Member
|
/deploy The i686/x86_64 and the arm64 workflow runs were started. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This closes git-for-windows/git#6219