From b68ff3f2eb117cd7c397326bd25744b839751f4c Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 5 Sep 2020 06:27:35 +0200 Subject: [PATCH 1/4] Ship libMonoSupportW.so --- mono.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mono.spec b/mono.spec index 8617014..1df293d 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 123 Name: mono Version: 6.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -418,7 +418,7 @@ cp external/binary-reference-assemblies/v4.7.1/*.dll %{buildroot}%{_monodir}/4.7 rm -f %{buildroot}%{_libdir}/*.la # remove Windows-only stuff rm -rf %{buildroot}%{_monodir}/*/Mono.Security.Win32* -rm -f %{buildroot}%{_libdir}/libMonoSupportW.* +#rm -f %{buildroot}%{_libdir}/libMonoSupportW.* # remove .a files for libraries that are really only for us rm %{buildroot}%{_libdir}/*.a # remove libgc cruft @@ -547,6 +547,7 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %{_mandir}/man1/lc.1.gz %{_mandir}/man1/mprof-report.1.gz %{_libdir}/libMonoPosixHelper.so* +%{_libdir}/libMonoSupportW.so* %{_libdir}/libmono-native.so* %dir %{_monodir} %dir %{_monodir}/4.5 @@ -936,6 +937,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Fri Aug 21 2020 François Cami - 6.8.0-6 +- Ship libMonoSupportW.so + * Tue Aug 11 2020 Jeff Law - 6.8.0-5 - Disable LTO on ppc64le From 5c6467b8238f3f1e5a55e0f508cb1982d37e2c14 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Wed, 14 Oct 2020 06:42:45 +0200 Subject: [PATCH 2/4] fix issue with conflicts between i686 and x86_64 package (#1853724) --- mono.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 1df293d..354c42c 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 123 Name: mono Version: 6.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -57,6 +57,8 @@ 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 conflicts between i686 and x86_64 package (#1853724) +Patch13: mono-6.6.0-fix-multi-arch-issue.patch BuildRequires: bison BuildRequires: python%{python3_pkgversion} @@ -347,6 +349,7 @@ pushd external/api-doc-tools %patch11 -p1 popd %patch12 -p1 +%patch13 -p1 # don't build mono-helix-client which requires the helix-binaries to build sed -i 's|mono-helix-client||g' mcs/tools/Makefile @@ -491,6 +494,10 @@ install -p -m755 %{SOURCE2} %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/ install -p -m644 %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/fileattrs/ %endif +# remove these files, we are using the files installed in /usr/lib/rpm/ +rm %{buildroot}%{_bindir}/mono-find-requires +rm %{buildroot}%{_bindir}/mono-find-provides + %find_lang mcs %post core @@ -664,8 +671,6 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %mono_bin mkbundle %mono_bin makecert %mono_bin mono-cil-strip -%{_bindir}/mono-find-provides -%{_bindir}/mono-find-requires %{_bindir}/monodis %{_bindir}/monolinker %mono_bin mono-shlib-cop @@ -937,6 +942,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Wed Oct 14 2020 Timotheus Pokorra - 6.8.0-7 +- fix issue with conflicts between i686 and x86_64 package (#1853724) + * Fri Aug 21 2020 François Cami - 6.8.0-6 - Ship libMonoSupportW.so From ff96f6d05d0a5372851d1186e66b5d42bf4bf778 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Wed, 14 Oct 2020 06:50:25 +0200 Subject: [PATCH 3/4] forgot to add the patch mono-6.6.0-fix-multi-arch-issue.patch --- mono-6.6.0-fix-multi-arch-issue.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 mono-6.6.0-fix-multi-arch-issue.patch diff --git a/mono-6.6.0-fix-multi-arch-issue.patch b/mono-6.6.0-fix-multi-arch-issue.patch new file mode 100644 index 0000000..a395d88 --- /dev/null +++ b/mono-6.6.0-fix-multi-arch-issue.patch @@ -0,0 +1,15 @@ +--- a/mono/eglib/eglib-config.h.in 2020-10-12 14:57:46.354634946 +0200 ++++ b/mono/eglib/eglib-config.h.in 2020-10-12 15:00:10.106637683 +0200 +@@ -26,7 +26,11 @@ + typedef @GSIZE@ gsize; + typedef @GSSIZE@ gssize; + +-#define G_GSIZE_FORMAT @GSIZE_FORMAT@ ++#ifdef __i386__ ++#define G_GSIZE_FORMAT "u" ++#else ++#define G_GSIZE_FORMAT "lu" ++#endif + + #if defined (HOST_WATCHOS) + #undef G_BREAKPOINT From d825caf7d4eb7b27c5f99c9956c0960bf2d088be Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 22 Feb 2021 22:28:20 +0100 Subject: [PATCH 4/4] backport patch: fix early return in Process.Start (#1839410) --- mono-6.12.0-fix-process-start.patch | 42 +++++++++++++++++++++++++++++ mono.spec | 8 +++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 mono-6.12.0-fix-process-start.patch diff --git a/mono-6.12.0-fix-process-start.patch b/mono-6.12.0-fix-process-start.patch new file mode 100644 index 0000000..4b9e02c --- /dev/null +++ b/mono-6.12.0-fix-process-start.patch @@ -0,0 +1,42 @@ +From 325577feffad1f87b07d92710c0d37c79c5f50a1 Mon Sep 17 00:00:00 2001 +From: Ryan Lucia +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); diff --git a/mono.spec b/mono.spec index 354c42c..183e6bc 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 123 Name: mono Version: 6.8.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -59,6 +59,8 @@ Patch11: 0001-Replace-new-Csharp-features-with-old-ones.patch Patch12: 0001-Reenable-mdoc.exe-build.patch # fix issue with conflicts between i686 and x86_64 package (#1853724) Patch13: mono-6.6.0-fix-multi-arch-issue.patch +# fix issue with process start (#1839410) +Patch14: mono-6.12.0-fix-process-start.patch BuildRequires: bison BuildRequires: python%{python3_pkgversion} @@ -350,6 +352,7 @@ pushd external/api-doc-tools popd %patch12 -p1 %patch13 -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 @@ -942,6 +945,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Mon Feb 22 2021 Timotheus Pokorra - 6.8.0-8 +- backport patch: fix early return in Process.Start (#1839410) + * Wed Oct 14 2020 Timotheus Pokorra - 6.8.0-7 - fix issue with conflicts between i686 and x86_64 package (#1853724)