!153 Update to 8.0.40 for fix CVEs

From: @wk333 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge

mysql-boost-8.0.38.tar.gz.asc

@@ -1,16 +0,0 @@
------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-----

mysql-boost-8.0.40.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEvKQ0F8O0hd0SjsbUt7O3iKjTeFwFAmbtoVoACgkQt7O3iKjT
+eFz/oA//aYWb/0AdRUIGkuAeCoKN+2/sduS0Z/I2suRXLG4WBzt9qorpEtFv5Eh6
+syRMILVrC2j9hL3eZyMltDmQFueBgsLZb1qzzgFKhEiHvQFopjU58XxFdwW7tQAl
+CsOiqwLFq1+TKDGfTyYAG2/ctgSVXq7Y8y46QE3FmcdgibJcR5UEemHXezuto9op
+o3NjbNNHLQk+e6y+uRd3W7nZInW1bGAMQ54XZ+zq2CEN3Yq19UXvvTYVF29u6EAB
+dWQD+5kA+UH7+c7AHdYxCty3ze3FlWDmcX17qGPj/zLjIaA2ahhLvHPBVKnbKCSE
+cGf0PJee/43AljMhDd3rtCAAEr1C0rQemgT9Og570Fi3huHSMpm/0FTeKdGgpc6g
+AVV6lDGwYY+CsIs5k/YqD5ijQife5sRIDuFcyZcntjD6n5HeKiliQtUpekbp3kpd
+A4beiBQCntG9BpXCzilevgsV7+GYy9U/OF4rpsszheMz1D7nmfep8+q8SfFCY6f6
+QYz6VcHPWiNypL2tFMhLaaJauYmStRpyHDJkFTr2ORn+iY7UTVur5S5p+zo6cdOs
+7+yGV5fHvhuOqrCpameari5pYtVzY2A6ARbdFlZJ2BYaWkka7Qhp70rW67VCMeJv
+bs/FNQTCxvNP4w5IEdCfQNayroibo3b2PD9TCi35A/6byWhqq7c=
+=QZtM
+-----END PGP SIGNATURE-----

mysql-s390-tsc.patch

@@ -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
-

mysql.spec

@@ -29,7 +29,7 @@
 %bcond_without conflicts
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 Name:                mysql
-Version:             8.0.38
+Version:             8.0.40
 Release:             1
 Summary:             MySQL client programs and shared libraries
 URL:                 http://www.mysql.com
@@ -551,6 +551,13 @@ fi
 %{_mandir}/man1/mysql_config.1*
 
 %changelog
+* Thu Oct 17 2024 wangkai <13474090681@163.com> - 8.0.40-1
+- Update to 8.0.40 for fix CVEs(CVE-2024-21218,CVE-2024-21196,CVE-2024-21207,
+  CVE-2024-21198,CVE-2024-21203,CVE-2024-21213,CVE-2024-21239,CVE-2024-21199,
+  CVE-2024-21197,CVE-2024-21247,CVE-2024-21193,CVE-2024-21212,CVE-2024-21241,
+  CVE-2024-21230,CVE-2024-21236,CVE-2024-21194,CVE-2024-21238,CVE-2024-21237,
+  CVE-2024-21201,CVE-2024-21231,CVE-2024-21219,CVE-2024-21185)
+
 * 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,