Compare commits

...

7 Commits
rawhide ... f32

Author SHA1 Message Date
Timotheus Pokorra
7893a86743 forgot to add the patch 2021-02-23 06:51:38 +01:00
Timotheus Pokorra
8cd450bd95 backport patch: fix early return in Process.Start (#1839410) 2021-02-22 22:48:27 +01:00
Timotheus Pokorra
ef20783b1d forgot to add mono-6.6.0-fix-multi-arch-issue.patch 2020-10-14 06:49:05 +02:00
Timotheus Pokorra
05e9956002 fix issue with conflicts between i686 and x86_64 package (#1853724) 2020-10-14 06:46:20 +02:00
Timotheus Pokorra
18bea70036 Ship libMonoSupportW.so 2020-09-05 06:29:41 +02:00
Timotheus Pokorra
960474d545 upload new sources 2020-06-20 06:49:20 +02:00
Timotheus Pokorra
83cce89cf0 upgrade to new upstream Mono 6.6.0.166 2020-06-20 06:35:02 +02:00
4 changed files with 95 additions and 6 deletions

View File

@ -0,0 +1,42 @@
From 325577feffad1f87b07d92710c0d37c79c5f50a1 Mon Sep 17 00:00:00 2001
From: Ryan Lucia <rylucia@microsoft.com>
Date: Thu, 4 Feb 2021 08:55:48 -0500
Subject: [PATCH] Fix early return in Process.Start
---
mono/metadata/w32process-unix.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/mono/metadata/w32process-unix.c b/mono/metadata/w32process-unix.c
index 663cc6ff5111..d030101aede6 100644
--- a/mono/metadata/w32process-unix.c
+++ b/mono/metadata/w32process-unix.c
@@ -2032,6 +2032,9 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar
static char *handler;
static gunichar2 *handler_utf16;
+#ifndef HOST_DARWIN
+ gboolean finished = FALSE;
+#endif
if (handler_utf16 == (gunichar2 *)-1) {
ret = FALSE;
@@ -2057,6 +2060,7 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar
if (handler == NULL){
handler_utf16 = (gunichar2 *) -1;
ret = FALSE;
+ finished = TRUE;
} else {
/* kfmclient needs exec argument */
char *old = handler;
@@ -2067,9 +2071,8 @@ ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoW32ProcessStar
}
}
MONO_EXIT_GC_SAFE;
- if (ret == FALSE){
+ if (finished)
goto done;
- }
#endif
handler_utf16 = g_utf8_to_utf16 (handler, -1, NULL, NULL, NULL);
g_free (handler);

View File

@ -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

View File

@ -20,10 +20,10 @@
%undefine _missing_build_ids_terminate_build
%endif
%global xamarinrelease 161
%global xamarinrelease 166
Name: mono
Version: 6.6.0
Release: 5%{?dist}
Release: 10%{?dist}
Summary: Cross-platform, Open Source, .NET development framework
License: MIT
@ -56,6 +56,10 @@ 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
# fix issue with process start (#1839410)
Patch14: mono-6.12.0-fix-process-start.patch
BuildRequires: bison
BuildRequires: python%{python3_pkgversion}
@ -348,6 +352,8 @@ pushd external/api-doc-tools
%patch11 -p1
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
@ -414,7 +420,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
@ -477,10 +483,17 @@ 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
# 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
@ -540,6 +553,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
@ -656,8 +670,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
%mono_bin monolinker
%mono_bin mono-shlib-cop
@ -746,8 +758,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 two 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 +941,21 @@ cert-sync /etc/pki/tls/certs/ca-bundle.crt
%files complete
%changelog
* Mon Feb 22 2021 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-10
- backport patch: fix early return in Process.Start (#1839410)
* Wed Oct 14 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-9
- fix issue with conflicts between i686 and x86_64 package (#1853724)
* Fri Aug 21 2020 François Cami <fcami@redhat.com> - 6.6.0-8
- Ship libMonoSupportW.so
* Wed Jun 17 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-7
- fix for epel7, don't deliver mono-find-provides or mono-find-requires since they are still part of rpm-build
* Wed Jun 17 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-6
- new upstream Mono 6.6.0.166
* Mon Feb 03 2020 Robert-André Mauchin <zebob.m@gmail.com> - 6.6.0-5
- Reenable mdoc build (#1797360)

View File

@ -1 +1 @@
SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186
SHA512 (mono-6.6.0.166.tar.xz) = 75a4c4f6c82842d2a42383eac4e7afcb313f3d63b500786ce249c7a89061677e6e042568eb5add700381bb73cd4ca1baff3f2c734598387be81542fa92378a4d