diff --git a/.gitignore b/.gitignore index 8e470d5..6bd9484 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.0.20.tar.gz +SOURCES/mariadb-10.0.25.tar.gz diff --git a/.rh-mariadb100-mariadb.metadata b/.rh-mariadb100-mariadb.metadata index 6905cbe..23cacde 100644 --- a/.rh-mariadb100-mariadb.metadata +++ b/.rh-mariadb100-mariadb.metadata @@ -1 +1 @@ -e005c8dc2b2e4b0b3215f8bbb9b0b43726c7cf6a SOURCES/mariadb-10.0.20.tar.gz +eb5f2af0f5f4a2432b3f9fb1afb109b3091d3059 SOURCES/mariadb-10.0.25.tar.gz diff --git a/SOURCES/mariadb-covscan-signexpr.patch b/SOURCES/mariadb-covscan-signexpr.patch deleted file mode 100644 index 54d47b5..0000000 --- a/SOURCES/mariadb-covscan-signexpr.patch +++ /dev/null @@ -1,16 +0,0 @@ -This issue has been found by Coverity - static analysis tool. - -mysql-5.5.31/strings/ctype-ucs2.c:1707:sign_extension – Suspicious implicit sign extension: "s[0]" with type "unsigned char" (8 bits, unsigned) is promoted in "(s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]" to type "int" (32 bits, signed), then sign-extended to type "unsigned long" (64 bits, unsigned). If "(s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]" is greater than 0x7FFFFFFF, the upper bits of the result will all be 1. - -diff -up mariadb-10.0.15/strings/ctype-ucs2.c.orig mariadb-10.0.15/strings/ctype-ucs2.c ---- mariadb-10.0.15/strings/ctype-ucs2.c.orig 2014-11-27 15:14:11.129554529 +0100 -+++ mariadb-10.0.15/strings/ctype-ucs2.c 2014-11-27 15:13:06.806439653 +0100 -@@ -1932,7 +1932,7 @@ my_utf32_uni(CHARSET_INFO *cs __attribut - { - if (s + 4 > e) - return MY_CS_TOOSMALL4; -- *pwc= (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]); -+ *pwc= (((my_wc_t)s[0]) << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]); - return 4; - } - diff --git a/SOURCES/mariadb-covscan-stroverflow.patch b/SOURCES/mariadb-covscan-stroverflow.patch index 42f373d..0e169dc 100644 --- a/SOURCES/mariadb-covscan-stroverflow.patch +++ b/SOURCES/mariadb-covscan-stroverflow.patch @@ -6,10 +6,10 @@ mysql-5.5.31/plugin/semisync/semisync_master.cc:661:parameter_as_source – Note mysql-5.5.31/plugin/semisync/semisync_master.cc:555:parameter_as_source – Note: This defect has an elevated risk because the source argument is a parameter of the current function. -diff -up mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig mariadb-10.0.15/plugin/semisync/semisync_master.cc ---- mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig 2014-11-27 15:16:59.664855517 +0100 -+++ mariadb-10.0.15/plugin/semisync/semisync_master.cc 2014-11-27 15:16:17.029779375 +0100 -@@ -553,7 +553,8 @@ int ReplSemiSyncMaster::reportReplyBinlo +diff -up mariadb-10.0.25/plugin/semisync/semisync_master.cc.orig mariadb-10.0.25/plugin/semisync/semisync_master.cc +--- mariadb-10.0.25/plugin/semisync/semisync_master.cc.orig 2014-11-27 15:16:59.664855517 +0100 ++++ mariadb-10.0.25/plugin/semisync/semisync_master.cc 2014-11-27 15:16:17.029779375 +0100 +@@ -554,7 +553,8 @@ int ReplSemiSyncMaster::reportReplyBinlo if (need_copy_send_pos) { @@ -19,7 +19,7 @@ diff -up mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig mariadb-10.0.15 reply_file_pos_ = log_file_pos; reply_file_name_inited_ = true; -@@ -661,7 +662,8 @@ int ReplSemiSyncMaster::commitTrx(const +@@ -662,7 +663,8 @@ int ReplSemiSyncMaster::commitTrx(const if (cmp <= 0) { /* This thd has a lower position, let's update the minimum info. */ @@ -29,7 +29,7 @@ diff -up mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig mariadb-10.0.15 wait_file_pos_ = trx_wait_binlog_pos; rpl_semi_sync_master_wait_pos_backtraverse++; -@@ -672,7 +674,8 @@ int ReplSemiSyncMaster::commitTrx(const +@@ -673,7 +673,8 @@ int ReplSemiSyncMaster::commitTrx(const } else { @@ -42,16 +42,16 @@ diff -up mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig mariadb-10.0.15 mysql-5.5.31/sql/rpl_handler.cc:306:fixed_size_dest – You might overrun the 512 byte fixed-size string "log_info->log_file" by copying "log_file + dirname_length(log_file)" without checking the length. diff -up mysql-5.5.31/sql/rpl_handler.cc.covscan-stroverflow mysql-5.5.31/sql/rpl_handler.cc -diff -up mariadb-10.0.15/sql/rpl_handler.cc.orig mariadb-10.0.15/sql/rpl_handler.cc ---- mariadb-10.0.15/sql/rpl_handler.cc.orig 2014-11-27 15:17:28.000906123 +0100 -+++ mariadb-10.0.15/sql/rpl_handler.cc 2014-11-27 15:16:17.030779377 +0100 -@@ -270,7 +270,8 @@ int Binlog_storage_delegate::after_flush - my_pthread_setspecific_ptr(RPL_TRANS_BINLOG_INFO, log_info); +diff -up mariadb-10.0.25/sql/rpl_handler.cc.orig mariadb-10.0.25/sql/rpl_handler.cc +--- mariadb-10.0.25/sql/rpl_handler.cc.orig 2016-04-28 22:27:48.000000000 +0200 ++++ mariadb-10.0.25/sql/rpl_handler.cc 2016-05-05 15:10:19.562177816 +0200 +@@ -261,7 +261,8 @@ int Binlog_storage_delegate::after_flush + thd->semisync_info= log_info; } - + - strcpy(log_info->log_file, log_file+dirname_length(log_file)); + strncpy(log_info->log_file, log_file+dirname_length(log_file), sizeof(log_info->log_file)-1); + log_info->log_file[sizeof(log_info->log_file)-1] = '\0'; log_info->log_pos = log_pos; - int ret= 0; + FOREACH_OBSERVER(ret, after_flush, false, diff --git a/SOURCES/mariadb-install-test.patch b/SOURCES/mariadb-install-test.patch index e377e60..a6c2866 100644 --- a/SOURCES/mariadb-install-test.patch +++ b/SOURCES/mariadb-install-test.patch @@ -1,8 +1,8 @@ Improve the documentation that will be installed in the mysql-test RPM. -diff -up mariadb-10.0.10/mysql-test/README.p3 mariadb-10.0.10/mysql-test/README ---- mariadb-10.0.10/mysql-test/README.p3 2014-04-07 16:05:51.402631548 +0200 -+++ mariadb-10.0.10/mysql-test/README 2014-04-07 16:06:06.137637991 +0200 +diff -up mariadb-10.0.25/mysql-test/README.orig mariadb-10.0.25/mysql-test/README +--- mariadb-10.0.25/mysql-test/README.orig 2016-04-28 22:27:44.000000000 +0200 ++++ mariadb-10.0.25/mysql-test/README 2016-05-05 14:57:26.937273700 +0200 @@ -1,15 +1,28 @@ -This directory contains a test suite for the MySQL daemon. To run -the currently existing test cases, simply execute ./mysql-test-run in @@ -42,7 +42,7 @@ diff -up mariadb-10.0.10/mysql-test/README.p3 mariadb-10.0.10/mysql-test/README +If one or more tests fail on your system, please read the following manual +section for instructions on how to report the problem: - http://kb.askmonty.org/v/reporting-bugs + https://mariadb.com/kb/en/reporting-bugs @@ -26,7 +39,8 @@ other relevant options. diff --git a/SOURCES/pcre-8.38-Fix-workspace-overflow-for-ACCEPT-with-deeply-nested.patch b/SOURCES/pcre-8.38-Fix-workspace-overflow-for-ACCEPT-with-deeply-nested.patch new file mode 100644 index 0000000..ae51b50 --- /dev/null +++ b/SOURCES/pcre-8.38-Fix-workspace-overflow-for-ACCEPT-with-deeply-nested.patch @@ -0,0 +1,163 @@ +From 943a5105b9fe2842851003f692c7077a6cdbeefe Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Wed, 10 Feb 2016 19:13:17 +0000 +Subject: [PATCH] Fix workspace overflow for (*ACCEPT) with deeply nested + parentheses. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1631 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index b9a239e..5019854 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -560,6 +560,7 @@ static const char error_texts[] = + /* 85 */ + "parentheses are too deeply nested (stack check)\0" + "digits missing in \\x{} or \\o{}\0" ++ "regular expression is too complicated\0" + ; + + /* Table to identify digits and hex digits. This is used when compiling +@@ -4591,7 +4592,8 @@ for (;; ptr++) + if (code > cd->start_workspace + cd->workspace_size - + WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */ + { +- *errorcodeptr = ERR52; ++ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)? ++ ERR52 : ERR87; + goto FAILED; + } + +@@ -6626,8 +6628,21 @@ for (;; ptr++) + cd->had_accept = TRUE; + for (oc = cd->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++#ifdef COMPILE_PCRE8 ++ *lengthptr += 1 + IMM2_SIZE; ++#elif defined COMPILE_PCRE16 ++ *lengthptr += 2 + IMM2_SIZE; ++#elif defined COMPILE_PCRE32 ++ *lengthptr += 4 + IMM2_SIZE; ++#endif ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; +diff --git a/pcre_internal.h b/pcre_internal.h +index f7a5ee7..dbfe80e 100644 +--- a/pcre_internal.h ++++ b/pcre_internal.h +@@ -7,7 +7,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -2289,7 +2289,7 @@ enum { ERR0, ERR1, ERR2, ERR3, ERR4, ERR5, ERR6, ERR7, ERR8, ERR9, + ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, + ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, + ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, +- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT }; ++ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT }; + + /* JIT compiling modes. The function list is indexed by them. */ + +diff --git a/pcreposix.c b/pcreposix.c +index dcc13ef..55b6ddc 100644 +--- a/pcreposix.c ++++ b/pcreposix.c +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -173,7 +173,8 @@ static const int eint[] = { + REG_BADPAT, /* group name must start with a non-digit */ + /* 85 */ + REG_BADPAT, /* parentheses too deeply nested (stack check) */ +- REG_BADPAT /* missing digits in \x{} or \o{} */ ++ REG_BADPAT, /* missing digits in \x{} or \o{} */ ++ REG_BADPAT /* pattern too complicated */ + }; + + /* Table of texts corresponding to POSIX error codes */ +diff --git a/testdata/testinput11 b/testdata/testinput11 +index ac9d228..6f0989a 100644 +--- a/testdata/testinput11 ++++ b/testdata/testinput11 +@@ -138,4 +138,6 @@ is required for these tests. --/ + + /.((?2)(?R)\1)()/B + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++ + /-- End of testinput11 --/ +diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16 +index 280692e..3c485da 100644 +--- a/testdata/testoutput11-16 ++++ b/testdata/testoutput11-16 +@@ -765,4 +765,7 @@ Memory allocation (code space): 14 + 25 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: regular expression is too complicated at offset 490 ++ + /-- End of testinput11 --/ +diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32 +index cdbda74..e19518d 100644 +--- a/testdata/testoutput11-32 ++++ b/testdata/testoutput11-32 +@@ -765,4 +765,7 @@ Memory allocation (code space): 28 + 25 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: missing ) at offset 509 ++ + /-- End of testinput11 --/ +diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8 +index cb37896..5a4fbb2 100644 +--- a/testdata/testoutput11-8 ++++ b/testdata/testoutput11-8 +@@ -765,4 +765,7 @@ Memory allocation (code space): 10 + 38 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: missing ) at offset 509 ++ + /-- End of testinput11 --/ +-- +2.5.0 + diff --git a/SOURCES/pcre-8.38-Yet-another-duplicate-name-bugfix-by-overestimating-.patch b/SOURCES/pcre-8.38-Yet-another-duplicate-name-bugfix-by-overestimating-.patch new file mode 100644 index 0000000..d7f1801 --- /dev/null +++ b/SOURCES/pcre-8.38-Yet-another-duplicate-name-bugfix-by-overestimating-.patch @@ -0,0 +1,34 @@ +From b7537308b7c758f33c347cb0bec62754c43c271f Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Sat, 27 Feb 2016 17:38:11 +0000 +Subject: [PATCH] Yet another duplicate name bugfix by overestimating the + memory needed (i.e. another hack - PCRE2 has this "properly" fixed). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1636 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 5019854..4ffea0c 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7311,7 +7311,12 @@ for (;; ptr++) + so far in order to get the number. If the name is not found, leave + the value of recno as 0 for a forward reference. */ + +- else ++ /* This patch (removing "else") fixes a problem when a reference is ++ to multiple identically named nested groups from within the nest. ++ Once again, it is not the "proper" fix, and it results in an ++ over-allocation of memory. */ ++ ++ /* else */ + { + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) +-- +2.5.0 + diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 8399bdc..06d2d35 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -152,7 +152,7 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.0 -%global bugfixver 20 +%global bugfixver 25 %if 0%{?scl:1} %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))} @@ -160,7 +160,7 @@ Name: %{?scl_prefix}mariadb Version: %{compatver}.%{bugfixver} -Release: 1%{?with_debug:.debug}%{?dist} +Release: 4%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -209,10 +209,18 @@ Patch12: %{pkgnamepatch}-admincrash.patch Patch30: %{pkgnamepatch}-errno.patch Patch31: %{pkgnamepatch}-string-overflow.patch Patch32: %{pkgnamepatch}-basedir.patch -Patch33: %{pkgnamepatch}-covscan-signexpr.patch Patch34: %{pkgnamepatch}-covscan-stroverflow.patch Patch37: %{pkgnamepatch}-notestdb.patch +# Patches for bundled pcre +# Fix CVE-2016-3191 (workspace overflow for (*ACCEPT) with deeply nested +# parentheses), upstream bug #1791, fixed in upstream after 8.38 +Patch50: pcre-8.38-Fix-workspace-overflow-for-ACCEPT-with-deeply-nested.patch +# Fix CVE-2016-1283 (heap buffer overflow in handling of nested duplicate named +# groups with a nested back reference), bug #1295386, upstream bug #1767, +# fixed in upstream after 8.38 +Patch51: pcre-8.38-Yet-another-duplicate-name-bugfix-by-overestimating-.patch + # Patches specific for scl Patch90: %{pkgnamepatch}-scl-env-check.patch @@ -225,7 +233,9 @@ BuildRequires: systemtap-sdt-devel BuildRequires: zlib-devel # auth_pam.so plugin will be build if pam-devel is installed BuildRequires: pam-devel +# use either new enough version of pcre or provide bundles(pcre) %{?with_pcre:BuildRequires: pcre-devel >= 8.35} +%{!?with_pcre:Provides: bundled(pcre) = 8.38} # Tests requires time and ps and some perl modules BuildRequires: procps BuildRequires: time @@ -569,7 +579,6 @@ MariaDB is a community developed branch of MySQL. %patch30 -p1 %patch31 -p1 %patch32 -p1 -%patch33 -p1 %patch34 -p1 %patch37 -p1 @@ -577,6 +586,11 @@ MariaDB is a community developed branch of MySQL. # we cannot use libedit due #1201988 # rm -r cmd-line-utils +pushd pcre +%patch50 -p1 +%patch51 -p1 +popd + sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake # workaround for upstream bug #56342 @@ -615,6 +629,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ %endif %{?scl:scl enable %{scl} - << "EOF"} +set -ex CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" # force PIC mode so that we can build libmysqld.so CFLAGS="$CFLAGS -fPIC" @@ -702,6 +717,7 @@ done %install %{?scl:scl enable %{scl} - << "EOF"} +set -ex make DESTDIR=%{buildroot} install %{?scl:EOF} @@ -923,8 +939,12 @@ EOF %if %{with test} %if %runselftest %{?scl:scl enable %{scl} - << "EOF"} +set -x +%if 0%{?rhel} == 6 # hack for https://mariadb.atlassian.net/browse/MDEV-7454 -%{?with_init_sysv:LD_LIBRARY_PATH=$(pwd)/unittest/mytap }make test VERBOSE=1 +export LD_LIBRARY_PATH=$(pwd)/unittest/mytap:$LD_LIBRARY_PATH +%endif +make test VERBOSE=1 # hack to let 32- and 64-bit tests run concurrently on same build machine export MTR_PARALLEL=1 # builds might happen at the same host, avoid collision @@ -942,12 +962,14 @@ export MTR_BUILD_THREAD=%{__isa_bits} set -e cd mysql-test perl ./mysql-test-run.pl --force --retry=0 \ -%if ! %{check_testsuite} - --skip-test-list=rh-skipped-tests.list \ -%endif --suite-timeout=720 --testcase-timeout=30 \ --mysqld=--binlog-format=mixed --force-restart \ - --shutdown-timeout=60 --max-test-fail=0 + --shutdown-timeout=60 --max-test-fail=0 \ +%if %{check_testsuite} + || : +%else + --skip-test-list=rh-skipped-tests.list +%endif # cmake build scripts will install the var cruft if left alone :-( rm -rf var ) @@ -1280,6 +1302,33 @@ fi %endif %changelog +* Thu May 12 2016 Jakub Dorňák - 1:10.0.25-4 + Fixed Provides + (Provides bundled pcre) + Related: #1330490 + +* Tue May 10 2016 Jakub Dorňák - 1:10.0.25-3 + Fixed testsuite + (couldn't find libmytap.so) + Related: #1330490 + +* Fri May 6 2016 Jakub Dorňák - 1:10.0.25-2 +- Fix CVE-2016-3191 and CVE-2016-1283 + Resolves: #1330490 + +* Thu May 5 2016 Jakub Dorňák - 1:10.0.25-1 +- Rebase to version 10.0.25 + Resolves: #1330444 + Also fixes: CVE-2016-2047 CVE-2016-0668 CVE-2016-0666 CVE-2016-0655 + CVE-2016-0651 CVE-2016-0650 CVE-2016-0649 CVE-2016-0648 CVE-2016-0647 + CVE-2016-0646 CVE-2016-0644 CVE-2016-0643 CVE-2016-0642 CVE-2016-0641 + CVE-2016-0640 CVE-2016-0616 CVE-2016-0610 CVE-2016-0609 CVE-2016-0608 + CVE-2016-0606 CVE-2016-0600 CVE-2016-0598 CVE-2016-0597 CVE-2016-0596 + CVE-2016-0546 CVE-2016-0505 CVE-2015-7744 CVE-2015-4913 CVE-2015-4895 + CVE-2015-4879 CVE-2015-4870 CVE-2015-4861 CVE-2015-4858 CVE-2015-4836 + CVE-2015-4830 CVE-2015-4826 CVE-2015-4819 CVE-2015-4816 CVE-2015-4815 + CVE-2015-4807 CVE-2015-4802 CVE-2015-4792 + * Tue Jul 28 2015 Jakub Dorňák - 1:10.0.20-1 - Rebase to version 10.0.20 Resolves: #1247029