From 5cc05d71a1e6cec6ba557db3e15a07f07c901238 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 12 May 2015 16:15:35 +0100 Subject: [PATCH 1/2] Emergency backport to fix #29667 Former-commit-id: 7bd9b174666db6c7c59e599c5664252ecb839b52 --- ...aching-Remove-inappropropriate-use-o.patch | 38 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 debian/patches/0001-system.runtime.caching-Remove-inappropropriate-use-o.patch diff --git a/debian/patches/0001-system.runtime.caching-Remove-inappropropriate-use-o.patch b/debian/patches/0001-system.runtime.caching-Remove-inappropropriate-use-o.patch new file mode 100644 index 0000000000..eca7c1d675 --- /dev/null +++ b/debian/patches/0001-system.runtime.caching-Remove-inappropropriate-use-o.patch @@ -0,0 +1,38 @@ +From ffb5c90e08d2f619b207c07c25b8551f52e9913e Mon Sep 17 00:00:00 2001 +From: Marek Safar +Date: Sat, 9 May 2015 12:24:20 +0200 +Subject: [PATCH] [system.runtime.caching] Remove inappropropriate use of + Marshal.SizeOf. Fixes #29667 + +--- + mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs +index ce0812b..644a2fc 100644 +--- a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs ++++ b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs +@@ -11,14 +11,17 @@ namespace System.Runtime.Caching { + */ + internal class SRef { + +- private Object _sizedRef; ++// private Object _sizedRef; + + internal SRef (Object target) { +- _sizedRef = target; ++// _sizedRef = target; + } + + internal long ApproximateSize { +- get { return (long) Marshal.SizeOf (_sizedRef.GetType ()); } ++ get { ++ // TODO: .net uses System.SizedReference which contains approximate size after Gen 2 collection ++ return 16; ++ } + } + + internal void Dispose() { +-- +1.9.1 + diff --git a/debian/patches/series b/debian/patches/series index 127c60bde1..6f09cf74af 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +0001-system.runtime.caching-Remove-inappropropriate-use-o.patch import-amd64-tramp-size.patch rename-and-package-symbolicate.patch From 0ef89dfb7611d579fe8e2f2da2fdbb7d8499d83c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 12 May 2015 16:17:41 +0100 Subject: [PATCH 2/2] finalize changelog Former-commit-id: 6f794311e65a2d240f71e02beb87db9871901f08 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index b98fa0adc2..dcb4e40111 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mono (4.0.1-0xamarin5) unstable; urgency=medium + + * [fe44de8] Add a hard dependency on ca-certificates-mono + to mono-complete. This is needed for distributions like + Mint which install without Recommends: by default. + * [7bd9b17] Emergency backport to fix #29667 + + -- Jo Shields Tue, 12 May 2015 16:16:31 +0100 + mono (4.0.1-0xamarin4) unstable; urgency=medium * [68faaca] Fix missing Mono.Xbuild.Tasks