From 802ab4c9c4e31060bb49a83b80bc6d3cfa995fd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:22:35 +0000 Subject: [PATCH 01/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 216fbed..c96a699 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 123 Name: mono Version: 6.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -931,6 +931,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 6.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jun 27 2020 Jeff Smith - 6.8.0-2 - Remove wrapper scripts for unbuilt csi.exe and vbc.exe From 7bb159e055a5b871ec306ddc5b87690c4d51782d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:33:33 +0000 Subject: [PATCH 02/45] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index c96a699..c407cd0 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 123 Name: mono Version: 6.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -931,6 +931,10 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 6.8.0-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 6.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 20b54d5424dfd7c8ce0c7f15648fdfc15daf1b71 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 11 Aug 2020 11:21:13 -0600 Subject: [PATCH 03/45] Temporarily disable LTO on ppc64le --- mono.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index c407cd0..8617014 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 123 Name: mono Version: 6.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -374,6 +374,11 @@ cd external/binary-reference-assemblies && mv v4.7.1 v4.7.1.tobuild && ln -s /us %endif %build +# This package fails to build with LTO on ppc64le. Root cause analysis has not been +# done. For now disable LTO +%ifarch ppc64le +%define _lto_cflags %{nil} +%endif %ifarch s390x # either mono C code relies on undefined behaviour or gcc is even more broken than earlier RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 /-O1 /g') @@ -931,6 +936,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Tue Aug 11 2020 Jeff Law - 6.8.0-5 +- Disable LTO on ppc64le + * Sat Aug 01 2020 Fedora Release Engineering - 6.8.0-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 11306815fb14337ea345e9f265275c5d57e93c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Fri, 21 Aug 2020 15:44:47 +0200 Subject: [PATCH 04/45] 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 93230c36afe803486162fd3c9ad2b3c01c7d7969 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 22 Sep 2020 14:50:27 +0200 Subject: [PATCH 05/45] typo fix --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 1df293d..f599854 100644 --- a/mono.spec +++ b/mono.spec @@ -96,7 +96,7 @@ metadata access libraries. %package core Summary: The Mono CIL runtime, suitable for running .NET code Requires: libgdiplus -#dependency requiered for install +#dependency required for install Provides: mono(System.Collections.Immutable) = 1.2.0.0 Provides: mono(System.Diagnostics.StackTrace) = 4.0.2.0 Provides: mono(System.IO) = 4.0.10.0 From 15530f7a7405a8f4ff50a227b6a8b13b573f6f7e Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 28 Sep 2020 21:50:41 +0200 Subject: [PATCH 06/45] Upgrade to Mono 6.10.0.104, with bootstrap build --- mono-6.6.0-python3.patch | 53 ---------------------------------------- mono.spec | 16 ++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 61 deletions(-) delete mode 100644 mono-6.6.0-python3.patch diff --git a/mono-6.6.0-python3.patch b/mono-6.6.0-python3.patch deleted file mode 100644 index 2f67982..0000000 --- a/mono-6.6.0-python3.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/scripts/mono-heapviz -+++ b/scripts/mono-heapviz -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - # Generate a heap visualization for SGen from the heap dump written by - # mono if the MONO_GC_DEBUG is set to something like -diff -up mono-5.18.1.0/mono/mini/genmdesc.py.py3 mono-5.18.1.0/mono/mini/genmdesc.py ---- mono-5.18.1.0/mono/mini/genmdesc.py.py3 2019-03-28 06:56:35.765851125 -0400 -+++ mono-5.18.1.0/mono/mini/genmdesc.py 2019-03-28 06:56:44.805851125 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - # - # This tool is used to generate the cpu-.h files used by the JIT. The input is the -diff -up mono-5.18.1.0/mono/mini/Makefile.am.in.py3 mono-5.18.1.0/mono/mini/Makefile.am.in ---- mono-5.18.1.0/mono/mini/Makefile.am.in.py3 2019-03-28 07:01:10.975851125 -0400 -+++ mono-5.18.1.0/mono/mini/Makefile.am.in 2019-03-28 07:01:35.395851125 -0400 -@@ -780,7 +780,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i - - GENMDESC_OPTS= - --GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir) -+GENMDESC_PRG=python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir) - - cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py - $(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md -diff -up mono-5.18.1.0/mono/mini/Makefile.am.py3 mono-5.18.1.0/mono/mini/Makefile.am ---- mono-5.18.1.0/mono/mini/Makefile.am.py3 2019-03-28 07:06:02.235851125 -0400 -+++ mono-5.18.1.0/mono/mini/Makefile.am 2019-03-28 07:06:06.385851125 -0400 -@@ -780,7 +780,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i - - GENMDESC_OPTS= - --GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir) -+GENMDESC_PRG=python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir) - - cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py - $(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md -diff -up mono-5.18.1.0/mono/mini/Makefile.in.py3 mono-5.18.1.0/mono/mini/Makefile.in ---- mono-5.18.1.0/mono/mini/Makefile.in.py3 2019-03-28 07:06:12.805851125 -0400 -+++ mono-5.18.1.0/mono/mini/Makefile.in 2019-03-28 07:06:21.575851125 -0400 -@@ -1287,7 +1287,7 @@ libmonoincludedir = $(includedir)/mono-$ - libmonoinclude_HEADERS = jit.h - CSFLAGS = -unsafe -nowarn:0219,0169,0414,0649,0618 - GENMDESC_OPTS = --GENMDESC_PRG = python $(srcdir)/genmdesc.py $(target_define) $(srcdir) -+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=-mattr=+sse3,) diff --git a/mono.spec b/mono.spec index f599854..d43cf83 100644 --- a/mono.spec +++ b/mono.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %bcond_with bootstrap %ifarch s390x @@ -21,10 +22,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 123 +%global xamarinrelease 104 Name: mono -Version: 6.8.0 -Release: 6%{?dist} +Version: 6.10.0 +Release: 0%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -49,7 +50,6 @@ Patch5: mono-6.6.0-roslyn-binaries.patch Patch6: mono-5.18.0-use-mcs.patch Patch7: mono-5.18.0-reference-assemblies-fix.patch Patch8: mono-5.18.0-sharpziplib-parent-path-traversal.patch -Patch9: mono-6.6.0-python3.patch # Fix NRE bug in api-doc-tools: https://github.com/mono/api-doc-tools/pull/464 Patch10: 0001-DocumentationEnumerator.cs-Declare-iface-and-ifaceMe.patch # Replace new Csharp features with old to allow mdoc to build @@ -76,8 +76,8 @@ BuildRequires: perl-Getopt-Long # which results in not deleting the binaries in %%prep. %if %{without bootstrap} -BuildRequires: mono-core >= 6.8 -BuildRequires: mono-devel >= 6.8 +BuildRequires: mono-core >= 6.10 +BuildRequires: mono-devel >= 6.10 %endif # JIT only available on these: @@ -341,7 +341,6 @@ not install anything from outside the mono source (XSP, mono-basic, etc.). %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 pushd external/api-doc-tools %patch10 -p1 %patch11 -p1 @@ -937,6 +936,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Mon Sep 28 2020 Timotheus Pokorra - 6.10.0-0 +* Upgrade to Mono 6.10.0.104 + * Fri Aug 21 2020 François Cami - 6.8.0-6 - Ship libMonoSupportW.so diff --git a/sources b/sources index 64edd14..50b7b43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.8.0.123.tar.xz) = f702d1ee3a7e8b1a028de02fe6f3ab78e1c5171a547c37db7e934c33533984f2847636476407ad46daeb150640136d6bb28c12c9482c1806997df2dfd7a839f1 +SHA512 (mono-6.10.0.104.tar.xz) = 73b853e9fc9af2e1bf5e45f7accb8893dd7e48f9723f74b03d99ea11cf565e2c5bb2d6ae4c81c7e7be0cdfa489016da909ed7b12808c8f84d9d25e33e1cb9874 From 0f8111185046002f2dbdd34581ab7ba80e7ae3de Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 28 Sep 2020 23:06:21 +0200 Subject: [PATCH 07/45] build without bootstrap --- mono.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mono.spec b/mono.spec index d43cf83..977eca8 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %bcond_with bootstrap %ifarch s390x From 246fff246775367d60a5b8b5728dad9d90121b85 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 12 Oct 2020 16:32:38 +0200 Subject: [PATCH 08/45] fix issue with conflicts between i686 and x86_64 package (#1853724) --- mono-6.6.0-fix-multi-arch-issue.patch | 15 +++++++++++++++ mono.spec | 16 ++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) 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 diff --git a/mono.spec b/mono.spec index 977eca8..a45a038 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 104 Name: mono Version: 6.10.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -56,6 +56,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} @@ -345,6 +347,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 @@ -489,6 +492,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 @@ -662,8 +669,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 @@ -935,8 +940,11 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Mon Oct 12 2020 Timotheus Pokorra - 6.10.0-1 +- fix issue with conflicts between i686 and x86_64 package (#1853724) + * Mon Sep 28 2020 Timotheus Pokorra - 6.10.0-0 -* Upgrade to Mono 6.10.0.104 +- Upgrade to Mono 6.10.0.104 * Fri Aug 21 2020 François Cami - 6.8.0-6 - Ship libMonoSupportW.so From 4f8062c20dac79647201ed48fa818313c918a585 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Tue, 27 Oct 2020 20:20:36 +0100 Subject: [PATCH 09/45] bootstrap build for Mono 6.12.0.90 --- mono.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mono.spec b/mono.spec index a45a038..6640ad7 100644 --- a/mono.spec +++ b/mono.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %bcond_with bootstrap %ifarch s390x @@ -21,10 +22,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 104 +%global xamarinrelease 90 Name: mono -Version: 6.10.0 -Release: 1%{?dist} +Version: 6.12.0 +Release: 0%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -940,6 +941,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Tue Oct 27 2020 Timotheus Pokorra - 6.12.0-0 +- Upgrade to Mono 6.12.0.90 + * Mon Oct 12 2020 Timotheus Pokorra - 6.10.0-1 - fix issue with conflicts between i686 and x86_64 package (#1853724) diff --git a/sources b/sources index 50b7b43..95a23cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.10.0.104.tar.xz) = 73b853e9fc9af2e1bf5e45f7accb8893dd7e48f9723f74b03d99ea11cf565e2c5bb2d6ae4c81c7e7be0cdfa489016da909ed7b12808c8f84d9d25e33e1cb9874 +SHA512 (mono-6.12.0.90.tar.xz) = 955fc4a41bb575c2a6e4a61f0f6c22c88db213092657963c29eb5c33d54c628697e4c27246e3ea19e9ff2143c0e013b58c24b9c3da6dddfe87debb5ea9c1da26 From 5befd2eb309980ce2109ef21df688361200d8bd6 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Tue, 27 Oct 2020 21:09:43 +0100 Subject: [PATCH 10/45] non bootstrap build for Mono 6.12 --- mono.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mono.spec b/mono.spec index 6640ad7..934237e 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %bcond_with bootstrap %ifarch s390x From 3444b593359187cf4cd8b27ca06e7790be51b844 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Tue, 27 Oct 2020 21:29:56 +0100 Subject: [PATCH 11/45] non-bootstrap Build-Requires mono>=6.12 --- mono.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mono.spec b/mono.spec index 934237e..8fc8181 100644 --- a/mono.spec +++ b/mono.spec @@ -77,8 +77,8 @@ BuildRequires: perl-Getopt-Long # which results in not deleting the binaries in %%prep. %if %{without bootstrap} -BuildRequires: mono-core >= 6.10 -BuildRequires: mono-devel >= 6.10 +BuildRequires: mono-core >= 6.12 +BuildRequires: mono-devel >= 6.12 %endif # JIT only available on these: From 6c0f8dd86e3e1d1686c24802ff5e70ab5e99d2b4 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Tue, 22 Dec 2020 07:33:41 +0100 Subject: [PATCH 12/45] Upgrade to Mono 6.12.0.107 --- mono.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 8fc8181..2fbca81 100644 --- a/mono.spec +++ b/mono.spec @@ -21,10 +21,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 90 +%global xamarinrelease 107 Name: mono Version: 6.12.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -940,6 +940,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Tue Dec 22 2020 Timotheus Pokorra - 6.12.0-1 +- Upgrade to Mono 6.12.0.107 + * Tue Oct 27 2020 Timotheus Pokorra - 6.12.0-0 - Upgrade to Mono 6.12.0.90 diff --git a/sources b/sources index 95a23cd..79a23db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.12.0.90.tar.xz) = 955fc4a41bb575c2a6e4a61f0f6c22c88db213092657963c29eb5c33d54c628697e4c27246e3ea19e9ff2143c0e013b58c24b9c3da6dddfe87debb5ea9c1da26 +SHA512 (mono-6.12.0.107.tar.xz) = 567cd37847bd5a0bf78df8a3ada2ed2cfb10e466fffb5aadc3d145751552720bdd1fc2a734fba142b91f2e221f42b6717d6eb3f7c8823cbec3d458b10712d7ea From 9a1cb2a23a755647b936bbbebfd46c3036feb770 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 01:56:25 +0000 Subject: [PATCH 13/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mono.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mono.spec b/mono.spec index 2fbca81..394fc28 100644 --- a/mono.spec +++ b/mono.spec @@ -59,6 +59,7 @@ 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: make BuildRequires: bison BuildRequires: python%{python3_pkgversion} BuildRequires: cmake From 7cb6f7a424b43f90e2c7635b7a50c3f3ab7ccb4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:45:25 +0000 Subject: [PATCH 14/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 394fc28..7d787ec 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 107 Name: mono Version: 6.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 6.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 22 2020 Timotheus Pokorra - 6.12.0-1 - Upgrade to Mono 6.12.0.107 From 4273aac93139ac1ca8cb40e6ffa8857752904c7a Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 22 Feb 2021 22:15:46 +0100 Subject: [PATCH 15/45] 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 7d787ec..340ae47 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 107 Name: mono Version: 6.12.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -58,6 +58,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: make BuildRequires: bison @@ -349,6 +351,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 @@ -941,6 +944,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Mon Feb 22 2021 Timotheus Pokorra - 6.12.0-3 +- backport patch: fix early return in Process.Start (#1839410) + * Tue Jan 26 2021 Fedora Release Engineering - 6.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 724d8c6fd91db5a939c8f9c3bdc48f164feb5af7 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 27 Feb 2021 18:05:17 +0100 Subject: [PATCH 16/45] Upgrade to Mono 6.12.0.122 --- mono.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 340ae47..8b37b08 100644 --- a/mono.spec +++ b/mono.spec @@ -21,10 +21,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 107 +%global xamarinrelease 122 Name: mono Version: 6.12.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -944,6 +944,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Feb 27 2021 Timotheus Pokorra - 6.12.0-4 +- Upgrade to Mono 6.12.0.122 + * Mon Feb 22 2021 Timotheus Pokorra - 6.12.0-3 - backport patch: fix early return in Process.Start (#1839410) diff --git a/sources b/sources index 79a23db..bc8dc61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.12.0.107.tar.xz) = 567cd37847bd5a0bf78df8a3ada2ed2cfb10e466fffb5aadc3d145751552720bdd1fc2a734fba142b91f2e221f42b6717d6eb3f7c8823cbec3d458b10712d7ea +SHA512 (mono-6.12.0.122.tar.xz) = 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd From 274112ffb8728ea8b9640409fa88dc5ce320b8fa Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 27 Feb 2021 18:18:31 +0100 Subject: [PATCH 17/45] drop mono-6.12.0-fix-process-start.patch because it is already part of mono-6.12.0.122 --- mono-6.12.0-fix-process-start.patch | 42 ----------------------------- mono.spec | 3 --- 2 files changed, 45 deletions(-) delete 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 deleted file mode 100644 index 4b9e02c..0000000 --- a/mono-6.12.0-fix-process-start.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 8b37b08..5d04452 100644 --- a/mono.spec +++ b/mono.spec @@ -58,8 +58,6 @@ 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: make BuildRequires: bison @@ -351,7 +349,6 @@ 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 From 1b7aefe97923a9696b5ab57851ded4b3b37145f7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 8 Mar 2021 08:45:03 +0000 Subject: [PATCH 18/45] Make cert-sync run quietly --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 5d04452..d4717f8 100644 --- a/mono.spec +++ b/mono.spec @@ -501,7 +501,7 @@ rm %{buildroot}%{_bindir}/mono-find-provides %post core %{?ldconfig} -cert-sync /etc/pki/tls/certs/ca-bundle.crt +cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %ldconfig_postun From e1543e3486d801d36edda928e242e61cc9aaa69a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:18:53 +0000 Subject: [PATCH 19/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index d4717f8..2ce3fae 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 122 Name: mono Version: 6.12.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 6.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Feb 27 2021 Timotheus Pokorra - 6.12.0-4 - Upgrade to Mono 6.12.0.122 From 15391c61f973311d97d68db51ecb6ad3f4c0b607 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:21:13 +0000 Subject: [PATCH 20/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 2ce3fae..ca5c1b2 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 122 Name: mono Version: 6.12.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 6.12.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 6.12.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ba106d4d5e6f1fb628aa8a804b2d9cd4e431c989 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Fri, 11 Feb 2022 17:35:28 +0100 Subject: [PATCH 21/45] Fixing license for mono-reactive packages, fixing bug 2025856 --- mono.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index ca5c1b2..32d3258 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 122 Name: mono Version: 6.12.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -182,7 +182,7 @@ assemblies: Microsoft.Vsa, System.Configuration.Install, System.Management, System.Messaging. %package reactive -License: MIT License (or similar) ; Apache License 2.0 +License: MIT and ASL 2.0 Summary: Reactive Extensions for Mono core libraries Requires: mono-core = %{version}-%{release} @@ -191,7 +191,7 @@ Reactive Extensions for Mono, this packages don't depend on desktop-specific features. %package reactive-winforms -License: MIT License (or similar) ; Apache License 2.0 +License: MIT and ASL 2.0 Summary: Reactive Extensions for Mono desktop-specific libraries Requires: mono-core = %{version}-%{release} Requires: mono-reactive = %{version}-%{release} @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Fri Feb 11 2022 Timotheus Pokorra - 6.12.0-7 +- Fixing license for mono-reactive packages, fixing bug 2025856 + * Thu Jan 20 2022 Fedora Release Engineering - 6.12.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fbc6b193ae70d10753ed432ffd4f189813a18a76 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Thu, 16 Jun 2022 07:22:16 +0200 Subject: [PATCH 22/45] Upgrade to Mono 6.12.0.182 --- mono.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 32d3258..8168963 100644 --- a/mono.spec +++ b/mono.spec @@ -21,10 +21,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 122 +%global xamarinrelease 182 Name: mono Version: 6.12.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jun 16 2022 Timotheus Pokorra - 6.12.0-8 +- Upgrade to Mono 6.12.0.182 + * Fri Feb 11 2022 Timotheus Pokorra - 6.12.0-7 - Fixing license for mono-reactive packages, fixing bug 2025856 diff --git a/sources b/sources index bc8dc61..c38744d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.12.0.122.tar.xz) = 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd +SHA512 (mono-6.12.0.182.tar.xz) = 5f0f02f2adf89785af8f620c16d69fc97b87c9b39133286e6f1237a397f4842ea8d26802d9f802f8798a86540dc1bc3b5201428f218c78fbcf91f0d575cde512 From 96396e2005d6627007a59cc00c65759dc5df04e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:40:19 +0000 Subject: [PATCH 23/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 8168963..61ed9bc 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 182 Name: mono Version: 6.12.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 6.12.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 16 2022 Timotheus Pokorra - 6.12.0-8 - Upgrade to Mono 6.12.0.182 From 9c7ea72ac650a6bab12349e3806fd18bf52e4b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 27 Dec 2022 16:20:05 +0100 Subject: [PATCH 24/45] migrate to SPDX license see https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 --- mono.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 61ed9bc..9cc080e 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 182 Name: mono Version: 6.12.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -182,7 +182,7 @@ assemblies: Microsoft.Vsa, System.Configuration.Install, System.Management, System.Messaging. %package reactive -License: MIT and ASL 2.0 +License: MIT AND Apache-2.0 Summary: Reactive Extensions for Mono core libraries Requires: mono-core = %{version}-%{release} @@ -191,7 +191,7 @@ Reactive Extensions for Mono, this packages don't depend on desktop-specific features. %package reactive-winforms -License: MIT and ASL 2.0 +License: MIT AND Apache-2.0 Summary: Reactive Extensions for Mono desktop-specific libraries Requires: mono-core = %{version}-%{release} Requires: mono-reactive = %{version}-%{release} @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Tue Dec 27 2022 msuchy - 6.12.0-10 +- Migrate to SPDX license + * Thu Jul 21 2022 Fedora Release Engineering - 6.12.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bcec889c9e9e1b668ae317829e8012034977ef59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:39:33 +0000 Subject: [PATCH 25/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 9cc080e..266f556 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 182 Name: mono Version: 6.12.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 6.12.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 27 2022 msuchy - 6.12.0-10 - Migrate to SPDX license From 8f6a54f10303dad6f5af7dbd5e0758ae495f7786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:43:49 +0000 Subject: [PATCH 26/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 266f556..408d83b 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 182 Name: mono Version: 6.12.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 6.12.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 6.12.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0618c218c5f4b31441225205a98d5d53dc664c62 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 12 Aug 2023 21:02:51 +0200 Subject: [PATCH 27/45] Upgrade to Mono 6.12.0.199 --- mono.spec | 33 ++++++++++++++++++--------------- sources | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/mono.spec b/mono.spec index 408d83b..87ffa06 100644 --- a/mono.spec +++ b/mono.spec @@ -21,10 +21,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 182 +%global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -332,23 +332,23 @@ not install anything from outside the mono source (XSP, mono-basic, etc.). %prep %setup -q -n %{name}-%{version}.%{xamarinrelease} -%patch0 -p1 +%patch -P 0 -p1 %ifarch ppc ppc64 ppc64le s390x -%patch1 -p1 +%patch -P 1 -p1 %endif -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 +%patch -P 6 -p1 +%patch -P 7 -p1 +%patch -P 8 -p1 pushd external/api-doc-tools -%patch10 -p1 -%patch11 -p1 +%patch -P 10 -p1 +%patch -P 11 -p1 popd -%patch12 -p1 -%patch13 -p1 +%patch -P 12 -p1 +%patch -P 13 -p1 # don't build mono-helix-client which requires the helix-binaries to build sed -i 's|mono-helix-client||g' mcs/tools/Makefile @@ -941,6 +941,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Aug 12 2023 Timotheus Pokorra - 6.12.0-13 +- Upgrade to Mono 6.12.0.199 + * Thu Jul 20 2023 Fedora Release Engineering - 6.12.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index c38744d..5308722 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.12.0.182.tar.xz) = 5f0f02f2adf89785af8f620c16d69fc97b87c9b39133286e6f1237a397f4842ea8d26802d9f802f8798a86540dc1bc3b5201428f218c78fbcf91f0d575cde512 +SHA512 (mono-6.12.0.199.tar.xz) = 9e379aaeb2e8750edbda74648c0ae9cc8cb9b2d7af85512bf2e729132c2e0322e776ef0b7657da708cbc1ae2a62f5532519d339fa68f465b30a65ca30d4a1e51 From 151b93c38ea2c34f6b544c50864730da908c849f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 23 Aug 2023 23:45:16 -0400 Subject: [PATCH 28/45] Fix flatpak build Packages built for flatpaks use the /app prefix. This necessitates proper use of installation path macros throughout. --- mono-find-provides | 10 +++++----- mono-find-requires | 10 +++++----- mono.attr | 4 ++-- mono.spec | 24 ++++++++++++------------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mono-find-provides b/mono-find-provides index 554bffe..c410489 100755 --- a/mono-find-provides +++ b/mono-find-provides @@ -10,19 +10,19 @@ # Args: builddir buildroot libdir IFS=$'\n' -filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) +filelist=($(grep -Ev "$3/doc/|$3/share/doc/")) monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) # If monodis is in the package being installed, use that one # This is to support building mono -build_bindir="$2/usr/bin" -build_libdir="$2$3" +build_bindir="$2$3/bin" +build_libdir="$2$3/$4" if [ -x $build_bindir/monodis ]; then monodis="$build_bindir/monodis" export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -elif [ -x /usr/bin/monodis ]; then - monodis="/usr/bin/monodis" +elif [ -x $3/bin/monodis ]; then + monodis="$3/bin/monodis" else exit 0; fi diff --git a/mono-find-requires b/mono-find-requires index 6f96761..c87b5f6 100755 --- a/mono-find-requires +++ b/mono-find-requires @@ -10,19 +10,19 @@ # Args: builddir buildroot libdir IFS=$'\n' -filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) +filelist=($(grep -Ev "$3/doc/|$3/share/doc/")) monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) # If monodis is in the package being installed, use that one # This is to support building mono -build_bindir="$2/usr/bin" -build_libdir="$2$3" +build_bindir="$2$3/bin" +build_libdir="$2$3/$4" if [ -x $build_bindir/monodis ]; then monodis="$build_bindir/monodis" export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -elif [ -x /usr/bin/monodis ]; then - monodis="/usr/bin/monodis" +elif [ -x $3/bin/monodis ]; then + monodis="$3/bin/monodis" else exit 0; fi diff --git a/mono.attr b/mono.attr index 98dc8d9..e21f93b 100644 --- a/mono.attr +++ b/mono.attr @@ -1,3 +1,3 @@ -%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} -%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_prefix} %{_lib} +%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_prefix} %{_lib} %__mono_magic Mono/.Net assembly diff --git a/mono.spec b/mono.spec index 87ffa06..be0a266 100644 --- a/mono.spec +++ b/mono.spec @@ -372,7 +372,7 @@ rm -rf mcs/class/lib/monolite-linux/* find . -name "*.dll" -print -delete find . -name "*.exe" -print -delete # use the binaries from the currently installed mono -cd external/binary-reference-assemblies && mv v4.7.1 v4.7.1.tobuild && ln -s /usr/lib/mono/4.7.1-api v4.7.1 && cd - +cd external/binary-reference-assemblies && mv v4.7.1 v4.7.1.tobuild && ln -s %{_monodir}/4.7.1-api v4.7.1 && cd - %endif %build @@ -471,26 +471,26 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_bindir} rm -f %{buildroot}%{_libdir}/pkgconfig/cecil.pc # remove msbuild / microsoft binary files -rm -rf %{buildroot}/usr/lib/mono/msbuild +rm -rf %{buildroot}%{_monodir}/msbuild # we have btls debug files -rm -rf %{buildroot}/usr/lib/debug/usr/lib64/libmono-btls-shared.so-*.debug +rm -rf %{buildroot}/usr/lib/debug%{_libdir}/libmono-btls-shared.so-*.debug # drop other debug files as well -rm -rf %{buildroot}/usr/lib/debug/usr/lib64/libmono-native.so*.debug -rm -rf %{buildroot}/usr/lib/debug/usr/bin/mono-hang-watchdog-*.debug +rm -rf %{buildroot}/usr/lib/debug%{_libdir}/libmono-native.so*.debug +rm -rf %{buildroot}/usr/lib/debug%{_bindir}/mono-hang-watchdog-*.debug # create a symbolic link so that Fedora packages targetting Framework 4.5 will still build -cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.5-api && cd - +cd %{buildroot}%{_monodir} && 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 - +cd %{buildroot}%{_monodir} && 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/ +mkdir -p %{buildroot}%{_fileattrsdir} +install -p -m755 %{SOURCE2} %{SOURCE3} %{buildroot}%{_rpmconfigdir} +install -p -m644 %{SOURCE4} %{buildroot}%{_fileattrsdir} %endif # remove these files, we are using the files installed in /usr/lib/rpm/ @@ -761,8 +761,8 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt # 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 +%{_rpmconfigdir}/mono-find-* +%{_fileattrsdir}/mono.attr %endif %{_bindir}/aprofutil From 99d848d8664b6069f809e4d3e5751fd420230cb3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 24 Aug 2023 11:38:55 -0400 Subject: [PATCH 29/45] Update data-sqlite dependency sqlite-libs has been split out of sqlite since Fedora 22. --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index be0a266..82603fd 100644 --- a/mono.spec +++ b/mono.spec @@ -256,7 +256,7 @@ data providers. %package data-sqlite Summary: sqlite database connectivity for Mono Requires: mono-core = %{version}-%{release} -Requires: sqlite +Requires: sqlite-libs%{?_isa} %description data-sqlite This package contains the ADO.NET Data provider for the sqlite From f2ffd59efb702edb0bb1f271ecefc76718b9649c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 24 Aug 2023 11:41:19 -0400 Subject: [PATCH 30/45] Bootstrap for F39 flatpaks --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 82603fd..84ab74a 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap %ifarch s390x # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 From 382df931af700ce7c6d7553ca906be5ca9e7ccbd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 24 Aug 2023 11:41:36 -0400 Subject: [PATCH 31/45] Un-bootstrap for F39 flatpaks --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 84ab74a..82603fd 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %ifarch s390x # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 From e733e87b0ce49fad204d9ca6aa1e4525fff9420a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 9 Dec 2023 11:07:26 +0100 Subject: [PATCH 32/45] Fix C compatibility issue in the configure script Related to: --- mono-configure-c99.patch | 76 ++++++++++++++++++++++++++++++++++++++++ mono.spec | 7 +++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 mono-configure-c99.patch diff --git a/mono-configure-c99.patch b/mono-configure-c99.patch new file mode 100644 index 0000000..0f78563 --- /dev/null +++ b/mono-configure-c99.patch @@ -0,0 +1,76 @@ +The thread start routine must return void *, and int and void * +are distinct types. Compilers increasingly issue errors instead +of warnings for such type errors, and this causes the configure +probe to fail unconditionally, even if the system supports +__thread variables. + +Submitted upstream: + +diff --git a/configure.ac b/configure.ac +index bbbd1622d9728859..5a3a5770c8a3cdb6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2833,14 +2833,16 @@ if test x$host_win32 = xno; then + __thread int i; + static int res1, res2; + +- void thread_main (void *arg) ++ void *thread_main (void *parg) + { ++ int arg = *(int *)parg; + i = arg; + sleep (1); + if (arg == 1) + res1 = (i == arg); + else + res2 = (i == arg); ++ return NULL; + } + + int main () { +@@ -2848,8 +2850,10 @@ if test x$host_win32 = xno; then + + i = 5; + +- pthread_create (&t1, NULL, thread_main, 1); +- pthread_create (&t2, NULL, thread_main, 2); ++ int one = 1; ++ pthread_create (&t1, NULL, thread_main, &one); ++ int two = 2; ++ pthread_create (&t2, NULL, thread_main, &two); + + pthread_join (t1, NULL); + pthread_join (t2, NULL); +--- a/configure 2023-06-14 17:18:48.000000000 +0200 ++++ b/configure 2023-12-09 10:41:58.001084368 +0100 +@@ -24906,14 +24894,16 @@ + __thread int i; + static int res1, res2; + +- void thread_main (void *arg) ++ void *thread_main (void *parg) + { ++ int arg = *(int *)parg; + i = arg; + sleep (1); + if (arg == 1) + res1 = (i == arg); + else + res2 = (i == arg); ++ return NULL; + } + + int main () { +@@ -24921,8 +24911,10 @@ + + i = 5; + +- pthread_create (&t1, NULL, thread_main, 1); +- pthread_create (&t2, NULL, thread_main, 2); ++ int one = 1; ++ pthread_create (&t1, NULL, thread_main, &one); ++ int two = 2; ++ pthread_create (&t2, NULL, thread_main, &two); + + pthread_join (t1, NULL); + pthread_join (t2, NULL); diff --git a/mono.spec b/mono.spec index 82603fd..0059800 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -58,6 +58,7 @@ 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 +Patch14: mono-configure-c99.patch BuildRequires: make BuildRequires: bison @@ -349,6 +350,7 @@ pushd external/api-doc-tools popd %patch -P 12 -p1 %patch -P 13 -p1 +%patch -P 14 -p1 # don't build mono-helix-client which requires the helix-binaries to build sed -i 's|mono-helix-client||g' mcs/tools/Makefile @@ -941,6 +943,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Dec 9 2023 Florian Weimer - 6.12.0-14 +- Fix C compatibility issue in the configure script + * Sat Aug 12 2023 Timotheus Pokorra - 6.12.0-13 - Upgrade to Mono 6.12.0.199 From cb21f30d1a7503cf0505d0fc536c5900fdec7b1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:34:54 +0000 Subject: [PATCH 33/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 0059800..289584d 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -943,6 +943,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 6.12.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Dec 9 2023 Florian Weimer - 6.12.0-14 - Fix C compatibility issue in the configure script From f9566ff005d7b7519eccc043c45cad2fcdc2dcc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 07:57:21 +0000 Subject: [PATCH 34/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 289584d..acd2bb4 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -943,6 +943,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 6.12.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 6.12.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d2a319a445e4ddf9ef547266e84948d638e1b6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=96zbay?= Date: Fri, 12 Apr 2024 14:51:31 +0200 Subject: [PATCH 35/45] Correct the selection of alloc/free functions for zlib. (as in PR #21759 upstream) --- mono-6.12.0-correct-alloc-free-for-zlib.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 mono-6.12.0-correct-alloc-free-for-zlib.patch diff --git a/mono-6.12.0-correct-alloc-free-for-zlib.patch b/mono-6.12.0-correct-alloc-free-for-zlib.patch new file mode 100644 index 0000000..d9c3b25 --- /dev/null +++ b/mono-6.12.0-correct-alloc-free-for-zlib.patch @@ -0,0 +1,35 @@ +From ed68c250b8589663601aa7dd88177697d0b37ec9 Mon Sep 17 00:00:00 2001 +From: jo-oe <38652639+jo-oe@users.noreply.github.com> +Date: Tue, 9 Apr 2024 16:57:39 +0200 +Subject: [PATCH] Correct the selection of alloc/free functions for zlib. + +Avoids segfault when working with zlib-ng. +See: +https://github.com/zlib-ng/zlib-ng/issues/1708 +--- + support/zlib-helper.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/support/zlib-helper.c b/support/zlib-helper.c +index 76d8951ad8a8a..a5fbc0138822d 100644 +--- a/support/zlib-helper.c ++++ b/support/zlib-helper.c +@@ -76,6 +76,8 @@ CreateZStream (gint compress, guchar gzip, read_write_func func, void *gchandle) + return NULL; + + z = z_new0 (z_stream); ++ z->zalloc = z_alloc; ++ z->zfree = z_free; + if (compress) { + retval = deflateInit2 (z, Z_DEFAULT_COMPRESSION, Z_DEFLATED, gzip ? 31 : -15, 8, Z_DEFAULT_STRATEGY); + } else { +@@ -86,8 +88,6 @@ CreateZStream (gint compress, guchar gzip, read_write_func func, void *gchandle) + free (z); + return NULL; + } +- z->zalloc = z_alloc; +- z->zfree = z_free; + result = z_new0 (ZStream); + result->stream = z; + result->func = func; + From e18e346346ecc4e3d5bbf8a4e01f0aa613a09125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=96zbay?= Date: Fri, 12 Apr 2024 14:52:28 +0200 Subject: [PATCH 36/45] Correct the selection of alloc/free functions for zlib. (as in PR #21759 upstream) [2] --- mono.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index acd2bb4..18a781c 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -59,6 +59,7 @@ 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 Patch14: mono-configure-c99.patch +Patch15: mono-6.12.0-correct-alloc-free-for-zlib.patch BuildRequires: make BuildRequires: bison @@ -351,6 +352,7 @@ popd %patch -P 12 -p1 %patch -P 13 -p1 %patch -P 14 -p1 +%patch -P 15 -p1 # don't build mono-helix-client which requires the helix-binaries to build sed -i 's|mono-helix-client||g' mcs/tools/Makefile @@ -943,6 +945,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Fri Apr 12 2024 Jonas Özbay - 6.12.0-17 +- Correct the selection of alloc/free functions for zlib. (as in PR #21759 upstream) + * Thu Jan 25 2024 Fedora Release Engineering - 6.12.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 52397c9b93ff58a6998eb6c3288086f71d0ca458 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:35:14 +0000 Subject: [PATCH 37/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 18a781c..54a2a22 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -945,6 +945,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 6.12.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Apr 12 2024 Jonas Özbay - 6.12.0-17 - Correct the selection of alloc/free functions for zlib. (as in PR #21759 upstream) From 21d64b1b730fa7fc8a8013f119360acb14d1cb8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:01:30 +0000 Subject: [PATCH 38/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 54a2a22..cbccc56 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -945,6 +945,9 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 6.12.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 6.12.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 66d5dc3f484a5d0c6818fa4d26c9bb1ec4085e1a Mon Sep 17 00:00:00 2001 From: Krenzelok Frantisek Date: Wed, 23 Jul 2025 10:39:41 +0200 Subject: [PATCH 39/45] Change the certificate bundle used to popule Mono certificate store Resolves: rhbz#2338975 --- mono.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mono.spec b/mono.spec index cbccc56..617ef0d 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -505,7 +505,7 @@ rm %{buildroot}%{_bindir}/mono-find-provides %post core %{?ldconfig} -cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt +cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem %ldconfig_postun @@ -945,6 +945,10 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Wed Jul 23 2025 Frantisek Krenzelok - 6.12.0-20 +- Change the certificate bundle used to popule Mono certificate store +- https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile + * Fri Jan 17 2025 Fedora Release Engineering - 6.12.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 05730ec22beee2b26066ee079c8c17b5a97e05ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:18:30 +0000 Subject: [PATCH 40/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 617ef0d..2098739 100644 --- a/mono.spec +++ b/mono.spec @@ -24,7 +24,7 @@ %global xamarinrelease 199 Name: mono Version: 6.12.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -945,6 +945,9 @@ cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem %files complete %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 6.12.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 23 2025 Frantisek Krenzelok - 6.12.0-20 - Change the certificate bundle used to popule Mono certificate store - https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile From 91cb75519dcd6a6fd854ff507d5a75a5ad99523f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Oct 2025 23:03:04 -0400 Subject: [PATCH 41/45] Specify path to cert-sync in %post snippet Mock builds are run with a limited PATH. When built for flatpaks in /app, the cert-sync command is not found, and %post fails. While this was previously non-critical, as of RPM 6.0 (Fedora 43), this causes the install to fail. --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 2098739..7b85be9 100644 --- a/mono.spec +++ b/mono.spec @@ -505,7 +505,7 @@ rm %{buildroot}%{_bindir}/mono-find-provides %post core %{?ldconfig} -cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem +%{_bindir}/cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem %ldconfig_postun From f915b3ac912dd8bf46737bdfa747298b044e200e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Oct 2025 23:07:31 -0400 Subject: [PATCH 42/45] Bootstrap for Fedora 43 flatpaks --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 7b85be9..f5926f6 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap %ifarch s390x # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 From 763c0d0b4d225f095725cdeb0270ed367922ece0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Oct 2025 23:51:46 -0400 Subject: [PATCH 43/45] Un-bootstrap for Fedora 43 flatpaks --- mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index f5926f6..7b85be9 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %ifarch s390x # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 From 943b7bf956c3fd8776628713a9f12ffe01f1b02e Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 8 Nov 2025 19:34:13 +0100 Subject: [PATCH 44/45] Upgrade to Mono 6.14.1 --- 0001-Reenable-mdoc.exe-build.patch | 11 ++++------- mono-6.14.0-arm64-fix-pointer-int.patch | 26 +++++++++++++++++++++++++ mono.spec | 18 +++++++++-------- sources | 2 +- 4 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 mono-6.14.0-arm64-fix-pointer-int.patch diff --git a/0001-Reenable-mdoc.exe-build.patch b/0001-Reenable-mdoc.exe-build.patch index 345c3f3..c757eb2 100644 --- a/0001-Reenable-mdoc.exe-build.patch +++ b/0001-Reenable-mdoc.exe-build.patch @@ -6,14 +6,14 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Signed-off-by: Robert-André Mauchin +Signed-off-by: Robert-Andr Mauchin --- mcs/docs/Makefile | 4 ---- mcs/tools/mdoc/Makefile | 18 ++++++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile -index 92e8f2adbe5..88bddb66268 100644 +index b66d70230..519a98443 100644 --- a/mcs/docs/Makefile +++ b/mcs/docs/Makefile @@ -38,10 +38,6 @@ DISABLE_MCS_DOCS = yes @@ -24,11 +24,11 @@ index 92e8f2adbe5..88bddb66268 100644 -DISABLE_MCS_DOCS = yes -endif - - csproj-local test-local run-test-local run-test-ondotnet-local doc-update: + test-local run-test-local run-test-ondotnet-local doc-update: clean-local: diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile -index e3c5a321d1a..00820361636 100644 +index e3c5a321d..008203616 100644 --- a/mcs/tools/mdoc/Makefile +++ b/mcs/tools/mdoc/Makefile @@ -44,12 +44,6 @@ $(PROGRAM): $(PROGRAM_DEPS) @@ -84,6 +84,3 @@ index e3c5a321d1a..00820361636 100644 check-doc-tools-update: check-monodocer-since-update \ check-monodocer-importecmadoc-update \ --- -2.24.1 - diff --git a/mono-6.14.0-arm64-fix-pointer-int.patch b/mono-6.14.0-arm64-fix-pointer-int.patch new file mode 100644 index 0000000..e38547c --- /dev/null +++ b/mono-6.14.0-arm64-fix-pointer-int.patch @@ -0,0 +1,26 @@ +From 2224c6915a98f870cc9a3a9f9e3698e7b20e3d27 Mon Sep 17 00:00:00 2001 +From: Esme Povirk +Date: Sat, 12 Apr 2025 20:31:54 +0000 +Subject: [PATCH] arm64: Fix a pointer-to-int cast size mismatch. + +--- + mono/utils/mono-sigcontext.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mono/utils/mono-sigcontext.h b/mono/utils/mono-sigcontext.h +index 2153c1cad57..6426f44b7c7 100644 +--- a/mono/utils/mono-sigcontext.h ++++ b/mono/utils/mono-sigcontext.h +@@ -492,6 +492,12 @@ typedef struct ucontext { + #define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.sp) + #define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->uc_mcontext.regs [ARMREG_R0]) + #define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->uc_mcontext.regs)) ++ #define UCONTEXT_REG_SET_PC(ctx, val) do { \ ++ UCONTEXT_REG_PC (ctx) = (gsize)(val); \ ++ } while (0) ++ #define UCONTEXT_REG_SET_SP(ctx, val) do { \ ++ UCONTEXT_REG_SP (ctx) = (val); \ ++ } while (0) + #endif + + #ifndef UCONTEXT_REG_SET_PC diff --git a/mono.spec b/mono.spec index 7b85be9..b57184a 100644 --- a/mono.spec +++ b/mono.spec @@ -21,15 +21,14 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 199 Name: mono -Version: 6.12.0 -Release: 21%{?dist} +Version: 6.14.1 +Release: 1%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT URL: http://www.mono-project.com -Source0: http://download.mono-project.com/sources/mono/mono-%{version}.%{xamarinrelease}.tar.xz +Source0: https://dl.winehq.org/mono/sources/mono/%{name}-%{version}.tar.xz # This key was generated by Tom "spot" Callaway on Dec 1, 2009 # by running the following command: # sn -k mono.snk @@ -60,6 +59,7 @@ Patch12: 0001-Reenable-mdoc.exe-build.patch Patch13: mono-6.6.0-fix-multi-arch-issue.patch Patch14: mono-configure-c99.patch Patch15: mono-6.12.0-correct-alloc-free-for-zlib.patch +Patch16: mono-6.14.0-arm64-fix-pointer-int.patch BuildRequires: make BuildRequires: bison @@ -332,7 +332,7 @@ not install anything from outside the mono source (XSP, mono-basic, etc.). %{nil} %prep -%setup -q -n %{name}-%{version}.%{xamarinrelease} +%setup -q -n %{name}-%{version} %patch -P 0 -p1 %ifarch ppc ppc64 ppc64le s390x @@ -353,13 +353,11 @@ popd %patch -P 13 -p1 %patch -P 14 -p1 %patch -P 15 -p1 +%patch -P 16 -p1 # don't build mono-helix-client which requires the helix-binaries to build sed -i 's|mono-helix-client||g' mcs/tools/Makefile -# use v4.7.1 instead of v4.6 -sed -i 's|TARGET_NET_REFERENCE = v4.6|TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)|g' mcs/tools/upload-to-sentry/Makefile - # use v4.7.1 instead of v4.7 sed -i 's|BOOTSTRAP_BIN_PROFILE = v4.7|BOOTSTRAP_BIN_PROFILE = v4.7.1|g' mcs/build/profiles/build.make @@ -759,6 +757,7 @@ rm %{buildroot}%{_bindir}/mono-find-provides %{_libdir}/pkgconfig/wcf.pc %{_libdir}/pkgconfig/xbuild12.pc %{_includedir}/mono-2.0/mono/jit/jit.h +%{_includedir}/mono-2.0/mono/jit/mono-private-unstable.h %{_includedir}/mono-2.0/mono/metadata/*.h %{_includedir}/mono-2.0/mono/utils/*.h %{_includedir}/mono-2.0/mono/cil/opcode.def @@ -945,6 +944,9 @@ rm %{buildroot}%{_bindir}/mono-find-provides %files complete %changelog +* Sat Nov 08 2025 Timotheus Pokorra - 6.14.1-1 +- Upgrade to Mono 6.14.1 + * Thu Jul 24 2025 Fedora Release Engineering - 6.12.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 5308722..808f713 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.12.0.199.tar.xz) = 9e379aaeb2e8750edbda74648c0ae9cc8cb9b2d7af85512bf2e729132c2e0322e776ef0b7657da708cbc1ae2a62f5532519d339fa68f465b30a65ca30d4a1e51 +SHA512 (mono-6.14.1.tar.xz) = c16a2ecbfce93db20a7a6d11b6406c8764f5694355c1ce82081399cd7ab6d8b22e7f8fb21f7af78967b34ef54dcb682917b8cf22d61f1b72be996d1a42e9f1b9 From 49a1ca5197fd1e641e08f61f51bc65517ad1f2b2 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 11 Nov 2025 14:08:25 +0100 Subject: [PATCH 45/45] Allow to build with CMake 4.0 (rhbz#2380917) --- mono.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index b57184a..3bb7074 100644 --- a/mono.spec +++ b/mono.spec @@ -23,7 +23,7 @@ Name: mono Version: 6.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -378,6 +378,8 @@ cd external/binary-reference-assemblies && mv v4.7.1 v4.7.1.tobuild && ln -s %{_ %endif %build +# TODO: Please submit an issue to upstream (rhbz#2380917) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 # This package fails to build with LTO on ppc64le. Root cause analysis has not been # done. For now disable LTO %ifarch ppc64le @@ -944,6 +946,9 @@ rm %{buildroot}%{_bindir}/mono-find-provides %files complete %changelog +* Tue Nov 11 2025 Cristian Le - 6.14.1-2 +- Allow to build with CMake 4.0 (rhbz#2380917) + * Sat Nov 08 2025 Timotheus Pokorra - 6.14.1-1 - Upgrade to Mono 6.14.1