testing/mono: upgrade to 4.6.1.5

4 files changed, 8 insertions, 52 deletions

diff --git a/testing/mono/APKBUILD b/testing/mono/APKBUILD
index 30cb5e3959..9cf9d85600 100644
--- a/testing/mono/APKBUILD
+++ b/testing/mono/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=mono
-pkgver=4.2.2.30
-pkgrel=1
+pkgver=4.6.1.5
+pkgrel=0
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 url="http://www.mono-project.com/"
 arch="x86_64 x86"
@@ -14,9 +14,6 @@ install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://download.mono-project.com/sources/mono/mono-${pkgver/_/~}.tar.bz2
 	arm-remove-sigcontext-include.patch
-	mono-nunit-default-runtime-4.5.patch
-	mono-un-revoke-fix-in-BNC-144655.patch
-	strncat-process-c.patch
 	"
 
 _builddir="$srcdir"/mono-${pkgver%.*}
@@ -62,18 +59,9 @@ package() {
 		| xargs paxmark -mr
 }
 
-md5sums="2c5358041c931b8c1eabf0544565c9a3  mono-4.2.2.30.tar.bz2
-81b20f045bb906dd2ea99b4153365387  arm-remove-sigcontext-include.patch
-0643e579c4df750a4b416d30ab5d39b3  mono-nunit-default-runtime-4.5.patch
-e06fd0d4707927b23a6e736e7264bebb  mono-un-revoke-fix-in-BNC-144655.patch
-f6efdeacbd0524ba4f665bd4ca31178a  strncat-process-c.patch"
-sha256sums="57858cd033be9915d7abdc5158c1faae8fa05757c3b7117cab3d703aa696c56b  mono-4.2.2.30.tar.bz2
-5e522d89b84a450d507d05b59a496d006963260f4a953c107488cc2187df83bc  arm-remove-sigcontext-include.patch
-b3962f77c25bb933fe384aa734855942089871cb0eaf48ca73fde92536d5bf18  mono-nunit-default-runtime-4.5.patch
-14cfc87ce6722e5c9f1bf16272b05df2a8ee40b25aeea39b2558d203781f3767  mono-un-revoke-fix-in-BNC-144655.patch
-e3a88d0ab543660255b1c92185153bf12082e256933133fa2592a17dd43c17d3  strncat-process-c.patch"
-sha512sums="5aa93b362da84970310cc35bf02300718a20d2b508c263f45224d89f7aee84ead90c6fd7230ee2f17a2c02d480e3a8f7d2c9308cec0062a8f4c107f674a7c752  mono-4.2.2.30.tar.bz2
-cc0382a1cba87fd2b76be46c6a2d28180cc489b10efe9359681fa85ce28d17e000dab0221f203f8f40a711fb6dddc3e39847cdf0a224344240a43d73971eccf8  arm-remove-sigcontext-include.patch
-fdae91b30f7a44b11057842cdc8cbf4f2994bd7c32af4c521de20a51324153f921f5d3bc1c12ccb90ed63b82ac2766ee8f710a380c638a8bda640e158afefdb3  mono-nunit-default-runtime-4.5.patch
-b0895e97741836408903ebaa36c72080758ac23acbc63c4bb5e8ded99fad1fd77cc895a7b8144faed65b67cd0c7aecd7c0e88fb3be3bc3aa84d73acef4405c6a  mono-un-revoke-fix-in-BNC-144655.patch
-1095a78c178de8ce67fb99d08734d8128edabbc261b5badf3e5d4c6b63ca3062d3759ee975bc437e1701c8cd10f0b4407a1f4e17604922310d406e88a0cce866  strncat-process-c.patch"
+md5sums="601a96baa96a2e7acde1fb7e622322c4  mono-4.6.1.5.tar.bz2
+81b20f045bb906dd2ea99b4153365387  arm-remove-sigcontext-include.patch"
+sha256sums="3871ee72bdfc2ea5d636ffff22cf49ae6bac7c4a4f3d687214dd8ac236bbf7c3  mono-4.6.1.5.tar.bz2
+5e522d89b84a450d507d05b59a496d006963260f4a953c107488cc2187df83bc  arm-remove-sigcontext-include.patch"
+sha512sums="1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a  mono-4.6.1.5.tar.bz2
+cc0382a1cba87fd2b76be46c6a2d28180cc489b10efe9359681fa85ce28d17e000dab0221f203f8f40a711fb6dddc3e39847cdf0a224344240a43d73971eccf8  arm-remove-sigcontext-include.patch"
diff --git a/testing/mono/mono-nunit-default-runtime-4.5.patch b/testing/mono/mono-nunit-default-runtime-4.5.patch
deleted file mode 100644
index c05342fdc7..0000000000
--- a/testing/mono/mono-nunit-default-runtime-4.5.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./data/mono-nunit.pc.in
-+++ ./data/mono-nunit.pc.in
-@@ -6,4 +6,4 @@
- Name: Mono NUnit
- Description: Mono's version of NUnit
- Version: @VERSION@
--Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll 
-+Libs: -r:${libdir}/mono/4.5/nunit.core.dll -r:${libdir}/mono/4.5/nunit.core.interfaces.dll -r:${libdir}/mono/4.5/nunit.core.extensions.dll -r:${libdir}/mono/4.5/nunit.framework.dll -r:${libdir}/mono/4.5/nunit.framework.extensions.dll -r:${libdir}/mono/4.5/nunit.mocks.dll -r:${libdir}/mono/4.5/nunit.util.dll -r:${libdir}/mono/4.5/nunit-console-runner.dll 
diff --git a/testing/mono/mono-un-revoke-fix-in-BNC-144655.patch b/testing/mono/mono-un-revoke-fix-in-BNC-144655.patch
deleted file mode 100644
index 6a2d9f53de..0000000000
--- a/testing/mono/mono-un-revoke-fix-in-BNC-144655.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./scripts/mono-find-provides.in
-+++ ./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
diff --git a/testing/mono/strncat-process-c.patch b/testing/mono/strncat-process-c.patch
deleted file mode 100644
index b80fb30d85..0000000000
--- a/testing/mono/strncat-process-c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./mono/metadata/process.c	2015-08-26 12:42:25.000000000 +0300
-+++ ./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.
- 	 */