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-6.6.0-python3.patch b/mono-6.6.0-python3.patch index d59f785..2f67982 100644 --- a/mono-6.6.0-python3.patch +++ b/mono-6.6.0-python3.patch @@ -50,4 +50,4 @@ diff -up mono-5.18.1.0/mono/mini/Makefile.in.py3 mono-5.18.1.0/mono/mini/Makefil +GENMDESC_PRG = python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir) LLVM_AOT_RUNTIME_OPTS = $(if $(LLVM),--llvm,) @AMD64_FALSE@LLVM_AOT_COMPILER_OPTS = - @AMD64_TRUE@LLVM_AOT_COMPILER_OPTS = $(if $(LLVM),"=llvmllc=-mcpu=generic -mattr=+sse3",) + @AMD64_TRUE@LLVM_AOT_COMPILER_OPTS = $(if $(LLVM),llvmllc=-mattr=+sse3,) diff --git a/mono.spec b/mono.spec index a67af7a..dfcdb06 100644 --- a/mono.spec +++ b/mono.spec @@ -20,10 +20,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 161 +%global xamarinrelease 123 Name: mono -Version: 6.6.0 -Release: 5%{?dist} +Version: 6.8.0 +Release: 2%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -56,6 +56,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} @@ -77,8 +80,8 @@ BuildRequires: perl-Getopt-Long %if 0%{bootstrap} # for bootstrap, use bundled monolite and reference assemblies instead of local mono %else -BuildRequires: mono-core >= 6.6 -BuildRequires: mono-devel >= 6.6 +BuildRequires: mono-core >= 6.8 +BuildRequires: mono-devel >= 6.8 %endif # JIT only available on these: @@ -348,6 +351,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 @@ -446,9 +450,11 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/mono-nunit.pc # remove dmcs because it requires the .net 4.0 sdk but we only deliver 4.5 with Fedora (#1294967) rm -f %{buildroot}%{_bindir}/dmcs -# remove csc +# remove wrapper scripts for roslyn-binaries rm -f %{buildroot}%{_bindir}/csc rm -f %{buildroot}%{_bindir}/csc-dim +rm -f %{buildroot}%{_bindir}/csi +rm -f %{buildroot}%{_bindir}/vbc # drop prj2make because the binary is not built anymore rm -f %{buildroot}%{_bindir}/prj2make @@ -477,10 +483,13 @@ cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.5-api && cd - # as requested in bug 1704861; we have had that link in F29 with Mono 4.8 as well. cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.0-api && cd - +# for Epel7, we don't deliver these files, they are still provided by rpm-build-4.11.3-43.el7.x86_64 +%if 0%{?el7}%{?el8} == 0 # rpm helper scripts mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs/ install -p -m755 %{SOURCE2} %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/ install -p -m644 %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/fileattrs/ +%endif %find_lang mcs @@ -515,11 +524,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %mono_bin ikdasm %mono_bin lc %{_bindir}/gacutil2 -%{_bindir}/csi %{_bindir}/mcs %{_monodir}/4.5/mcs.* %{_monodir}/4.5/mono-api-diff.* -%{_bindir}/vbc %mono_bin mozroots %mono_bin pdb2mdb %mono_bin setreg @@ -659,7 +666,7 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %{_bindir}/mono-find-provides %{_bindir}/mono-find-requires %{_bindir}/monodis -%mono_bin monolinker +%{_bindir}/monolinker %mono_bin mono-shlib-cop %mono_bin mono-xmltool %mono_bin monop @@ -746,8 +753,13 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %{_includedir}/mono-2.0/mono/metadata/*.h %{_includedir}/mono-2.0/mono/utils/*.h %{_includedir}/mono-2.0/mono/cil/opcode.def + +# for Epel7, we don't deliver these files, they are still provided by rpm-build-4.11.3-43.el7.x86_64 +%if 0%{?el7}%{?el8} == 0 %{_prefix}/lib/rpm/mono-find-* %{_prefix}/lib/rpm/fileattrs/mono.attr +%endif + %{_bindir}/aprofutil %mono_bin aprofutil %{_mandir}/man1/aprofutil.1.gz @@ -924,6 +936,21 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Mon Feb 22 2021 Timotheus Pokorra - 6.8.0-2 +- backport patch: fix early return in Process.Start (#1839410) + +* Sat Jul 18 2020 Timotheus Pokorra - 6.8.0-1 +- Non-Bootstrap build for Mono 6.8 for Epel 7 + +* Sat Jul 18 2020 Timotheus Pokorra - 6.8.0-0 +- Bootstrap build for Mono 6.8 for Epel 7 + +* Thu Jul 16 2020 Timotheus Pokorra - 6.6.0-7 +- Non-Bootstrap build for Epel 7 + +* Wed Jul 15 2020 Timotheus Pokorra - 6.6.0-6 +- Bootstrap build for Epel 7 + * Mon Feb 03 2020 Robert-André Mauchin - 6.6.0-5 - Reenable mdoc build (#1797360) diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file diff --git a/sources b/sources index d8bf139..64edd14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186 +SHA512 (mono-6.8.0.123.tar.xz) = f702d1ee3a7e8b1a028de02fe6f3ab78e1c5171a547c37db7e934c33533984f2847636476407ad46daeb150640136d6bb28c12c9482c1806997df2dfd7a839f1