diff --git a/mysql-boost-8.0.26.tar.gz b/mysql-boost-8.0.27.tar.gz similarity index 91% rename from mysql-boost-8.0.26.tar.gz rename to mysql-boost-8.0.27.tar.gz index e48b2c877aac6211f955fce0f8bac4ecbc8d75b8..90a19c72843a6ad3548438c32854644f903045bc 100644 Binary files a/mysql-boost-8.0.26.tar.gz and b/mysql-boost-8.0.27.tar.gz differ diff --git a/mysql-s390-tsc.patch b/mysql-s390-tsc.patch index 3fca0ac1120911c79cc40aa53f53bbfcf1f6a7f8..a4bd7f7e15552fe779d8fef7be842cd5ec6eca2b 100644 --- a/mysql-s390-tsc.patch +++ b/mysql-s390-tsc.patch @@ -1,22 +1,26 @@ Support s390/s390x in performance schema's cycle-counting functions. Filed upstream at http://bugs.mysql.com/bug.php?id=59953 +--- + include/my_rdtsc.h | 1 + + mysys/my_rdtsc.cc | 9 +++++++++ + 2 files changed, 10 insertions(+) diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h -index 65f7df19..a28f470c 100644 +index b411eda0..03fc9a58 100644 --- a/include/my_rdtsc.h +++ b/include/my_rdtsc.h @@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti); #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26 - #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27 + /* #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27 - No longer used */ #define MY_TIMER_ROUTINE_ASM_AARCH64 28 +#define MY_TIMER_ROUTINE_ASM_S390 29 #endif diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc -index 54d19691..f18c182f 100644 +index d9756487..817aa9d6 100644 --- a/mysys/my_rdtsc.cc +++ b/mysys/my_rdtsc.cc -@@ -204,6 +204,13 @@ ulonglong my_timer_cycles(void) { +@@ -168,6 +168,13 @@ ulonglong my_timer_cycles(void) { __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result)); return result; } @@ -30,8 +34,8 @@ index 54d19691..f18c182f 100644 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) /* gethrtime may appear as either cycle or nanosecond counter */ return (ulonglong)gethrtime(); -@@ -505,6 +512,8 @@ void my_timer_init(MY_TIMER_INFO *mti) { - mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC32; +@@ -453,6 +460,8 @@ void my_timer_init(MY_TIMER_INFO *mti) { + mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64; #elif defined(__GNUC__) && defined(__aarch64__) mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64; +#elif defined(__GNUC__) && defined(__s390__) @@ -39,3 +43,6 @@ index 54d19691..f18c182f 100644 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) mti->cycles.routine = MY_TIMER_ROUTINE_GETHRTIME; #else +-- +2.27.0 + diff --git a/mysql.spec b/mysql.spec index 03f6b103a30f3202bcdb2627f04f3258fdd1de05..4bd4ebeefcc688d4db42e696921b1d80833594b1 100644 --- a/mysql.spec +++ b/mysql.spec @@ -29,8 +29,8 @@ %bcond_without conflicts %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.26 -Release: 3 +Version: 8.0.27 +Release: 1 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD @@ -536,6 +536,14 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Fri Oct 29 2021 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-35636 CVE-2021-35638-to-CVE-2021-35642 + CVE-2021-35644-to-CVE-2021-35648 + * 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