diff --git a/0000-mysql-add-fstack-protector-strong.patch b/0000-mysql-add-fstack-protector-strong.patch index 0db062269e24d7cbee1901894b3a6b6d5c7789af..d83f23493c29d9daf1a20c513b2b811e08345c76 100644 --- a/0000-mysql-add-fstack-protector-strong.patch +++ b/0000-mysql-add-fstack-protector-strong.patch @@ -1,14 +1,14 @@ -From d770dfea36dcbe8d63ad0819e796d180ab2ea638 Mon Sep 17 00:00:00 2001 +From cb5dfd6d62419ce6d84bed6600eca7d894fd683b Mon Sep 17 00:00:00 2001 --- - cmake/build_configurations/compiler_options.cmake | 2 ++ - 1 file changed, 2 insertions(+) + cmake/build_configurations/compiler_options.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake -index a319983..aea15a3 100644 +index a30eafe1..d93575bd 100644 --- a/cmake/build_configurations/compiler_options.cmake +++ b/cmake/build_configurations/compiler_options.cmake -@@ -45,6 +45,7 @@ IF(UNIX) +@@ -38,6 +38,7 @@ IF(UNIX) # Default GCC flags IF(MY_COMPILER_IS_GNU) SET(COMMON_C_FLAGS "-fno-omit-frame-pointer") @@ -16,14 +16,15 @@ index a319983..aea15a3 100644 # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") -@@ -55,6 +56,7 @@ IF(UNIX) +@@ -47,7 +48,7 @@ IF(UNIX) + STRING_APPEND(COMMON_C_FLAGS " -ffp-contract=off") ENDIF() - SET(COMMON_CXX_FLAGS "-std=c++14 -fno-omit-frame-pointer") -+ SET(COMMON_CXX_FLAGS "-fstack-protector-strong") +- SET(COMMON_CXX_FLAGS "-std=c++17 -fno-omit-frame-pointer") ++ SET(COMMON_CXX_FLAGS "-std=c++17 -fno-omit-frame-pointer -fstack-protector-strong") # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) STRING_PREPEND(COMMON_CXX_FLAGS "-fno-inline ") -- -2.23.0 +2.27.0 diff --git a/mysql-boost-8.0.26.tar.gz b/mysql-boost-8.0.27.tar.gz similarity index 100% rename from mysql-boost-8.0.26.tar.gz rename to mysql-boost-8.0.27.tar.gz diff --git a/mysql-boost-8.0.26.tar.gz.ab b/mysql-boost-8.0.27.tar.gz.aa similarity index 83% rename from mysql-boost-8.0.26.tar.gz.ab rename to mysql-boost-8.0.27.tar.gz.aa index 29f47834a1ba7e3ac35926e9cf269be5446bb438..37d59229b8ff3d995a2defdd5eab18956702d5c7 100644 Binary files a/mysql-boost-8.0.26.tar.gz.ab and b/mysql-boost-8.0.27.tar.gz.aa differ diff --git a/mysql-boost-8.0.26.tar.gz.aa b/mysql-boost-8.0.27.tar.gz.ab similarity index 83% rename from mysql-boost-8.0.26.tar.gz.aa rename to mysql-boost-8.0.27.tar.gz.ab index de6fb62d8636d97ed3d010d0213fff43a1f6fde7..cbd5972f91da1599dbe11bf6cd79046f81f681dc 100644 Binary files a/mysql-boost-8.0.26.tar.gz.aa and b/mysql-boost-8.0.27.tar.gz.ab differ diff --git a/mysql-boost-8.0.26.tar.gz.ac b/mysql-boost-8.0.27.tar.gz.ac similarity index 79% rename from mysql-boost-8.0.26.tar.gz.ac rename to mysql-boost-8.0.27.tar.gz.ac index 381dc307fde6ba5326aa86cc16cb3dd8ab9027bc..4993c7a5b8521806d4f2ef07af4e4b7263a813af 100644 Binary files a/mysql-boost-8.0.26.tar.gz.ac and b/mysql-boost-8.0.27.tar.gz.ac differ diff --git a/mysql.spec b/mysql.spec index 88f9242643f418f48c922872df9be9dcc3b718a3..ae6ceaa1466e5f07b7be3fa086cb147ae086d445 100644 --- a/mysql.spec +++ b/mysql.spec @@ -6,12 +6,12 @@ %global pkgnamepatch mysql %global boost_bundled_version 1.73.0 Name: mysql -Version: 8.0.26 +Version: 8.0.27 Release: 1 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 +Source0: https://dev.mysql.com/get/Downloads/MySQL-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 @@ -121,6 +121,13 @@ fi %exclude /usr/lib/debug %changelog +* Wed Nov 24 yaoxin - 8.0.27-1 +- Upgrade mysql to 8.0.27,fix CVES:CVE-2021-2471 CVE-2021-2478 CVE-2021-2479 + CVE-2021-2481 CVE-2021-35546 CVE-2021-35575 CVE-2021-35577 CVE-2021-35591 + CVE-2021-35596 CVE-2021-35597 CVE-2021-35602 CVE-2021-35604 CVE-2021-35607 + CVE-2021-35608 CVE-2021-35610 CVE-2021-35612 CVE-2021-35618 + CVE-2021-35621-to-CVE-2021-35628 CVE-2021-35630-to-CVE-2021-35648 + * Sun Sep 26 2021 yaoxin 8.0.26-1 - Upgrade mysql to 8.0.26 for fix cves