packages/mysql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade mysql to 8.0.27 for fix CVES

Browse Source
This commit is contained in:
starlet-dx 2021-10-29 16:15:24 +08:00
parent 7b3dfc497f
commit a040d09ee0
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-s390-tsc.patch
View File

@ -1,22 +1,26 @@
Support s390/s390x in performance schema's cycle-counting functions. Support s390/s390x in performance schema's cycle-counting functions.
Filed upstream at http://bugs.mysql.com/bug.php?id=59953 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 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 --- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h +++ b/include/my_rdtsc.h
@@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti); @@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti);
#define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26 #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_AARCH64 28
+#define MY_TIMER_ROUTINE_ASM_S390 29 +#define MY_TIMER_ROUTINE_ASM_S390 29
#endif #endif
diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc 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 --- a/mysys/my_rdtsc.cc
+++ b/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)); __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
return result; return result;
} }
@ -30,8 +34,8 @@ index 54d19691..f18c182f 100644
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
/* gethrtime may appear as either cycle or nanosecond counter */ /* gethrtime may appear as either cycle or nanosecond counter */
return (ulonglong)gethrtime(); return (ulonglong)gethrtime();
@@ -505,6 +512,8 @@ void my_timer_init(MY_TIMER_INFO *mti) { @@ -453,6 +460,8 @@ void my_timer_init(MY_TIMER_INFO *mti) {
mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC32; mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64;
#elif defined(__GNUC__) && defined(__aarch64__) #elif defined(__GNUC__) && defined(__aarch64__)
mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64; mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64;
+#elif defined(__GNUC__) && defined(__s390__) +#elif defined(__GNUC__) && defined(__s390__)
@ -39,3 +43,6 @@ index 54d19691..f18c182f 100644
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
mti->cycles.routine = MY_TIMER_ROUTINE_GETHRTIME; mti->cycles.routine = MY_TIMER_ROUTINE_GETHRTIME;
#else #else
--
2.27.0

12
mysql.spec
View File

@ -29,8 +29,8 @@
%bcond_without conflicts %bcond_without conflicts
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release} %global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: mysql Name: mysql
Version: 8.0.26 Version: 8.0.27
Release: 3 Release: 1
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
License: GPLv2 with exceptions and LGPLv2 and BSD License: GPLv2 with exceptions and LGPLv2 and BSD
@ -536,6 +536,14 @@ fi
%{_mandir}/man1/mysql_config.1* %{_mandir}/man1/mysql_config.1*
%changelog %changelog
* Fri Oct 29 2021 yaoxin <yaoxin30@huawei.com> - 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 <liwu13@huawei.com> - 8.0.26-1 * Mon Aug 2 2021 liwu <liwu13@huawei.com> - 8.0.26-1
- Upgrade mysql to 8.0.26,fix CVES:CVE-2021-2356 CVE-2021-2339 CVE-2021-2354 - Upgrade mysql to 8.0.26,fix CVES:CVE-2021-2356 CVE-2021-2339 CVE-2021-2354
CVE-2021-2352 CVE-2021-2340 CVE-2021-2352 CVE-2021-2340