Compare commits
14 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
556f8c8098 | ||
|
|
4e3b9026cb | ||
|
|
7ac76a3648 | ||
|
|
0652be4b41 | ||
|
|
4ff85ccea6 | ||
|
|
84696434fe | ||
|
|
a1fed137f0 | ||
|
|
7c5626eced | ||
|
|
81faf17ab9 | ||
|
|
5c5f8f6452 | ||
|
|
0dbbc71ff1 | ||
|
|
061cc2d881 | ||
|
|
ef19a92457 | ||
|
|
68dc37bf2e |
2 changed files with 65 additions and 7 deletions
42
mono-6.12.0-fix-process-start.patch
Normal file
42
mono-6.12.0-fix-process-start.patch
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
From 325577feffad1f87b07d92710c0d37c79c5f50a1 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Lucia <rylucia@microsoft.com>
|
||||
Date: Thu, 4 Feb 2021 08:55:48 -0500
|
||||
Subject: [PATCH] Fix early return in Process.Start
|
||||
|
||||
---
|
||||
mono/metadata/w32process-unix.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mono/metadata/w32process-unix.c b/mono/metadata/w32process-unix.c
|
||||
index 663cc6ff5111..d030101aede6 100644
|
||||
--- a/mono/metadata/w32process-unix.c
|
||||
+++ b/mono/metadata/w32process-unix.c
|
||||
@@ -2032,6 +2032,9 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar
|
||||
|
||||
static char *handler;
|
||||
static gunichar2 *handler_utf16;
|
||||
+#ifndef HOST_DARWIN
|
||||
+ gboolean finished = FALSE;
|
||||
+#endif
|
||||
|
||||
if (handler_utf16 == (gunichar2 *)-1) {
|
||||
ret = FALSE;
|
||||
@@ -2057,6 +2060,7 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar
|
||||
if (handler == NULL){
|
||||
handler_utf16 = (gunichar2 *) -1;
|
||||
ret = FALSE;
|
||||
+ finished = TRUE;
|
||||
} else {
|
||||
/* kfmclient needs exec argument */
|
||||
char *old = handler;
|
||||
@@ -2067,9 +2071,8 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar
|
||||
}
|
||||
}
|
||||
MONO_EXIT_GC_SAFE;
|
||||
- if (ret == FALSE){
|
||||
+ if (finished)
|
||||
goto done;
|
||||
- }
|
||||
#endif
|
||||
handler_utf16 = g_utf8_to_utf16 (handler, -1, NULL, NULL, NULL);
|
||||
g_free (handler);
|
||||
30
mono.spec
30
mono.spec
|
|
@ -24,7 +24,7 @@
|
|||
%global xamarinrelease 123
|
||||
Name: mono
|
||||
Version: 6.8.0
|
||||
Release: 2%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Cross-platform, Open Source, .NET development framework
|
||||
|
||||
License: MIT
|
||||
|
|
@ -57,6 +57,9 @@ Patch10: 0001-DocumentationEnumerator.cs-Declare-iface-and-ifaceMe.patch
|
|||
Patch11: 0001-Replace-new-Csharp-features-with-old-ones.patch
|
||||
# Reenable mdoc build. To be upstreamed after Patch 10 and 11
|
||||
Patch12: 0001-Reenable-mdoc.exe-build.patch
|
||||
# fix issue with process start (#1839410)
|
||||
Patch14: mono-6.12.0-fix-process-start.patch
|
||||
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: python%{python3_pkgversion}
|
||||
|
|
@ -347,6 +350,7 @@ pushd external/api-doc-tools
|
|||
%patch11 -p1
|
||||
popd
|
||||
%patch12 -p1
|
||||
%patch14 -p1
|
||||
|
||||
# don't build mono-helix-client which requires the helix-binaries to build
|
||||
sed -i 's|mono-helix-client||g' mcs/tools/Makefile
|
||||
|
|
@ -931,14 +935,26 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt
|
|||
%files complete
|
||||
|
||||
%changelog
|
||||
* Sat Jun 27 2020 Jeff Smith <whydoubt@gmail.com> - 6.8.0-2
|
||||
- Remove wrapper scripts for unbuilt csi.exe and vbc.exe
|
||||
* Mon Feb 22 2021 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-4
|
||||
- backport patch: fix early return in Process.Start (#1839410)
|
||||
|
||||
* Fri Jun 19 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-1
|
||||
- build without bootstrap
|
||||
* Sat Jul 18 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-3
|
||||
- Non-Bootstrap build of Mono 6.8 for Epel 8
|
||||
|
||||
* Fri Jun 19 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-0
|
||||
- upgrade to Mono 6.8.0.123, with a bootstrap build
|
||||
* Fri Jul 17 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-2
|
||||
- Bootstrap build for Mono 6.8 for Epel 8
|
||||
|
||||
* Thu Jul 16 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-9
|
||||
- Upgrade to Mono 6.6.0.166
|
||||
|
||||
* Sat Apr 25 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-8
|
||||
- Non-bootstrap build for Epel 8
|
||||
|
||||
* Sat Apr 25 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-7
|
||||
- another bootstrap build for Epel 8, but this time without the mono-find-provides and mono-find-requires scripts since they are still provided by rpm-build in Epel8
|
||||
|
||||
* Sat Feb 29 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-6
|
||||
- Bootstrap build for Epel 8
|
||||
|
||||
* Mon Feb 03 2020 Robert-André Mauchin <zebob.m@gmail.com> - 6.6.0-5
|
||||
- Reenable mdoc build (#1797360)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue