diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec index eab0f5f..ec2e841 100644 --- a/SPECS/mysql.spec +++ b/SPECS/mysql.spec @@ -114,7 +114,7 @@ Name: %{?scl_prefix}mysql Version: 5.7.21 -Release: 2%{?with_debug:.debug}%{?dist}.1 +Release: 3%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -213,6 +213,12 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) %{?with_init_systemd:BuildRequires: systemd} +# aarch64 requires newer gcc +%if 0%{?rhel} == 7 && 0%{?scl:1} +%global dts devtoolset-7 +BuildRequires: %{dts}-gcc-c++ +%endif + Requires: bash Requires: fileutils Requires: grep @@ -474,53 +480,31 @@ add_test () { touch %{skiplist} -# unstable on all archs -add_test main.datadir_permission : Unstable test from base testsuite -add_test main.m_i_db : Unstable test from '--big-test' testsuite -add_test main.grant_user_lock : Unstable test -add_test innodb-system-table-view : Unstable test -add_test table_encrypt_kill : Unstable test - -# these tests fail in 5.7.15 on arm32 -%ifarch %arm -# GIS related issue -add_test innodb_gis.1 : arm32 gis issue -add_test innodb_gis.gis : arm32 gis issue -add_test main.gis-precise : arm32 gis issue -add_test main.gis : arm32 gis issue -add_test gis.gis_bugs_crashes : arm32 gis issue -add_test gis.spatial_operators_intersection : arm32 gis issue -add_test gis.spatial_operators_union : arm32 gis issue -add_test gis.spatial_testing_functions_contains : arm32 gis issue -add_test gis.spatial_testing_functions_crosses : arm32 gis issue -add_test gis.spatial_testing_functions_equals : arm32 gis issue -add_test gis.spatial_testing_functions_touches : arm32 gis issue -add_test gis.spatial_testing_functions_within : arm32 gis issue -# FTS -add_test innodb_fts.opt : arm32 FTS issue -# Missing hw counters -add_test perfschema.func_mutex : missing hw on arm32 -add_test perfschema.func_file_io : missing hw on arm32 -add_test perfschema.mdl_func : missing hw on arm32 -add_test perfschema.setup_objects : missing hw on arm32 -add_test perfschema.global_read_lock : missing hw on arm32 -%endif - -# this test fail in 5.7.14 on ppc64* and aarch64 -%ifarch ppc64 ppc64le aarch64 -add_test innodb.innodb : missing correct value -%endif - -# these tests fail in 5.7.13 on ppc64* +# these fail on all arches +add_test main.grant_user_lock : Unstable test +add_test innodb.innodb-system-table-view : Unstable test +add_test main.datadir_permission : Unstable test +add_test main.m_i_db : Unstable test +add_test main.index_merge_delete : Unstable test +add_test main.index_merge_innodb : Unstable test + +%ifarch aarch64 +add_test innodb_zip.16k : Unstable test +add_test innodb.innodb : Unstable test +add_test innodb.innodb_buffer_pool_resize : Unstable test +add_test innodb.innodb_wl6326_big : Unstable test +%endif + %ifarch ppc64 ppc64le -add_test innodb.innodb : missing correct value -add_test main.ctype_big5 : innodb assert -add_test main.ctype_gbk : innodb assert -add_test main.insert : innodb assert -add_test main.innodb_mrr_cost_icp : innodb assert -add_test main.mysqldump : innodb assert -add_test sys_vars.log_slow_admin_statements_func : innodb assert -add_test parts.partition_int_innodb : parts issue +add_test innodb_gis.kill_server : Unstable test +add_test innodb_zip.16k : Unstable test +add_test innodb.innodb : Unstable test +add_test innodb.innodb_buffer_pool_resize : Unstable test +add_test innodb.innodb_stats_auto_recalc : Unstable test +add_test innodb.innodb_stats_auto_recalc_ddl : Unstable test +add_test innodb.innodb-system-table-view : Unstable test +add_test main.events_time_zone : Unstable test +add_test perfschema.setup_instruments_defaults : Unstable test %endif popd @@ -543,7 +527,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ fi %endif -%{?scl:scl enable %{scl} - << \EOF} +%{?scl:scl enable %{scl} %{?dts} - << \EOF} set -ex # build out of source @@ -613,7 +597,7 @@ popd %{?scl:EOF} %install -%{?scl:scl enable %{scl} - << \EOF} +%{?scl:scl enable %{scl} %{?dts} - << \EOF} set -ex pushd build @@ -697,6 +681,9 @@ mkdir -p %{buildroot}%{logrotateddir} mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name} chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name} +# Add collection prefix to the packageconfig provides +mv %{buildroot}%{_libdir}/pkgconfig/mysqlclient.pc %{buildroot}%{_libdir}/pkgconfig/%{?scl_prefix}mysqlclient.pc + %if %{with clibrary} && 0%{!?scl:1} mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf @@ -736,7 +723,7 @@ rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1 rm %{buildroot}%{_bindir}/mysql_config* rm -r %{buildroot}%{_includedir}/mysql rm %{buildroot}%{_datadir}/aclocal/mysql.m4 -rm %{buildroot}%{_libdir}/pkgconfig/mysqlclient.pc +rm %{buildroot}%{_libdir}/pkgconfig/%{?scl_prefix}mysqlclient.pc rm %{buildroot}%{_libdir}/mysql/libmysqlclient*.so rm %{buildroot}%{_mandir}/man1/mysql_config.1* %endif @@ -789,7 +776,7 @@ EOF %endif #scl %check -%{?scl:scl enable %{scl} - << \EOF} +%{?scl:scl enable %{scl} %{?dts} - << \EOF} set -ex %if %{with test} @@ -801,7 +788,7 @@ cp ../../mysql-test/%{skiplist} . # builds might happen at the same host, avoid collision export MTR_BUILD_THREAD=%{__isa_bits} ./mtr \ - --mem --parallel=auto --force --retry=0 \ + --mem --parallel=auto --force --retry=2 \ --mysqld=--binlog-format=mixed --skip-rpl \ --suite-timeout=720 --testcase-timeout=30 \ --clean-vardir --big-test \ @@ -1076,7 +1063,7 @@ fi %if %{with clibrary} %{_libdir}/mysql/libmysqlclient.so %endif -%{_libdir}/pkgconfig/mysqlclient.pc +%{_libdir}/pkgconfig/%{?scl_prefix}mysqlclient.pc %{_mandir}/man1/mysql_config.1* %endif @@ -1102,7 +1089,7 @@ fi %endif %changelog -* Tue Feb 20 2018 Honza Horak - 5.7.21-2.1 +* Tue Feb 20 2018 Honza Horak - 5.7.21-2 - Use mysqladmin instead of fuser for checking whether socket is used Related: #1461445 @@ -1113,12 +1100,19 @@ fi - Add support for libtirpc - Fix for various CVEs listed on http://www.oracle.com/technetwork/security-advisory/cpujan2018-3236628.html -- CVE fixes: #1533832 +- CVE fixes: #1533834 CVE-2018-2696 CVE-2018-2703 CVE-2018-2565 CVE-2018-2573 CVE-2018-2576 CVE-2018-2583 CVE-2018-2586 CVE-2018-2590 CVE-2018-2600 CVE-2018-2612 CVE-2018-2622 CVE-2018-2640 CVE-2018-2645 CVE-2018-2646 CVE-2018-2647 CVE-2018-2665 CVE-2018-2667 CVE-2018-2668 +* Thu Dec 14 2017 Honza Horak - 5.7.20-2 +- Release bump for rebuilding on new arches + Related: #1518842 +- Use gcc from devtoolset-7 for building because otherwise the build + fails on aarch64 (RHEL-7 only) + Related: #1518842 + * Fri Oct 27 2017 Honza Horak - 5.7.20-1 - Update to MySQL 5.7.20, for various fixes described at https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-20.html