From 5ff21990e54b87968329ebd694775ff8b3e752fd65850819720223d302b87d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Aug 2015 18:17:14 +0000 Subject: [PATCH] Accepting request 327874 from home:Warhammer40k:Mono:4.0 OBS-URL: https://build.opensuse.org/request/show/327874 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=156 --- mono-4.0.3.20.tar.bz2 | 3 --- mono-4.0.4.1.tar.bz2 | 3 +++ mono-bug-28777.patch | 28 ---------------------------- mono-core.changes | 6 ++++++ mono-core.spec | 7 ++----- 5 files changed, 11 insertions(+), 36 deletions(-) delete mode 100644 mono-4.0.3.20.tar.bz2 create mode 100644 mono-4.0.4.1.tar.bz2 delete mode 100644 mono-bug-28777.patch diff --git a/mono-4.0.3.20.tar.bz2 b/mono-4.0.3.20.tar.bz2 deleted file mode 100644 index f310475..0000000 --- a/mono-4.0.3.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:976c0be3ab9b66361f48e8133c60b1b2942b88c44a7a11a19cd98f5ff64313fc -size 95987018 diff --git a/mono-4.0.4.1.tar.bz2 b/mono-4.0.4.1.tar.bz2 new file mode 100644 index 0000000..e9b6eaa --- /dev/null +++ b/mono-4.0.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed11ed20ce5930c775af02bd41c43658bc9320f0bfd592fbb9895d95104dbcf9 +size 96106273 diff --git a/mono-bug-28777.patch b/mono-bug-28777.patch deleted file mode 100644 index 6afd46a..0000000 --- a/mono-bug-28777.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2dcdfe76d02fed91b71e5b49b6028c6c82e10d4c Mon Sep 17 00:00:00 2001 -From: Gabriel Garcia -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; diff --git a/mono-core.changes b/mono-core.changes index 4422af9..1be863b 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 28 18:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net + +- Update to version 4.0.4.1, Bugfixes: #31582, #30868, #28777, #30043, #31060, #30276, #30869 +- Dropped mono-bug-28777.patch + ------------------------------------------------------------------- Sat Aug 22 06:16:37 UTC 2015 - mailaender@opensuse.org diff --git a/mono-core.spec b/mono-core.spec index 5452093..756e4d0 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -21,19 +21,17 @@ %define sgen yes Name: mono-core -Version: 4.0.3 +Version: 4.0.4 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}.20.tar.bz2 +Source0: http://download.mono-project.com/sources/mono/mono-%{version}.1.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-UPSTREAM https://github.com/mono/mono/commit/bcb651 -Patch2: mono-bug-28777.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -105,7 +103,6 @@ technologies that have been submitted to the ECMA for standardization. %prep %setup -q -n mono-%{version} %patch0 -p1 -%patch2 -p1 %build NOCONFIGURE="yes" ./autogen.sh