!150 Update to 8.0.38 for fix CVEs
From: @wk333 Reviewed-by: @wang--ge Signed-off-by: @wang--ge
This commit is contained in:
commit
cb6eb51074
@ -1,38 +0,0 @@
|
||||
From a16f5c7b7c5353cda8c8235d9a6765c7fe3c1231 Mon Sep 17 00:00:00 2001
|
||||
From: starlet-dx <15929766099@163.com>
|
||||
Date: Tue, 16 May 2023 15:15:10 +0800
|
||||
Subject: [PATCH 1/1] Fix a bug when getting a gzip header extra field with
|
||||
inflate().
|
||||
|
||||
If the extra field was larger than the space the user provided with
|
||||
inflateGetHeader(), and if multiple calls of inflate() delivered
|
||||
the extra header data, then there could be a buffer overflow of the
|
||||
provided space. This commit assures that provided space is not
|
||||
exceeded.
|
||||
|
||||
Origin:
|
||||
https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1
|
||||
---
|
||||
extra/zlib/inflate.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/extra/zlib/inflate.c b/extra/zlib/inflate.c
|
||||
index 7be8c636..7a728974 100644
|
||||
--- a/extra/zlib/inflate.c
|
||||
+++ b/extra/zlib/inflate.c
|
||||
@@ -763,9 +763,10 @@ int flush;
|
||||
copy = state->length;
|
||||
if (copy > have) copy = have;
|
||||
if (copy) {
|
||||
+ len = state->head->extra_len - state->length;
|
||||
if (state->head != Z_NULL &&
|
||||
- state->head->extra != Z_NULL) {
|
||||
- len = state->head->extra_len - state->length;
|
||||
+ state->head->extra != Z_NULL &&
|
||||
+ len < state->head->extra_max) {
|
||||
zmemcpy(state->head->extra + len, next,
|
||||
len + copy > state->head->extra_max ?
|
||||
state->head->extra_max - len : copy);
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 49a8fd61c4f8db9b8e9a50e70114cedc5842178e Mon Sep 17 00:00:00 2001
|
||||
From: starlet-dx <15929766099@163.com>
|
||||
Date: Tue, 16 May 2023 15:17:40 +0800
|
||||
Subject: [PATCH 1/1] Fix extra field processing bug that dereferences NULL
|
||||
state->head.
|
||||
|
||||
The recent commit to fix a gzip header extra field processing bug
|
||||
introduced the new bug fixed here.
|
||||
|
||||
Origin:
|
||||
https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d
|
||||
---
|
||||
extra/zlib/inflate.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/extra/zlib/inflate.c b/extra/zlib/inflate.c
|
||||
index 7a728974..2a3c4fe9 100644
|
||||
--- a/extra/zlib/inflate.c
|
||||
+++ b/extra/zlib/inflate.c
|
||||
@@ -763,10 +763,10 @@ int flush;
|
||||
copy = state->length;
|
||||
if (copy > have) copy = have;
|
||||
if (copy) {
|
||||
- len = state->head->extra_len - state->length;
|
||||
if (state->head != Z_NULL &&
|
||||
state->head->extra != Z_NULL &&
|
||||
- len < state->head->extra_max) {
|
||||
+ (len = state->head->extra_len - state->length) <
|
||||
+ state->head->extra_max) {
|
||||
zmemcpy(state->head->extra + len, next,
|
||||
len + copy > state->head->extra_max ?
|
||||
state->head->extra_max - len : copy);
|
||||
--
|
||||
2.30.0
|
||||
|
||||
52
RPM-GPG-KEY-mysql-2023
Normal file
52
RPM-GPG-KEY-mysql-2023
Normal file
@ -0,0 +1,52 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
=h5nH
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# This group is read both by the client and the server
|
||||
# This group is read both both by the client and the server
|
||||
# use it for options that affect everything
|
||||
#
|
||||
[client-server]
|
||||
|
||||
1522
mysql-Add-sw64-architecture.patch
Normal file
1522
mysql-Add-sw64-architecture.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,14 +1,16 @@
|
||||
--- mysql-8.0.24-bak/mysql-test/include/mtr_warnings.sql 2021-03-22 16:44:50.000000000 +0800
|
||||
+++ mysql-8.0.24/mysql-test/include/mtr_warnings.sql 2021-05-07 10:58:00.852352992 +0800
|
||||
@@ -304,6 +304,11 @@
|
||||
("Invalid systemd notify socket, cannot send: "),
|
||||
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
|
||||
index 78b09285..b7153445 100644
|
||||
--- a/mysql-test/include/mtr_warnings.sql
|
||||
+++ b/mysql-test/include/mtr_warnings.sql
|
||||
@@ -376,6 +376,11 @@ INSERT INTO global_suppressions VALUES
|
||||
|
||||
/*
|
||||
("'mysql_native_password' is deprecated and will be removed in a future release."),
|
||||
|
||||
+ /*
|
||||
+ 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."),
|
||||
+
|
||||
+ /*
|
||||
Manifest file processing
|
||||
*/
|
||||
("Manifest file '.*' is not read-only. For better security, please make sure that the file is read-only."),
|
||||
("THE_LAST_SUPPRESSION");
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
0
mysql-boost-8.0.38.tar.gz
Normal file
0
mysql-boost-8.0.38.tar.gz
Normal file
16
mysql-boost-8.0.38.tar.gz.asc
Normal file
16
mysql-boost-8.0.38.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEvKQ0F8O0hd0SjsbUt7O3iKjTeFwFAmZsDjUACgkQt7O3iKjT
|
||||
eFzTZQ//b19+295G7IH85rH2tRjC4k3PcBZigTlY1u7YMJ58JaEbwLDkHDOEjomC
|
||||
4XCl30aldMBs0EeYsV6m39a1KNHMELZBOjJyWhwWVfQU9nHOApQaesEttDQQb+ws
|
||||
F5pKf5UHG5Pka59SOTNOzJgxccQfFB5FnNx2Oc0m5hcoHrYiIMC9edFS6z4n5B5F
|
||||
H+Uru2aXjjaypi4hUroU9Z3qlvK3JRGTnVIJxk3otgBs4ZCChmn9Rjhy/akFNwsU
|
||||
+yIjRTrpxbu1pOPYqFdq17WKw5WAQBzK9OQxs9U1nwrsRZTlKHXLaRVGBvJwa7u2
|
||||
zSLmF9hmBkIGzN6fjRx4gaPkp8d15VSrj/i6q8YPV/m/UqN/wDGp1zzb9ka4R+E4
|
||||
Aauwx9DKMBaU7OG8UpmJCxmEwn+NSvUMjIVKttj5pO9glPEZwxJYOqc+FyWgNPi3
|
||||
urhPJQHrWYVnkIdvmLnaALlgbTOpmUY1dCCYCk4P4hn9kEew2j0ohisaDo+HufgM
|
||||
eXzWZkDiSuRoD9/wTrh40Bq0uh1b7kAqZBhpg+szlgcpOh3rUO7MIrrAgwKq6luO
|
||||
XvEotg1zxqmrCDFEhDiWZe/JZzLAhTlg3eiS2Olfvxme9w9KP7CPX32o8SjVQkww
|
||||
sKBTLAD6K5dCcVdauHX6mZj0vlWbW6qasZ7hgCHky74QPrflHg8=
|
||||
=052C
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,24 +0,0 @@
|
||||
Fix things so that chains of certificates work in the server and client
|
||||
certificate files.
|
||||
|
||||
This only really works for OpenSSL-based builds, as yassl is unable to read
|
||||
multiple certificates from a file. The patch below to yassl/src/ssl.cpp
|
||||
doesn't fix that, but just arranges that the viosslfactories.c patch won't
|
||||
have any ill effects in a yassl build. Since we don't use yassl in Red Hat/
|
||||
Fedora builds, I'm not feeling motivated to try to fix yassl for this.
|
||||
|
||||
See RH bug #598656. Filed upstream at http://bugs.mysql.com/bug.php?id=54158
|
||||
|
||||
diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
|
||||
index 5e881e3..2927e7f 100644
|
||||
--- a/vio/viosslfactories.cc
|
||||
+++ b/vio/viosslfactories.cc
|
||||
@@ -198,7 +198,7 @@ static int vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file,
|
||||
if (!key_file && cert_file) key_file = cert_file;
|
||||
|
||||
if (cert_file &&
|
||||
- SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) {
|
||||
+ SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0) {
|
||||
*error = SSL_INITERR_CERT;
|
||||
DBUG_PRINT("error",
|
||||
("%s from file '%s'", sslGetErrString(*error), cert_file));
|
||||
@ -1,13 +0,0 @@
|
||||
# Prevents fails when compiling with gcc11 (Fedora 34)
|
||||
# Upstream PR: https://github.com/mysql/mysql-server/pull/323
|
||||
|
||||
--- mysql-8.0.23/extra/robin-hood-hashing/robin_hood.h.old 2021-02-04 17:15:31.034997221 +0100
|
||||
+++ mysql-8.0.23/extra/robin-hood-hashing/robin_hood.h 2021-02-04 17:15:50.781372066 +0100
|
||||
@@ -48,6 +48,7 @@
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
+#include <limits>
|
||||
#if __cplusplus >= 201703L
|
||||
# include <string_view>
|
||||
#endif
|
||||
@ -1,48 +0,0 @@
|
||||
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 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 - 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 d9756487..817aa9d6 100644
|
||||
--- a/mysys/my_rdtsc.cc
|
||||
+++ b/mysys/my_rdtsc.cc
|
||||
@@ -168,6 +168,13 @@ ulonglong my_timer_cycles(void) {
|
||||
__asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
|
||||
return result;
|
||||
}
|
||||
+#elif defined(__GNUC__) && defined(__s390__)
|
||||
+ /* covers both s390 and s390x */
|
||||
+ {
|
||||
+ ulonglong result;
|
||||
+ __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc");
|
||||
+ return result;
|
||||
+ }
|
||||
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
|
||||
/* gethrtime may appear as either cycle or nanosecond counter */
|
||||
return (ulonglong)gethrtime();
|
||||
@@ -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__)
|
||||
+ mti->cycles.routine = MY_TIMER_ROUTINE_ASM_S390;
|
||||
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
|
||||
mti->cycles.routine = MY_TIMER_ROUTINE_GETHRTIME;
|
||||
#else
|
||||
--
|
||||
2.27.0
|
||||
|
||||
111
mysql.spec
111
mysql.spec
@ -16,7 +16,7 @@
|
||||
%bcond_without test
|
||||
%bcond_with config
|
||||
%bcond_with debug
|
||||
%global boost_bundled_version 1.73.0
|
||||
%global boost_bundled_version 1.77.0
|
||||
%global daemon_name mysqld
|
||||
%global daemon_no_prefix mysqld
|
||||
%global pidfiledir %{_rundir}/%{daemon_name}
|
||||
@ -29,12 +29,12 @@
|
||||
%bcond_without conflicts
|
||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Name: mysql
|
||||
Version: 8.0.28
|
||||
Release: 5
|
||||
Version: 8.0.38
|
||||
Release: 1
|
||||
Summary: MySQL client programs and shared libraries
|
||||
URL: http://www.mysql.com
|
||||
License: GPLv2 with exceptions and LGPLv2 and BSD
|
||||
Source0: https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND GPL-1.0-or-later OR Artistic-1.0-Perl AND BSD-2-Clause
|
||||
Source0: https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz
|
||||
Source2: mysql_config_multilib.sh
|
||||
Source3: my.cnf.in
|
||||
Source6: README.mysql-docs
|
||||
@ -48,23 +48,22 @@ Source17: mysql-wait-stop.sh
|
||||
Source18: mysql@.service.in
|
||||
Source30: %{pkgnamepatch}.rpmlintrc
|
||||
Source31: server.cnf.in
|
||||
Source32: https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz.asc
|
||||
Source33: https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
|
||||
Patch1: %{pkgnamepatch}-install-test.patch
|
||||
Patch3: %{pkgnamepatch}-file-contents.patch
|
||||
Patch4: %{pkgnamepatch}-scripts.patch
|
||||
Patch5: %{pkgnamepatch}-paths.patch
|
||||
Patch6: %{pkgnamepatch}-chain-certs.patch
|
||||
Patch7: %{pkgnamepatch}-sharedir.patch
|
||||
Patch8: %{pkgnamepatch}-rpath.patch
|
||||
Patch9: %{pkgnamepatch}-arm32-timer.patch
|
||||
Patch10: boost-1.58.0-pool.patch
|
||||
Patch11: boost-1.57.0-mpl-print.patch
|
||||
Patch12: %{pkgnamepatch}-fix-includes-robin-hood.patch
|
||||
Patch13: disable-moutline-atomics-for-aarch64.patch
|
||||
Patch14: CVE-2022-37434-1.patch
|
||||
Patch15: CVE-2022-37434-2.patch
|
||||
Patch52: %{pkgnamepatch}-sharedir.patch
|
||||
Patch55: %{pkgnamepatch}-rpath.patch
|
||||
Patch75: %{pkgnamepatch}-arm32-timer.patch
|
||||
Patch81: disable-moutline-atomics-for-aarch64.patch
|
||||
Patch115: boost-1.58.0-pool.patch
|
||||
Patch125: boost-1.57.0-mpl-print.patch
|
||||
Patch126: mysql-Add-sw64-architecture.patch
|
||||
|
||||
BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel lz4
|
||||
BuildRequires: lz4-devel mecab-devel bison libzstd-devel chrpath
|
||||
BuildRequires: lz4-devel mecab-devel bison libzstd-devel
|
||||
%ifnarch aarch64 %{arm} s390 s390x
|
||||
BuildRequires: numactl-devel
|
||||
%endif
|
||||
@ -80,7 +79,7 @@ BuildRequires: perl(Getopt::Long) perl(if) perl(IO::File) perl(IO::Handle)
|
||||
BuildRequires: perl(IO::Socket::INET) perl(IPC::Open3) perl(JSON) perl(lib) perl(LWP::Simple)
|
||||
BuildRequires: perl(Memoize) perl(Net::Ping) perl(POSIX) perl(Socket) perl(strict)
|
||||
BuildRequires: perl(Sys::Hostname) perl(Test::More) perl(Time::HiRes) perl(Time::localtime)
|
||||
BuildRequires: perl(warnings) systemd m4
|
||||
BuildRequires: perl(warnings) systemd m4 chrpath gnupg2 wget
|
||||
Requires: bash coreutils grep %{name}-common%{?_isa} = %{sameevr}
|
||||
Provides: bundled(boost) = %{boost_bundled_version}
|
||||
%if %{with mysql_names}
|
||||
@ -126,7 +125,7 @@ package itself.
|
||||
|
||||
%package common
|
||||
Summary: The shared files required for MySQL server and client
|
||||
Requires: %{name}-config%{?_isa} = %{sameevr}
|
||||
Requires: %{name}-config = %{sameevr}
|
||||
%description common
|
||||
The mysql-common package provides the essential shared files for any
|
||||
MySQL program. You will need to install this package to use any other
|
||||
@ -145,7 +144,8 @@ The package provides error messages files for the MySQL daemon
|
||||
Summary: The MySQL server and related files
|
||||
Suggests: %{name}%{?_isa} = %{sameevr}
|
||||
Requires: mysql%{?_isa}
|
||||
Requires: %{name}-common%{?_isa} = %{sameevr} %{name}-errmsg%{?_isa} = %{sameevr}
|
||||
Requires: %{name}-common%{?_isa} = %{sameevr} %{name}-config = %{sameevr}
|
||||
Requires: %{_sysconfdir}/my.cnf.d %{name}-errmsg%{?_isa} = %{sameevr}
|
||||
%{?mecab:Requires: mecab-ipadic}
|
||||
Requires: coreutils
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
@ -210,23 +210,26 @@ The package provides Docs for development of MySQL applications.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
# download source0 and gpg check
|
||||
wget -qO %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/mysql/mysql-boost-%{version}.tar.gz
|
||||
gpg --import %{SOURCE33}
|
||||
gpg --verify %{SOURCE32} %{SOURCE0}
|
||||
%setup -q -n mysql-%{version}
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch52 -p1
|
||||
%patch55 -p1
|
||||
%patch75 -p1
|
||||
%patch81 -p1
|
||||
pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
|
||||
%patch10 -p0
|
||||
%patch11 -p1
|
||||
%patch115 -p0
|
||||
%patch125 -p1
|
||||
popd
|
||||
%ifarch sw_64
|
||||
%patch126 -p1
|
||||
%endif
|
||||
pushd mysql-test
|
||||
add_test () {
|
||||
echo "$1" : BUG#0 "${@:2}" >> %{skiplist}
|
||||
@ -389,7 +392,6 @@ ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld
|
||||
|
||||
%if %{with debug}
|
||||
mv %{buildroot}%{_bindir}/mysqld-debug %{buildroot}%{_libexecdir}/mysqld
|
||||
chrpath-d%{buildroot}%{_libexecdir}/mysqld
|
||||
%endif
|
||||
|
||||
cd -
|
||||
@ -541,6 +543,53 @@ fi
|
||||
%{_mandir}/man1/mysql_config.1*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 22 2024 wangkai <13474090681@163.com> - 8.0.38-1
|
||||
- Update to 8.0.38 for fix CVEs(CVE-2024-21125,CVE-2024-21142,CVE-2024-21179,
|
||||
CVE-2024-21171,CVE-2024-21130,CVE-2024-21162,CVE-2024-21177,CVE-2024-20996,
|
||||
CVE-2024-21134,CVE-2024-21165,CVE-2024-21173,CVE-2024-21129,CVE-2024-21127,
|
||||
CVE-2024-21163,CVE-2022-21423,CVE-2022-21451,CVE-2022-21444,CVE-2022-21417,
|
||||
CVE-2022-21427,CVE-2022-21414,CVE-2022-21435,CVE-2022-21413,CVE-2022-21462,
|
||||
CVE-2022-21412,CVE-2022-21437,CVE-2022-21438,CVE-2022-21418,CVE-2022-21459,
|
||||
CVE-2022-21478,CVE-2022-21479,CVE-2022-21440,CVE-2022-21425,CVE-2022-21457,
|
||||
CVE-2022-21454,CVE-2022-21483,CVE-2022-21482,CVE-2022-21484,CVE-2022-21485,
|
||||
CVE-2022-21486,CVE-2022-21489,CVE-2022-21490,CVE-2021-22570,CVE-2022-21556,
|
||||
CVE-2022-21455,CVE-2022-21517,CVE-2022-21530,CVE-2022-21527,CVE-2022-21547,
|
||||
CVE-2022-21515,CVE-2022-21534,CVE-2022-21529,CVE-2022-21509,CVE-2022-21539,
|
||||
CVE-2022-21538,CVE-2022-21537,CVE-2022-21531,CVE-2022-21525,CVE-2022-21528,
|
||||
CVE-2022-21526,CVE-2022-21569,CVE-2022-39408,CVE-2022-39410,CVE-2022-21604,
|
||||
CVE-2022-21637,CVE-2022-21617,CVE-2022-21594,CVE-2022-21608,CVE-2022-21640,
|
||||
CVE-2022-39400,CVE-2022-21633,CVE-2022-21632,CVE-2022-21599,CVE-2022-21625,
|
||||
CVE-2022-21611,CVE-2022-21635,CVE-2022-21638,CVE-2022-21641,CVE-2022-21592,
|
||||
CVE-2023-21878,CVE-2023-21877,CVE-2023-21876,CVE-2023-21875,CVE-2023-21879,
|
||||
CVE-2023-21880,CVE-2023-21887,CVE-2023-21883,CVE-2023-21881,CVE-2023-21882,
|
||||
CVE-2023-21869,CVE-2023-21863,CVE-2023-21868,CVE-2023-21874,CVE-2023-21866,
|
||||
CVE-2023-21870,CVE-2023-21864,CVE-2023-21873,CVE-2023-21867,CVE-2023-21872,
|
||||
CVE-2023-21865,CVE-2023-21871,CVE-2023-21836,CVE-2022-32221,CVE-2023-21920,
|
||||
CVE-2023-21953,CVE-2023-21976,CVE-2023-21911,CVE-2023-21940,CVE-2023-21977,
|
||||
CVE-2023-21917,CVE-2023-21962,CVE-2023-21972,CVE-2023-21919,CVE-2023-21947,
|
||||
CVE-2023-21980,CVE-2023-21913,CVE-2023-21966,CVE-2023-21929,CVE-2023-21955,
|
||||
CVE-2023-21982,CVE-2023-21935,CVE-2023-21933,CVE-2023-21945,CVE-2023-21912,
|
||||
CVE-2023-21963,CVE-2023-21946,CVE-2022-43551,CVE-2023-0215,CVE-2023-22007,
|
||||
CVE-2023-22056,CVE-2023-22048,CVE-2023-22033,CVE-2023-22054,CVE-2023-22005,
|
||||
CVE-2023-22057,CVE-2023-22008,CVE-2023-22053,CVE-2023-22038,CVE-2023-22046,
|
||||
CVE-2023-22058,CVE-2023-22103,CVE-2023-22111,CVE-2023-22092,CVE-2023-22112,
|
||||
CVE-2023-22065,CVE-2023-22110,CVE-2023-22097,CVE-2023-22114,CVE-2023-22104,
|
||||
CVE-2023-22028,CVE-2023-22115,CVE-2023-22070,CVE-2023-22059,CVE-2023-22032,
|
||||
CVE-2023-22015,CVE-2023-22026,CVE-2023-22113,CVE-2023-22066,CVE-2023-22078,
|
||||
CVE-2023-22064,CVE-2023-22084,CVE-2023-22079,CVE-2023-38545,CVE-2023-22068,
|
||||
CVE-2024-20964,CVE-2024-20971,CVE-2024-20976,CVE-2024-20973,CVE-2024-20978,
|
||||
CVE-2024-20981,CVE-2024-20962,CVE-2024-20977,CVE-2024-20963,CVE-2024-20965,
|
||||
CVE-2024-20972,CVE-2024-20961,CVE-2024-20982,CVE-2024-20970,CVE-2024-20983,
|
||||
CVE-2024-20967,CVE-2024-20984,CVE-2024-20974,CVE-2024-20966,CVE-2024-20960,
|
||||
CVE-2024-20968,CVE-2024-20985,CVE-2024-20969,CVE-2022-21605,CVE-2022-21607,
|
||||
CVE-2024-21049,CVE-2024-21050,CVE-2024-21000,CVE-2024-21069,CVE-2024-21009,
|
||||
CVE-2024-21061,CVE-2024-20993,CVE-2024-21087,CVE-2024-21047,CVE-2024-20998,
|
||||
CVE-2024-21052,CVE-2024-21056,CVE-2024-21053,CVE-2024-21055,CVE-2024-21015,
|
||||
CVE-2024-21013,CVE-2024-21051,CVE-2024-21060,CVE-2024-21008,CVE-2024-21102,
|
||||
CVE-2024-21054,CVE-2024-21062,CVE-2024-20994,CVE-2024-21057,CVE-2024-21096,
|
||||
CVE-2023-6129,CVE-2024-21160,CVE-2024-21135,CVE-2024-21157,CVE-2024-21166,
|
||||
CVE-2024-21137,CVE-2024-21159)
|
||||
|
||||
* Thu Feb 22 2024 xiejing <xiejing@kylinos.cn> - 8.0.28-5
|
||||
- fix requires to mysql-config instead of my.cnf file
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user