Accepting request 345612 from home:Warhammer40k:Mono:Factory

OBS-URL: https://build.opensuse.org/request/show/345612
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=159

authors.patch

@@ -0,0 +1,7 @@
+diff -uprN mono-4.2.0.old/AUTHORS mono-4.2.0.new/AUTHORS
+--- mono-4.2.0.old/AUTHORS	1970-01-01 03:00:00.000000000 +0300
++++ mono-4.2.0.new/AUTHORS	2015-07-20 10:07:11.000000000 +0300
+@@ -0,0 +1,3 @@
++Miguel de Icaza (miguel@ximian.com)
++Paolo Molaro (lupus@ximian.com)
++Dietmar Maurer (dietmar@ximian.com)

mono-4.0.5.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2f42944dded3196c6449f90e79990f1951070a361a0dcc2350fc56e945bc229
-size 96533206

mono-4.2.1.102.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7b461fe04375f621d88166ba8c6f1cb33c439fd3e17136460f7d087a51ed792
+size 96228604

mono-core.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Nov 17 00:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net, martin.liska@suse.com
+
+- Update to version 4.2.1.102:
+  * More adoption of Microsoft's open source code
+  * Support for PPDB debugging format
+  * New threadpool implementation
+  * Runtime optimizations
+  * Extensive bug fixing (see http://www.mono-project.com/docs/about-mono/releases/4.2.0 for complete list)
+- Temporary fixes for old incorrect dependencies. See this link for more details: https://github.com/mono/mono/commit/1f4133a06f252ec1b78637dd91e49f50836cf570
+- Added authors.patch to fix missing authors file
+- Added strncat-process-c.patch - fix insecure use of strncat at process.c:383 to fix OBS build
+- Added mono-un-revoke-fix-in-BNC-144655.patch - fix BNC 144655
+- Various packaging fixes
+
 -------------------------------------------------------------------
 Sun Nov 15 12:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net
 

mono-core.spec

@@ -21,17 +21,22 @@
 %define sgen yes
 
 Name:           mono-core
-Version:        4.0.5
+Version:        4.2.1
 Release:        0
 Summary:        Cross-platform, Open Source, .NET development framework
 License:        LGPL-2.1 and MIT and MS-PL
 Group:          Development/Languages/Mono
 Url:            http://www.mono-project.com
-Source0:        http://download.mono-project.com/sources/mono/mono-%{version}.1.tar.bz2
+Source0:        http://download.mono-project.com/sources/mono/mono-%{version}.102.tar.bz2
 Source1:        mono-core.rpmlintrc
 Source2:        gmcs
 # PATCH-FIX-OPENSUSE Use runtime 4.5 as default for nunit
 Patch0:         mono-nunit-default-runtime-4.5.patch
+# PATCH-FIX-OPENSUSE authors file is missing
+Patch2:         authors.patch
+# PATCH-FIX-OPENSUSE fix insecure use of strncat at process.c:383 to fix build process
+Patch3:         strncat-process-c.patch
+Patch4:         mono-un-revoke-fix-in-BNC-144655.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -86,6 +91,8 @@ Provides:       mono(System.Xml) = 1.0.5000.0
 Provides:       mono(System.Xml) = 2.0.0.0
 Provides:       mono(mscorlib) = 1.0.5000.0
 Provides:       mono(mscorlib) = 2.0.0.0
+Provides:       mono(mscorlib) = 4.0.0.0
+Provides:       mono(Mono.Configuration.Crypto) = 4.0.0.0
 # mono-core provides System.DateTime functions, which rely on timezone information
 Requires:       timezone
 
@@ -103,6 +110,9 @@ technologies that have been submitted to the ECMA for standardization.
 %prep
 %setup -q -n mono-%{version}
 %patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 NOCONFIGURE="yes" ./autogen.sh
@@ -763,13 +773,17 @@ Mono implementation of WCF, Windows Communication Foundation
 %{_prefix}/lib/mono/4.5/System.ServiceModel.Discovery.dll
 %{_prefix}/lib/mono/4.5/System.ServiceModel.Routing.dll
 %{_prefix}/lib/mono/4.5/System.ServiceModel.Web.dll
+%{_prefix}/lib/mono/4.5/System.ServiceModel.Internals.dll
 %{_prefix}/lib/mono/4.5/System.ServiceModel.dll
+%{_prefix}/lib/mono/4.5/SMDiagnostics.dll
 %{_prefix}/lib/mono/4.5/svcutil.exe*
 %{_prefix}/lib/mono/gac/System.Data.Services
 %{_prefix}/lib/mono/gac/System.IdentityModel
 %{_prefix}/lib/mono/gac/System.IdentityModel.Selectors
 %{_prefix}/lib/mono/gac/System.Runtime.DurableInstancing
+%{_prefix}/lib/mono/gac/SMDiagnostics
 %{_prefix}/lib/mono/gac/System.ServiceModel
+%{_prefix}/lib/mono/gac/System.ServiceModel.Internals
 %{_prefix}/lib/mono/gac/System.ServiceModel.Activation
 %{_prefix}/lib/mono/gac/System.ServiceModel.Discovery
 %{_prefix}/lib/mono/gac/System.ServiceModel.Routing
@@ -1005,6 +1019,10 @@ Provides:       mono-biarchcompat = %{version}
 %endif
 Provides:       mono(PEAPI) = 1.0.5000.0
 Provides:       mono(resgen) = 1.0.5000.0
+#following 3 lines needed for a temporary build fix. According to https://github.com/mono/mono/commit/1f4133a06f252ec1b78637dd91e49f50836cf570, we shoud fix individual packages that rely on incorrect dependencies
+Provides:       mono(System.ServiceModel) = 3.0.0.0
+Provides:       mono(System.Core) = 3.5.0.0
+Provides:       mono(Mono.Posix) = 2.0.0.0
 
 %description -n mono-devel
 The Mono Project is an open development initiative that is working to
@@ -1042,6 +1060,7 @@ Mono development tools.
 %{_bindir}/mono-find-requires
 %{_bindir}/mono-heapviz
 %{_bindir}/mono-shlib-cop
+%{_bindir}/mono-symbolicate
 %{_bindir}/mono-xmltool
 %{_bindir}/monodis
 %{_bindir}/monolinker
@@ -1061,7 +1080,9 @@ Mono development tools.
 %dir %{_datadir}/mono-2.0
 %dir %{_datadir}/mono-2.0/mono
 %dir %{_datadir}/mono-2.0/mono/cil
+%dir %{_datadir}/mono-2.0/mono/profiler
 %{_datadir}/mono-2.0/mono/cil/cil-opcodes.xml
+%{_datadir}/mono-2.0/mono/profiler/mono-profiler-log.suppression
 %{_libdir}/libmono-profiler-*.*
 %{_libdir}/pkgconfig/cecil.pc
 %{_libdir}/pkgconfig/dotnet.pc
@@ -1086,6 +1107,7 @@ Mono development tools.
 %{_mandir}/man1/mono-api-info.1%ext_man
 %{_mandir}/man1/mono-cil-strip.1%ext_man
 %{_mandir}/man1/mono-shlib-cop.1%ext_man
+%{_mandir}/man1/mono-symbolicate.1%ext_man
 %{_mandir}/man1/mono-xmltool.1%ext_man
 %{_mandir}/man1/monodis.1%ext_man
 %{_mandir}/man1/monolinker.1%ext_man
@@ -1130,6 +1152,7 @@ Mono development tools.
 %{_prefix}/lib/mono/4.5/mono-api-info.exe*
 %{_prefix}/lib/mono/4.5/mono-cil-strip.exe*
 %{_prefix}/lib/mono/4.5/mono-shlib-cop.exe*
+%{_prefix}/lib/mono/4.5/mono-symbolicate.exe*
 %{_prefix}/lib/mono/4.5/mono-xmltool.exe*
 %{_prefix}/lib/mono/4.5/monolinker.*
 %{_prefix}/lib/mono/4.5/monop.exe*
@@ -1139,7 +1162,6 @@ Mono development tools.
 %{_prefix}/lib/mono/4.5/secutil.exe*
 %{_prefix}/lib/mono/4.5/sgen.exe*
 %{_prefix}/lib/mono/4.5/signcode.exe*
-%{_prefix}/lib/mono/4.5/symbolicate.exe*
 %{_prefix}/lib/mono/4.5/xbuild.exe*
 %{_prefix}/lib/mono/4.5/xbuild.rsp
 %{_prefix}/lib/mono/4.5/MSBuild/

mono-un-revoke-fix-in-BNC-144655.patch

@@ -0,0 +1,28 @@
+From cdb098617af97c6af76e9048af62e8e5e778b5b6 Mon Sep 17 00:00:00 2001
+From: Jo Shields <jo.shields@xamarin.com>
+Date: Tue, 11 Aug 2015 19:41:23 +0100
+Subject: [PATCH] Un-revoke fix in BNC#144655 - mono-find-provides should ONLY
+ work on GAC libraries, and any packages which break on this behaviour should
+ be fixed - rather than generating utterly broken Provides.
+
+(cherry picked from commit 1f4133a06f252ec1b78637dd91e49f50836cf570)
+---
+ scripts/mono-find-provides.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
+index 155690d..5e440ab 100644
+--- a/scripts/mono-find-provides.in
++++ b/scripts/mono-find-provides.in
+@@ -14,7 +14,7 @@ monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
+ 
+ # Only include files with /gac/ in path
+ #  (Allows packages to contain private assemblies that don't conflict with other packages)
+-#monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
++monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
+ # Disabled... see ChangeLog
+ 
+ # Set the prefix, unless it is overriden (used when building mono rpms)
+-- 
+2.6.0
+

strncat-process-c.patch

@@ -0,0 +1,12 @@
+diff -uprN mono-4.2.0.old/mono/metadata/process.c mono-4.2.0.new/mono/metadata/process.c
+--- mono-4.2.0.old/mono/metadata/process.c	2015-08-26 12:42:25.000000000 +0300
++++ mono-4.2.0.new/mono/metadata/process.c	2015-08-29 15:49:25.369632846 +0300
+@@ -380,7 +380,7 @@ static MonoObject* get_process_module (M
+ 	char filename [80] = "[In Memory] ";
+ 	const char *modulename = assembly->aname.name;
+ 
+-	strncat (filename, modulename, 80);
++	strncat (filename, modulename, sizeof(filename)-strlen(filename)-1);
+ 
+ 	/* Build a System.Diagnostics.ProcessModule with the data.
+ 	 */