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

msys2-3.3.6: backports from 3.4 #197

Merged
merged 6 commits into from
Feb 11, 2024
Merged

Conversation

dscho
Copy link
Collaborator

@dscho dscho commented Feb 11, 2024

As pointed out by @jeremyd2019 in git-for-windows/msys2-runtime#61 (comment), the backports I did in Git for Windows are also desirable here, even if MSYS2 is not half as reliant on v3.3.* as Git for Windows is (because it needs to support 32-bit builds until 2029).

tyan0 and others added 6 commits February 11, 2024 13:37
https://cygwin.com/pipermail/cygwin/2022-December/252737.html

If the less is started from non-cygwin shell and window size is
changed, it will hang-up when quitting. The cause of the proglem is
that less uses longjump() in signal handler. If the signal handler
is called while cygwin is acquiring the mutex, cygwin loses the
chance to release mutex. With this patch, the mutex is released
just before calling kill_pgrp() and re-acquired when kill_pgrp()
returns.

[ma: dropped changes to release notes file from patch for backport]

Reported-by: Gregory Mason <[email protected]>
Signed-off-by: Takashi Yano <[email protected]>
Signed-off-by: Matthias Aßhauer <[email protected]>
Reportedly Windows 11 build 25*** from Insider changed the current
working directory logic a bit, and Cygwin's "magic" (or:
"technologically sufficiently advanced") code needs to be adjusted
accordingly.

This fixes git-for-windows/git#4429

Signed-off-by: Johannes Schindelin <[email protected]>
…nvironment variables to Windows form for native Win32 applications.

Don't memchr behind end, it+1
…nvironment variables to Windows form for native Win32 applications.

Don't memchr behind end, it2
GCC 13 (and maybe 12, too), warn about pointers used after `free()`.

In `nlsfuncs.cc`, they are used on purpose, though, in
`rebase_locale_buf()`, to adjust pointers that were invalidated because
of a `realloc()` (not a `free()`, actually).

So let's shush GCC about those instances.

However, we must be careful only to do that with GCC >= 12 because older
versions would complain about an unknown warning...

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho self-assigned this Feb 11, 2024
@dscho dscho marked this pull request as ready for review February 11, 2024 12:54
Copy link
Member

@jeremyd2019 jeremyd2019 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@dscho dscho merged commit 3cba82a into msys2-3_3_6-release Feb 11, 2024
2 checks passed
@dscho dscho deleted the backports-from-3.4 branch February 11, 2024 21:17
dscho added a commit to dscho/MSYS2-packages that referenced this pull request Feb 11, 2024
This corresponds to msys2/msys2-runtime#197.

Signed-off-by: Johannes Schindelin <[email protected]>
dscho added a commit to dscho/MSYS2-packages that referenced this pull request Feb 11, 2024
This corresponds to msys2/msys2-runtime#197.

Signed-off-by: Johannes Schindelin <[email protected]>
dscho added a commit to dscho/MSYS2-packages that referenced this pull request Feb 11, 2024
This corresponds to msys2/msys2-runtime#197.

Signed-off-by: Johannes Schindelin <[email protected]>
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.

5 participants