From 68dc37bf2e686013229f98ce92c370366dbbe66f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Sep 2019 11:30:50 +0200 Subject: [PATCH 01/12] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg 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 From ef19a9245734ee9ee0ef2722a4e0ed2e880f30d5 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 29 Feb 2020 22:21:38 +0100 Subject: [PATCH 02/12] bootstrap build for epel8 --- mono.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mono.spec b/mono.spec index a67af7a..755bbc5 100644 --- a/mono.spec +++ b/mono.spec @@ -2,7 +2,7 @@ # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 %undefine _hardened_build %endif -%global bootstrap 0 +%global bootstrap 1 %if 0%{?el6} # see https://fedorahosted.org/fpc/ticket/395, it was added to el7 %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le @@ -23,7 +23,7 @@ %global xamarinrelease 161 Name: mono Version: 6.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -924,6 +924,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Feb 29 2020 Timotheus Pokorra - 6.6.0-6 +- Bootstrap build for Epel 8 + * Mon Feb 03 2020 Robert-André Mauchin - 6.6.0-5 - Reenable mdoc build (#1797360) From 0dbbc71ff1d4dcf49340eb7f0c7ede023eff4948 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 25 Apr 2020 13:37:20 +0200 Subject: [PATCH 03/12] Non-Bootstrap build for Epel 8 --- mono.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mono.spec b/mono.spec index 755bbc5..88ece6b 100644 --- a/mono.spec +++ b/mono.spec @@ -2,7 +2,7 @@ # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 %undefine _hardened_build %endif -%global bootstrap 1 +%global bootstrap 0 %if 0%{?el6} # see https://fedorahosted.org/fpc/ticket/395, it was added to el7 %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le @@ -23,7 +23,7 @@ %global xamarinrelease 161 Name: mono Version: 6.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -924,6 +924,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Apr 25 2020 Timotheus Pokorra - 6.6.0-7 +- Non-Bootstrap build for Epel 8 + * Sat Feb 29 2020 Timotheus Pokorra - 6.6.0-6 - Bootstrap build for Epel 8 From 5c5f8f645248c14a80d0dad7f1b8c6bd67d37620 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 25 Apr 2020 14:54:08 +0200 Subject: [PATCH 04/12] 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 --- mono.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mono.spec b/mono.spec index 88ece6b..c068a0c 100644 --- a/mono.spec +++ b/mono.spec @@ -2,7 +2,7 @@ # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 %undefine _hardened_build %endif -%global bootstrap 0 +%global bootstrap 1 %if 0%{?el6} # see https://fedorahosted.org/fpc/ticket/395, it was added to el7 %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le @@ -656,8 +656,8 @@ 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}/mono-find-provides +#%{_bindir}/mono-find-requires %{_bindir}/monodis %mono_bin monolinker %mono_bin mono-shlib-cop @@ -925,7 +925,7 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %changelog * Sat Apr 25 2020 Timotheus Pokorra - 6.6.0-7 -- Non-Bootstrap build for Epel 8 +- 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 - 6.6.0-6 - Bootstrap build for Epel 8 From 81faf17ab9836d50389decff5b488fafd4eac07f Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 25 Apr 2020 20:26:02 +0200 Subject: [PATCH 05/12] another fix for rpm helper scripts on epel 8 --- mono.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index c068a0c..092643c 100644 --- a/mono.spec +++ b/mono.spec @@ -478,9 +478,10 @@ cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.5-api && cd - cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.0-api && cd - # 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/ +# not needed on Epel 8 +#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/ %find_lang mcs From 7c5626eced461449341436150b5610bab1d19621 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 25 Apr 2020 21:18:09 +0200 Subject: [PATCH 06/12] another fix for rpm helper scripts on epel 8 --- mono.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mono.spec b/mono.spec index 092643c..0158adb 100644 --- a/mono.spec +++ b/mono.spec @@ -657,8 +657,8 @@ 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}/mono-find-provides +%{_bindir}/mono-find-requires %{_bindir}/monodis %mono_bin monolinker %mono_bin mono-shlib-cop @@ -747,8 +747,8 @@ 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 -%{_prefix}/lib/rpm/mono-find-* -%{_prefix}/lib/rpm/fileattrs/mono.attr +#%{_prefix}/lib/rpm/mono-find-* +#%{_prefix}/lib/rpm/fileattrs/mono.attr %{_bindir}/aprofutil %mono_bin aprofutil %{_mandir}/man1/aprofutil.1.gz From a1fed137f0e386a1f2d1b8797ab329d07720d85d Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 25 Apr 2020 21:59:06 +0200 Subject: [PATCH 07/12] Non-bootstrap build for Epel 8 --- mono.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mono.spec b/mono.spec index 0158adb..91b97a4 100644 --- a/mono.spec +++ b/mono.spec @@ -2,7 +2,7 @@ # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609 %undefine _hardened_build %endif -%global bootstrap 1 +%global bootstrap 0 %if 0%{?el6} # see https://fedorahosted.org/fpc/ticket/395, it was added to el7 %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le @@ -23,7 +23,7 @@ %global xamarinrelease 161 Name: mono Version: 6.6.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -925,6 +925,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Apr 25 2020 Timotheus Pokorra - 6.6.0-8 +- Non-bootstrap build for Epel 8 + * Sat Apr 25 2020 Timotheus Pokorra - 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 From 84696434fe68c2329f179a3d89f0c18469dc5e18 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Thu, 16 Jul 2020 21:23:04 +0200 Subject: [PATCH 08/12] Upgrade to Mono 6.6.0.166 --- mono.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 91b97a4..e1ce566 100644 --- a/mono.spec +++ b/mono.spec @@ -20,10 +20,10 @@ %undefine _missing_build_ids_terminate_build %endif -%global xamarinrelease 161 +%global xamarinrelease 166 Name: mono Version: 6.6.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT @@ -925,6 +925,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Thu Jul 16 2020 Timotheus Pokorra - 6.6.0-9 +- Upgrade to Mono 6.6.0.166 + * Sat Apr 25 2020 Timotheus Pokorra - 6.6.0-8 - Non-bootstrap build for Epel 8 diff --git a/sources b/sources index d8bf139..3c9c4ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186 +SHA512 (mono-6.6.0.166.tar.xz) = 75a4c4f6c82842d2a42383eac4e7afcb313f3d63b500786ce249c7a89061677e6e042568eb5add700381bb73cd4ca1baff3f2c734598387be81542fa92378a4d From 0652be4b4176b39f98e0bac57b97a4dc51fb5e15 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 18 Jul 2020 07:28:42 +0200 Subject: [PATCH 09/12] Non-Bootstrap build of Mono 6.8 for Epel 8 --- mono.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mono.spec b/mono.spec index 507b8a2..3770979 100644 --- a/mono.spec +++ b/mono.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %bcond_with bootstrap %ifarch s390x @@ -932,6 +931,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Sat Jul 18 2020 Timotheus Pokorra - 6.8.0-2 +- Non-Bootstrap build of Mono 6.8 for Epel 8 + * Fri Jul 17 2020 Timotheus Pokorra - 6.8.0-0 - Bootstrap build for Mono 6.8 for Epel 8 From 7ac76a36481307b9e8bf2f53344b9f3fa4d40b68 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 18 Jul 2020 07:41:31 +0200 Subject: [PATCH 10/12] fix release number --- mono.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mono.spec b/mono.spec index 3770979..f77e9cb 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,10 +931,10 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog -* Sat Jul 18 2020 Timotheus Pokorra - 6.8.0-2 +* Sat Jul 18 2020 Timotheus Pokorra - 6.8.0-3 - Non-Bootstrap build of Mono 6.8 for Epel 8 -* Fri Jul 17 2020 Timotheus Pokorra - 6.8.0-0 +* Fri Jul 17 2020 Timotheus Pokorra - 6.8.0-2 - Bootstrap build for Mono 6.8 for Epel 8 * Thu Jul 16 2020 Timotheus Pokorra - 6.6.0-9 From 4e3b9026cbadfbf7565ac91ec98c1e58ead1559c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:31:51 +0000 Subject: [PATCH 11/12] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 556f8c809883c740a85830c94b148263d7be3729 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Mon, 22 Feb 2021 22:33:19 +0100 Subject: [PATCH 12/12] backport patch: fix early return in Process.Start (#1839410) --- mono-6.12.0-fix-process-start.patch | 42 +++++++++++++++++++++++++++++ mono.spec | 9 ++++++- 2 files changed, 50 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 f77e9cb..580dd78 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 @@ -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,6 +935,9 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt %files complete %changelog +* Mon Feb 22 2021 Timotheus Pokorra - 6.8.0-4 +- backport patch: fix early return in Process.Start (#1839410) + * Sat Jul 18 2020 Timotheus Pokorra - 6.8.0-3 - Non-Bootstrap build of Mono 6.8 for Epel 8