Hello community, here is the log from the commit of package mono-core for openSUSE:Factory checked in at 2015-05-22 16:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-core (Old) and /work/SRC/openSUSE:Factory/.mono-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mono-core" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-core/mono-core.changes 2015-05-10 10:53:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mono-core.new/mono-core.changes 2015-05-22 16:31:30.000000000 +0200 @@ -1,0 +2,15 @@ +Wed May 20 11:00:00 UTC 2015 - [email protected] + +- Update to version 4.0.1.43: + * fixed bugs: 29459, 29898, 29667, 28557, 29177, 28847, 28209, 26998, 29039 and more + * fixes in mono profiler +- Add mono-bug-30171.patch to fix BinaryReader bug with Unicode encoding +- Removed amd64-tramp-size.patch (fix included in 4.0.1.43 release) + +------------------------------------------------------------------- +Wed May 20 09:50:17 UTC 2015 - [email protected] + +- Add mono-bug-28777.patch to fix a DeflateStream bug, should fix + KeePass problems + +------------------------------------------------------------------- @@ -23 +38 @@ -- Don't run parralel build. It is too fragile +- Don't run parallel build. It is too fragile Old: ---- amd64-tramp-size.patch mono-4.0.1.tar.bz2 New: ---- mono-4.0.1.43.tar.bz2 mono-bug-28777.patch mono-bug-30171.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-core.spec ++++++ --- /var/tmp/diff_new_pack.l1BB24/_old 2015-05-22 16:31:33.000000000 +0200 +++ /var/tmp/diff_new_pack.l1BB24/_new 2015-05-22 16:31:33.000000000 +0200 @@ -21,7 +21,7 @@ %define sgen yes Name: mono-core -Version: 4.0.1 +Version: 4.0.1.43 Release: 0 Summary: Cross-platform, Open Source, .NET development framework License: LGPL-2.1 and MIT and MS-PL @@ -36,8 +36,10 @@ # so cp won't work, should add -r argument # https://github.com/mono/mono/pull/1764 Patch1: mono-3.x-keyboards.resources-cp_r.patch -# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/acdcee6a43f762edcd3cd295cd4225d8c2b949d1.patch -Patch2: amd64-tramp-size.patch +# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/bcb651 +Patch2: mono-bug-28777.patch +# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/ed1d3ec5260b613849b9af27c9dbcb6566c1637c.patch +Patch3: mono-bug-30171.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -107,10 +109,11 @@ technologies that have been submitted to the ECMA for standardization. %prep -%setup -q -n mono-%{version} +%setup -q -n mono-4.0.1 %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build NOCONFIGURE="yes" ./autogen.sh ++++++ mono-4.0.1.tar.bz2 -> mono-4.0.1.43.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mono-core/mono-4.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.mono-core.new/mono-4.0.1.43.tar.bz2 differ: char 11, line 1 ++++++ mono-bug-28777.patch ++++++ >From 2dcdfe76d02fed91b71e5b49b6028c6c82e10d4c Mon Sep 17 00:00:00 2001 From: Gabriel Garcia <[email protected]> Date: Mon, 6 Apr 2015 13:59:43 -0400 Subject: [PATCH] [System] Fix DeflateStream throw on empty flush, double flush. Fixes #28777 diff --git a/support/zlib-helper.c b/support/zlib-helper.c index 8345541..3869626 100644 --- a/support/zlib-helper.c +++ b/support/zlib-helper.c @@ -90,6 +90,8 @@ CreateZStream (gint compress, guchar gzip, read_write_func func, void *gchandle) result->gchandle = gchandle; result->compress = compress; result->buffer = g_new (guchar, BUFFER_SIZE); + result->stream->next_out = result->buffer; + result->stream->avail_out = BUFFER_SIZE; return result; } @@ -148,7 +150,7 @@ flush_internal (ZStream *stream, gboolean is_final) if (!stream->compress) return 0; - if (!is_final) { + if (!is_final && stream->stream->avail_in != 0) { status = deflate (stream->stream, Z_PARTIAL_FLUSH); if (status != Z_OK && status != Z_STREAM_END) return status; ++++++ mono-bug-30171.patch ++++++ >From ed1d3ec5260b613849b9af27c9dbcb6566c1637c Mon Sep 17 00:00:00 2001 From: Marek Safar <[email protected]> Date: Wed, 20 May 2015 09:55:49 +0200 Subject: [PATCH] [corlib] BinaryReader with Unicode encoding needs to read bytes in a pair. Fixes #30171 --- mcs/class/corlib/System.IO/BinaryReader.cs | 7 +++++++ mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/mcs/class/corlib/System.IO/BinaryReader.cs b/mcs/class/corlib/System.IO/BinaryReader.cs index 73235c9..bbcd817 100644 --- a/mcs/class/corlib/System.IO/BinaryReader.cs +++ b/mcs/class/corlib/System.IO/BinaryReader.cs @@ -253,6 +253,13 @@ private int ReadCharBytes (char[] buffer, int index, int count, out int bytes_re m_buffer [pos ++] = (byte)read_byte; bytes_read ++; + if (m_encoding is UnicodeEncoding) { + CheckBuffer (pos + 1); + read_byte = m_stream.ReadByte(); + if (read_byte != -1) { + m_buffer [pos++] = (byte)read_byte; + } + } int n = m_encoding.GetChars (m_buffer, 0, pos, buffer, index + chars_read); if (n > 0) diff --git a/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs b/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs index 852d690..ca4e3da 100644 --- a/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs +++ b/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs @@ -274,6 +274,20 @@ public void TestReadChar() } } + [Test] + public void TestReadUnicode () + { + char testChar1 = 'H'; + using (var stream = new MemoryStream()) + using (var writer = new BinaryWriter(stream, Encoding.Unicode, true)) + using (var reader = new BinaryReader(stream, Encoding.Unicode)) + { + writer.Write(testChar1); + stream.Position = 0; + Assert.AreEqual ('H', reader.ReadChar ()); + } + } + //-TODO: (TestRead[Type]*) Verify the ReadBoolean, ReadByte .... // ReadBoolean, ReadByte, ReadChar, ReadInt32 Done
