!45 [sync] PR-44: upgrade to 8.0.24

From: @openeuler-sync-bot
Reviewed-by: @small_leek
Signed-off-by: @small_leek

mysql-arm32-timer.patch

@@ -1,8 +1,8 @@
---- mysql-8.0.22/mysql-test/include/mtr_warnings.sql.old	2020-10-21 11:25:49.779775116 +0200
-+++ mysql-8.0.22/mysql-test/include/mtr_warnings.sql	2020-10-21 11:26:29.507185307 +0200
-@@ -299,6 +299,11 @@
-  ("NOTIFY_SOCKET not set in environment. sd_notify messages will not be sent!"),
-  ("Invalid systemd notify socket, cannot send: "),
+--- 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.

mysql-gcc11.patch

@@ -1,25 +0,0 @@
-index a826a081..00000000
-diff --git a/include/mysql/components/services/page_track_service.h b/include/mysql/components/services/page_track_service.h
-index 103b5135..e6b3ba6f 100644
---- a/include/mysql/components/services/page_track_service.h
-+++ b/include/mysql/components/services/page_track_service.h
-@@ -26,6 +26,7 @@
- 
- #include <mysql/components/service.h>
- #include <functional>
-+#include <cstddef>
- 
- #include <stdint.h>
- 
-diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc
-index 40435729..8b6ee827 100644
---- a/sql-common/sql_string.cc
-+++ b/sql-common/sql_string.cc
-@@ -23,6 +23,7 @@
- #include "sql_string.h"
- 
- #include <algorithm>
-+#include <limits>
- 
- #include "my_dbug.h"
- #include "my_macros.h"

mysql-main-cast.patch

@@ -1,48 +0,0 @@
-commit 68730acd9ae7ae8b2fcd25b5ccd18d47038d00b9
-Author: Catalin Besleaga <catalin.besleaga@oracle.com>
-Date:   Mon Jan 4 14:32:05 2021 +0100
-
-    WL#14015: Follow-up: fixed unstable test
-
-    Change-Id: I11f352168902c6689981131cfda3a87ba924941c
-
-diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
-index af82329a9c5..4d81ef111cb 100644
---- a/mysql-test/r/cast.result
-+++ b/mysql-test/r/cast.result
-@@ -1747,6 +1747,7 @@ CAST("2020extra" AS YEAR)
- 2020
- Warnings:
- Warning	1292	Truncated incorrect YEAR value: '2020extra'
-+SET timestamp = UNIX_TIMESTAMP('2020-12-22 03:30:00');
- SELECT CAST(TIMESTAMP'2010-01-01 00:00' AS YEAR);
- CAST(TIMESTAMP'2010-01-01 00:00' AS YEAR)
- 2010
-@@ -1764,6 +1765,7 @@ CAST(TIME'08:09:10' AS YEAR)
- SELECT CAST(TIME'00:00:00' AS YEAR);
- CAST(TIME'00:00:00' AS YEAR)
- 2020
-+SET timestamp = DEFAULT;
- SELECT CAST(ST_PointFromText('POINT(10 10)') AS YEAR);
- ERROR HY000: Incorrect arguments to cast_as_year
- CREATE TABLE t AS SELECT CAST("2010" AS YEAR);
-diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test
-index 1a1f512fca7..a74d79ad91f 100644
---- a/mysql-test/t/cast.test
-+++ b/mysql-test/t/cast.test
-@@ -799,6 +799,7 @@ SELECT CAST("extra" AS YEAR);
- SELECT CAST("22extra" AS YEAR);
- SELECT CAST("2020extra" AS YEAR);
-
-+SET timestamp = UNIX_TIMESTAMP('2020-12-22 03:30:00');
- #date[time] values
- SELECT CAST(TIMESTAMP'2010-01-01 00:00' AS YEAR);
- SET SQL_MODE = "";
-@@ -807,6 +808,7 @@ SET SQL_MODE = default;
- SELECT CAST(TIMESTAMP'2010-01-01 08:09:10' AS YEAR);
- SELECT CAST(TIME'08:09:10' AS YEAR);
- SELECT CAST(TIME'00:00:00' AS YEAR);
-+SET timestamp = DEFAULT;
-
- #geometry values
- --error ER_WRONG_ARGUMENTS

mysql.spec

@@ -6,7 +6,7 @@
 %global pkgnamepatch mysql
 %global boost_bundled_version 1.73.0
 Name:              mysql
-Version:           8.0.23
+Version:           8.0.24
 Release:           1
 License:           GPLv2 with exceptions and LGPLv2 and BSD
 Summary:           The world's most popular open source database
@@ -23,12 +23,10 @@ Patch6:%{pkgnamepatch}-chain-certs.patch
 Patch7:%{pkgnamepatch}-sharedir.patch
 Patch8:%{pkgnamepatch}-rpath.patch
 Patch9:%{pkgnamepatch}-arm32-timer.patch
-Patch10:%{pkgnamepatch}-gcc11.patch
-Patch11:boost-1.58.0-pool.patch
-Patch12:boost-1.57.0-mpl-print.patch
-Patch13:%{pkgnamepatch}-main-cast.patch
-Patch14:%{pkgnamepatch}-fix-includes-robin-hood.patch
-Patch15:disable-moutline-atomics-for-aarch64.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
 
 BuildRequires:     cmake openssl-devel ncurses-devel libtirpc-devel rpcgen libcurl-devel make
  
@@ -61,13 +59,11 @@ cd ..
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
-%patch11 -p0
 %patch12 -p1
+%patch13 -p1
+pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
+%patch10 -p0
+%patch11 -p1
 popd
 
 %build
@@ -128,6 +124,16 @@ fi
 %exclude /usr/lib/debug
 
 %changelog
+* Thu May 6 2021 wangxiao <wangxiao65@huawei.com> 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
+  CVE-2021-2278 CVE-2021-2164 CVE-2021-2208 CVE-2021-2217 CVE-2021-2203
+  CVE-2021-2226 CVE-2021-2298 CVE-2021-2230 CVE-2021-2300 CVE-2021-2304
+  CVE-2021-2172 CVE-2021-2194 CVE-2021-2170 CVE-2021-2196 CVE-2021-2201
+  CVE-2021-2180 CVE-2021-2307 CVE-2021-2169 CVE-2021-2171 CVE-2021-2305
+  CVE-2021-2179 CVE-2021-2174 CVE-2021-2193 CVE-2021-2232 CVE-2021-2301
+  CVE-2021-2308
+
 * Wed Mar 10 2021 wangxiao <wangxiao65@huawei.com> 8.0.23-1
 - Upgrade mysql to 8.0.23, fix CVES: CVE-2021-1998 CVE-2021-2002
   CVE-2021-2010 CVE-2021-2011 CVE-2021-2016 CVE-2021-2021 CVE-2021-2022
@@ -136,14 +142,8 @@ fi
   CVE-2021-2061 CVE-2021-2065 CVE-2021-2070 CVE-2021-2072 CVE-2021-2076
   CVE-2021-2081 CVE-2021-2087 CVE-2021-2088 CVE-2021-2122
 
-* Tue Dec 1  2020 weishengjing <weishengjing1@huawei.com> 8.0.22-3
-- modify symbol issues of spec
-
-* Mon Nov 30 2020 weishengjing <weishengjing1@huawei.com> 8.0.22-2
-- add libprotobuf-lite.so to /usr/lib64
-
-* Wed Nov 18 2020 weishengjing <weishengjing1@huawei.com> 8.0.22-1
-- New version 8.0.22 fix CVES: CVE-2020-14852 CVE-2020-14794 CVE-2020-14775
+* Wed Dec 1 2020 wutao <wutao61@huawei.com> - 8.0.22-1
+- upgrade to 8.0.22 fix CVES: CVE-2020-14852 CVE-2020-14794 CVE-2020-14775
   CVE-2020-14893 CVE-2020-14829 CVE-2020-14828 CVE-2020-14888 CVE-2020-14891
   CVE-2020-14812 CVE-2020-14870 CVE-2020-14769 CVE-2020-14878 CVE-2020-14789
   CVE-2020-14821 CVE-2020-14844 CVE-2020-14836 CVE-2020-14830 CVE-2020-14827