diff --git a/0001-Reenable-mdoc.exe-build.patch b/0001-Reenable-mdoc.exe-build.patch index c757eb2..345c3f3 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 b66d70230..519a98443 100644 +index 92e8f2adbe5..88bddb66268 100644 --- a/mcs/docs/Makefile +++ b/mcs/docs/Makefile @@ -38,10 +38,6 @@ DISABLE_MCS_DOCS = yes @@ -24,11 +24,11 @@ index b66d70230..519a98443 100644 -DISABLE_MCS_DOCS = yes -endif - - test-local run-test-local run-test-ondotnet-local doc-update: + csproj-local 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 e3c5a321d..008203616 100644 +index e3c5a321d1a..00820361636 100644 --- a/mcs/tools/mdoc/Makefile +++ b/mcs/tools/mdoc/Makefile @@ -44,12 +44,6 @@ $(PROGRAM): $(PROGRAM_DEPS) @@ -84,3 +84,6 @@ index e3c5a321d..008203616 100644 check-doc-tools-update: check-monodocer-since-update \ check-monodocer-importecmadoc-update \ +-- +2.24.1 + diff --git a/mono-6.12.0-correct-alloc-free-for-zlib.patch b/mono-6.12.0-correct-alloc-free-for-zlib.patch deleted file mode 100644 index d9c3b25..0000000 --- a/mono-6.12.0-correct-alloc-free-for-zlib.patch +++ /dev/null @@ -1,35 +0,0 @@ -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; - diff --git a/mono-6.14.0-arm64-fix-pointer-int.patch b/mono-6.14.0-arm64-fix-pointer-int.patch deleted file mode 100644 index e38547c..0000000 --- a/mono-6.14.0-arm64-fix-pointer-int.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-configure-c99.patch b/mono-configure-c99.patch deleted file mode 100644 index 0f78563..0000000 --- a/mono-configure-c99.patch +++ /dev/null @@ -1,76 +0,0 @@ -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-find-provides b/mono-find-provides index c410489..554bffe 100755 --- a/mono-find-provides +++ b/mono-find-provides @@ -10,19 +10,19 @@ # Args: builddir buildroot libdir IFS=$'\n' -filelist=($(grep -Ev "$3/doc/|$3/share/doc/")) +filelist=($(grep -Ev '/usr/doc/|/usr/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$3/bin" -build_libdir="$2$3/$4" +build_bindir="$2/usr/bin" +build_libdir="$2$3" if [ -x $build_bindir/monodis ]; then monodis="$build_bindir/monodis" export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -elif [ -x $3/bin/monodis ]; then - monodis="$3/bin/monodis" +elif [ -x /usr/bin/monodis ]; then + monodis="/usr/bin/monodis" else exit 0; fi diff --git a/mono-find-requires b/mono-find-requires index c87b5f6..6f96761 100755 --- a/mono-find-requires +++ b/mono-find-requires @@ -10,19 +10,19 @@ # Args: builddir buildroot libdir IFS=$'\n' -filelist=($(grep -Ev "$3/doc/|$3/share/doc/")) +filelist=($(grep -Ev '/usr/doc/|/usr/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$3/bin" -build_libdir="$2$3/$4" +build_bindir="$2/usr/bin" +build_libdir="$2$3" if [ -x $build_bindir/monodis ]; then monodis="$build_bindir/monodis" export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -elif [ -x $3/bin/monodis ]; then - monodis="$3/bin/monodis" +elif [ -x /usr/bin/monodis ]; then + monodis="/usr/bin/monodis" else exit 0; fi diff --git a/mono.attr b/mono.attr index e21f93b..98dc8d9 100644 --- a/mono.attr +++ b/mono.attr @@ -1,3 +1,3 @@ -%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_prefix} %{_lib} -%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_prefix} %{_lib} +%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} %__mono_magic Mono/.Net assembly diff --git a/mono.spec b/mono.spec index 3bb7074..266f556 100644 --- a/mono.spec +++ b/mono.spec @@ -21,14 +21,15 @@ %undefine _missing_build_ids_terminate_build %endif +%global xamarinrelease 182 Name: mono -Version: 6.14.1 -Release: 2%{?dist} +Version: 6.12.0 +Release: 11%{?dist} Summary: Cross-platform, Open Source, .NET development framework License: MIT URL: http://www.mono-project.com -Source0: https://dl.winehq.org/mono/sources/mono/%{name}-%{version}.tar.xz +Source0: http://download.mono-project.com/sources/mono/mono-%{version}.%{xamarinrelease}.tar.xz # This key was generated by Tom "spot" Callaway on Dec 1, 2009 # by running the following command: # sn -k mono.snk @@ -57,9 +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 -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 @@ -258,7 +256,7 @@ data providers. %package data-sqlite Summary: sqlite database connectivity for Mono Requires: mono-core = %{version}-%{release} -Requires: sqlite-libs%{?_isa} +Requires: sqlite %description data-sqlite This package contains the ADO.NET Data provider for the sqlite @@ -332,32 +330,32 @@ not install anything from outside the mono source (XSP, mono-basic, etc.). %{nil} %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}.%{xamarinrelease} -%patch -P 0 -p1 +%patch0 -p1 %ifarch ppc ppc64 ppc64le s390x -%patch -P 1 -p1 +%patch1 -p1 %endif -%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 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 pushd external/api-doc-tools -%patch -P 10 -p1 -%patch -P 11 -p1 +%patch10 -p1 +%patch11 -p1 popd -%patch -P 12 -p1 -%patch -P 13 -p1 -%patch -P 14 -p1 -%patch -P 15 -p1 -%patch -P 16 -p1 +%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 +# 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 @@ -374,12 +372,10 @@ 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 %{_monodir}/4.7.1-api v4.7.1 && cd - +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 - %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 @@ -475,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}%{_monodir}/msbuild +rm -rf %{buildroot}/usr/lib/mono/msbuild # we have btls debug files -rm -rf %{buildroot}/usr/lib/debug%{_libdir}/libmono-btls-shared.so-*.debug +rm -rf %{buildroot}/usr/lib/debug/usr/lib64/libmono-btls-shared.so-*.debug # drop other debug files as well -rm -rf %{buildroot}/usr/lib/debug%{_libdir}/libmono-native.so*.debug -rm -rf %{buildroot}/usr/lib/debug%{_bindir}/mono-hang-watchdog-*.debug +rm -rf %{buildroot}/usr/lib/debug/usr/lib64/libmono-native.so*.debug +rm -rf %{buildroot}/usr/lib/debug/usr/bin/mono-hang-watchdog-*.debug # create a symbolic link so that Fedora packages targetting Framework 4.5 will still build -cd %{buildroot}%{_monodir} && ln -s 4.7.1-api 4.5-api && cd - +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}%{_monodir} && ln -s 4.7.1-api 4.0-api && cd - +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}%{_fileattrsdir} -install -p -m755 %{SOURCE2} %{SOURCE3} %{buildroot}%{_rpmconfigdir} -install -p -m644 %{SOURCE4} %{buildroot}%{_fileattrsdir} +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/ @@ -505,7 +501,7 @@ rm %{buildroot}%{_bindir}/mono-find-provides %post core %{?ldconfig} -%{_bindir}/cert-sync --quiet /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem +cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt %ldconfig_postun @@ -759,15 +755,14 @@ 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 # 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 -%{_rpmconfigdir}/mono-find-* -%{_fileattrsdir}/mono.attr +%{_prefix}/lib/rpm/mono-find-* +%{_prefix}/lib/rpm/fileattrs/mono.attr %endif %{_bindir}/aprofutil @@ -946,43 +941,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - * Thu Jan 19 2023 Fedora Release Engineering - 6.12.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 808f713..c38744d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mono-6.14.1.tar.xz) = c16a2ecbfce93db20a7a6d11b6406c8764f5694355c1ce82081399cd7ab6d8b22e7f8fb21f7af78967b34ef54dcb682917b8cf22d61f1b72be996d1a42e9f1b9 +SHA512 (mono-6.12.0.182.tar.xz) = 5f0f02f2adf89785af8f620c16d69fc97b87c9b39133286e6f1237a397f4842ea8d26802d9f802f8798a86540dc1bc3b5201428f218c78fbcf91f0d575cde512