diff --git a/mysql-arm32-timer.patch b/mysql-arm32-timer.patch deleted file mode 100644 index bbfc560897521ad5b861f257cdd8ffc3436d8b91..0000000000000000000000000000000000000000 --- a/mysql-arm32-timer.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mysql-8.0.24/mysql-test/include/mtr_warnings.sql.orig 2021-04-18 18:04:05.166312799 +0200 -+++ mysql-8.0.24/mysql-test/include/mtr_warnings.sql 2021-04-18 18:04:23.605495467 +0200 -@@ -308,6 +308,11 @@ - */ - ("Manifest file '.*' is not read-only. For better security, please make sure that the file is read-only."), - -+ /* -+ ARM32 don't support timers and get this warning in every test. -+ */ -+ ("The CYCLE timer is not available. WAIT events in the performance_schema will not be timed."), -+ - ("THE_LAST_SUPPRESSION"); - - diff --git a/mysql-boost-8.0.24.tar.gz b/mysql-boost-8.0.24.tar.gz deleted file mode 100644 index ce09475dd9fef218cb1bb93e7ba863dfa3cadeab..0000000000000000000000000000000000000000 Binary files a/mysql-boost-8.0.24.tar.gz and /dev/null differ diff --git a/mysql-boost-8.0.24.tar.gz.ab b/mysql-boost-8.0.24.tar.gz.ab deleted file mode 100644 index 1b071c7ed1f2c34a0d70e4b0326d9d18d0947e36..0000000000000000000000000000000000000000 Binary files a/mysql-boost-8.0.24.tar.gz.ab and /dev/null differ diff --git a/mysql-boost-8.0.24.tar.gz.ac b/mysql-boost-8.0.24.tar.gz.ac deleted file mode 100644 index d9ea600360b9c01046ccc42deb0ea067209f0256..0000000000000000000000000000000000000000 Binary files a/mysql-boost-8.0.24.tar.gz.ac and /dev/null differ diff --git a/mysql-boost-8.0.24.tar.gz.aa b/mysql-boost-8.0.26.tar.gz similarity index 34% rename from mysql-boost-8.0.24.tar.gz.aa rename to mysql-boost-8.0.26.tar.gz index 3fc0d2a57ce94ce4d36196aa3cc7bc891d6ecc10..e48b2c877aac6211f955fce0f8bac4ecbc8d75b8 100644 Binary files a/mysql-boost-8.0.24.tar.gz.aa and b/mysql-boost-8.0.26.tar.gz differ diff --git a/mysql.spec b/mysql.spec index 7d555aa09e3dd62d77fe817eae957844902f4b3b..080f4361090f2940ecc3ebae3e13f945b5534551 100644 --- a/mysql.spec +++ b/mysql.spec @@ -6,15 +6,12 @@ %global pkgnamepatch mysql %global boost_bundled_version 1.73.0 Name: mysql -Version: 8.0.24 -Release: 1 +Version: 8.0.26 +Release: 2 License: GPLv2 with exceptions and LGPLv2 and BSD Summary: The world's most popular open source database URL: http://www.mysql.com/ -Source0: https://cdn.mysql.com/archives/%{name}-8.0/%{name}-boost-%{version}.tar.gz -Source1: %{name}-boost-%{version}.tar.gz.aa -Source2: %{name}-boost-%{version}.tar.gz.ab -Source3: %{name}-boost-%{version}.tar.gz.ac +Source0: https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz Patch0:0000-mysql-add-fstack-protector-strong.patch Patch1:%{pkgnamepatch}-install-test.patch Patch3:%{pkgnamepatch}-file-contents.patch @@ -47,9 +44,6 @@ the GPL. See the chapter "Licensing and Support" in the manual for further info. %prep -cd ../SOURCES -cat %{SOURCE1} %{SOURCE2} %{SOURCE3} | tar xj -cd .. %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 @@ -124,6 +118,10 @@ fi %exclude /usr/lib/debug %changelog +* Mon Aug 2 2021 liwu - 8.0.26-1 +- Upgrade mysql to 8.0.26,fix CVES:CVE-2021-2356 CVE-2021-2339 CVE-2021-2354 + CVE-2021-2352 CVE-2021-2340 + * Thu May 6 2021 wangxiao 8.0.24-1 - Upgrade mysql to 8.0.24, fix CVES: CVE-2021-2166 CVE-2021-2146 CVE-2021-2162 CVE-2021-2212 CVE-2021-2299 CVE-2021-2293 CVE-2021-2215