Merge pull request #4656 from lazka/msys2-runtime-update-ldd

msys2-runtime: Update (ldd hang fix)

msys2-runtime/0039-Cygwin-disable-high-entropy-VA-for-ldh.patch

@@ -0,0 +1,28 @@
+From 28d69fba269dd4a9f4281f8af7c2775292241e8b Mon Sep 17 00:00:00 2001
+From: Jeremy Drake via Cygwin-patches <cygwin-patches@cygwin.com>
+Date: Tue, 28 May 2024 10:19:22 -0700
+Subject: [PATCH 39/N] Cygwin: disable high-entropy VA for ldh
+
+If ldd is run against a DLL which links to the Cygwin DLL, ldh will end
+up loading the Cygwin DLL dynamically, much like cygcheck or strace.
+
+Addresses: https://cygwin.com/pipermail/cygwin/2024-May/255991.html
+Fixes: 60675f1a7eb2 ("Cygwin: decouple shared mem regions from Cygwin DLL")
+Reviewed-by: Ken Brown <kbrown@cornell.edu>, Takashi Yano <takashi.yano@nifty.ne.jp>
+Signed-off-by: Jeremy Drake <cygwin@jdrake.com>
+---
+ winsup/utils/mingw/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
+index b89d894..07b9f92 100644
+--- a/winsup/utils/mingw/Makefile.am
++++ b/winsup/utils/mingw/Makefile.am
+@@ -53,6 +53,7 @@ cygcheck_LDADD = -lz -lwininet -lshlwapi -lpsapi -lntdll
+ cygwin_console_helper_SOURCES = cygwin-console-helper.cc
+ 
+ ldh_SOURCES = ldh.cc
++ldh_LDFLAGS = ${AM_LDFLAGS} -Wl,--disable-high-entropy-va
+ 
+ strace_SOURCES = \
+ 	path.cc \

msys2-runtime/PKGBUILD

@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=3.5.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
 url="https://www.cygwin.com/"
@@ -66,8 +66,9 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
         0035-Optionally-disallow-empty-environment-values-again.patch
         0036-build_env-respect-the-MSYS-environment-variable.patch
         0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
-        0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch)
-sha256sums=('SKIP'
+        0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch
+        0039-Cygwin-disable-high-entropy-VA-for-ldh.patch)
+sha256sums=('e395966060e0cf901f3cd4190b0b189bface69a2fec6ba93748387b61aa7dd5c'
             'a0de51b420ad7fc67b007adf4159e065a5beefc56e66735827fc9f39364e045f'
             '857830ffd5fe820e90e0f3b49b72c1f31c3c929be845e178eb3e6c7352181e18'
             '35723eb517f034508d09e0974e70db99a003aa863509bb8b69d3feec87e47fb9'
@@ -105,7 +106,8 @@ sha256sums=('SKIP'
             '39fd77a2968bd39fd13daea5cd3b30e1cf3aa714e24aa3408ef634f81d39467a'
             'd472029276932e7df3da56347d1d09d5bd422f9f96f6f607fe8a28362ebe4a1b'
             '4683b3dca58af0fef7f704b3bcb199da1ddbce874e5fc69bfaaced9cc76d6be9'
-            '853c6c41da7e188811dae2b3df9251ce84dbb81b39c8632173556132fcbd96c1')
+            '853c6c41da7e188811dae2b3df9251ce84dbb81b39c8632173556132fcbd96c1'
+            'd038eec988844df56ac2ed183dddc73c3f4296c2606c818f2521d40eb2fa7500')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -180,7 +182,8 @@ prepare() {
   0035-Optionally-disallow-empty-environment-values-again.patch \
   0036-build_env-respect-the-MSYS-environment-variable.patch \
   0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch \
-  0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch
+  0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch \
+  0039-Cygwin-disable-high-entropy-VA-for-ldh.patch
 }
 
 build() {