From 0535da7ceb9ff24eac5776fc50303cb7986b230f Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 19 Apr 2018 23:13:26 +0200 Subject: [PATCH] Rebase to 5.7.22 version CVE fixes: #1568963 CVE-2018-2755 CVE-2018-2758 CVE-2018-2759 CVE-2018-2761 CVE-2018-2762 CVE-2018-2766 CVE-2018-2769 CVE-2018-2771 CVE-2018-2773 CVE-2018-2775 CVE-2018-2776 CVE-2018-2777 CVE-2018-2778 CVE-2018-2779 CVE-2018-2780 CVE-2018-2781 CVE-2018-2782 CVE-2018-2784 CVE-2018-2786 CVE-2018-2787 CVE-2018-2810 CVE-2018-2812 CVE-2018-2813 CVE-2018-2816 CVE-2018-2817 CVE-2018-2818 CVE-2018-2819 CVE-2018-2839 CVE-2018-2846 --- community-mysql.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/community-mysql.spec b/community-mysql.spec index e698c3d..088a50c 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -89,8 +89,8 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 5.7.21 -Release: 6%{?with_debug:.debug}%{?dist} +Version: 5.7.22 +Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -134,7 +134,6 @@ Patch52: %{pkgnamepatch}-sharedir.patch Patch70: %{pkgnamepatch}-5.7.9-major.patch Patch71: %{pkgnamepatch}-openssl11.patch %if 0%{?fedora} >= 28 || 0%{?rhel} > 7 -Patch72: %{pkgnamepatch}-tirpc.patch Patch73: %{pkgnamepatch}-libxcrypt.patch %endif @@ -412,7 +411,6 @@ the MySQL sources. %endif %patch71 -p1 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7 -%patch72 -p1 %patch73 -p1 %endif @@ -454,6 +452,9 @@ add_test perfschema.memory_aggregate_no_a : incorrect numbers in output add_test innodb_zip.wl6469 : add_test json.json_functions_innodb : add_test main.ps : +# The "select" tests may be a PPC floating point long long precision error +# Need to check this theory, though. +# Maybe usefull conversation: https://github.com/h5py/h5py/issues/817 add_test main.select_all : add_test main.select_all_bka : add_test main.select_all_bka_nixbnl : @@ -611,8 +612,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/magic rm %{buildroot}%{_datadir}/%{pkg_name}/mysql.server rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server rm %{buildroot}%{_mandir}/man1/comp_err.1* -rm %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1* -rm %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1* # put logrotate script where it needs to be mkdir -p %{buildroot}%{logrotateddir} @@ -636,11 +635,6 @@ install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}} # Install the list of skipped tests to be available for user runs install -p -m 0644 mysql-test/%{skiplist} %{buildroot}%{_datadir}/mysql-test -# These are in fact identical -rm %{buildroot}%{_mandir}/man1/{mysqltest,mysql_client_test}_embedded.1 -cp -p %{buildroot}%{_mandir}/man1/mysqltest.1 %{buildroot}%{_mandir}/man1/mysqltest_embedded.1 -cp -p %{buildroot}%{_mandir}/man1/mysql_client_test.1 %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1 - %if %{without clibrary} unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so rm -r %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.* @@ -650,7 +644,6 @@ rm -r %{buildroot}%{_sysconfdir}/ld.so.conf.d %if %{without embedded} rm %{buildroot}%{_libdir}/mysql/libmysqld.so* rm %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded} -rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1* %endif %if %{without devel} @@ -984,13 +977,19 @@ fi %{_bindir}/mysqlxtest %{_bindir}/my_safe_process %attr(-,mysql,mysql) %{_datadir}/mysql-test -%{_mandir}/man1/mysqltest.1* -%{_mandir}/man1/mysqltest_embedded.1* -%{_mandir}/man1/mysql_client_test.1* -%{_mandir}/man1/mysql_client_test_embedded.1* %endif %changelog +* Thu Apr 19 2018 Michal Schorm - 5.7.22-1 +- Rebase to 5.7.22 version +- CVE fixes: #1568963 + CVE-2018-2755 CVE-2018-2758 CVE-2018-2759 CVE-2018-2761 CVE-2018-2762 + CVE-2018-2766 CVE-2018-2769 CVE-2018-2771 CVE-2018-2773 CVE-2018-2775 + CVE-2018-2776 CVE-2018-2777 CVE-2018-2778 CVE-2018-2779 CVE-2018-2780 + CVE-2018-2781 CVE-2018-2782 CVE-2018-2784 CVE-2018-2786 CVE-2018-2787 + CVE-2018-2810 CVE-2018-2812 CVE-2018-2813 CVE-2018-2816 CVE-2018-2817 + CVE-2018-2818 CVE-2018-2819 CVE-2018-2839 CVE-2018-2846 + * Tue Feb 27 2018 Michal Schorm - 5.7.21-6 - Rebuilt after Rawhide & f28 & f27 & f26 merge