diff --git a/mysql-arm32-timer.patch b/mysql-arm32-timer.patch index 5bc7f67eb7a156a3e0432d9d893d6a33f7057af1..bbfc560897521ad5b861f257cdd8ffc3436d8b91 100644 --- a/mysql-arm32-timer.patch +++ b/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. diff --git a/mysql-boost-8.0.23.tar.gz b/mysql-boost-8.0.23.tar.gz deleted file mode 100644 index 5fa3d863eca346978eafa9a022db78c14ca8a324..0000000000000000000000000000000000000000 Binary files a/mysql-boost-8.0.23.tar.gz and /dev/null differ diff --git a/mysql-boost-8.0.24.tar.gz b/mysql-boost-8.0.24.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ce09475dd9fef218cb1bb93e7ba863dfa3cadeab Binary files /dev/null and b/mysql-boost-8.0.24.tar.gz differ diff --git a/mysql-boost-8.0.23.tar.gz.ab b/mysql-boost-8.0.24.tar.gz.aa similarity index 85% rename from mysql-boost-8.0.23.tar.gz.ab rename to mysql-boost-8.0.24.tar.gz.aa index 0fed939d92757b0cebaed7501e749ac4365b7833..3fc0d2a57ce94ce4d36196aa3cc7bc891d6ecc10 100644 Binary files a/mysql-boost-8.0.23.tar.gz.ab and b/mysql-boost-8.0.24.tar.gz.aa differ diff --git a/mysql-boost-8.0.23.tar.gz.aa b/mysql-boost-8.0.24.tar.gz.ab similarity index 85% rename from mysql-boost-8.0.23.tar.gz.aa rename to mysql-boost-8.0.24.tar.gz.ab index 8040faf962ac7b31dd1f5034cd3a73c3e5699525..1b071c7ed1f2c34a0d70e4b0326d9d18d0947e36 100644 Binary files a/mysql-boost-8.0.23.tar.gz.aa and b/mysql-boost-8.0.24.tar.gz.ab differ diff --git a/mysql-boost-8.0.23.tar.gz.ac b/mysql-boost-8.0.24.tar.gz.ac similarity index 84% rename from mysql-boost-8.0.23.tar.gz.ac rename to mysql-boost-8.0.24.tar.gz.ac index 6809c7b92dd33968b5c079da4978aad618a355bf..d9ea600360b9c01046ccc42deb0ea067209f0256 100644 Binary files a/mysql-boost-8.0.23.tar.gz.ac and b/mysql-boost-8.0.24.tar.gz.ac differ diff --git a/mysql-gcc11.patch b/mysql-gcc11.patch deleted file mode 100644 index 8a030a8066cf028248d5d7082b2287626ad1aa34..0000000000000000000000000000000000000000 --- a/mysql-gcc11.patch +++ /dev/null @@ -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 - #include -+#include - - #include - -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 -+#include - - #include "my_dbug.h" - #include "my_macros.h" diff --git a/mysql-main-cast.patch b/mysql-main-cast.patch deleted file mode 100644 index c078fae0603542419b9f4b1e50930484538c78bc..0000000000000000000000000000000000000000 --- a/mysql-main-cast.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 68730acd9ae7ae8b2fcd25b5ccd18d47038d00b9 -Author: Catalin Besleaga -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 diff --git a/mysql.spec b/mysql.spec index 2727d91a10e9328a812fbe3835cd8bb833ef3f63..7d555aa09e3dd62d77fe817eae957844902f4b3b 100644 --- a/mysql.spec +++ b/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 +%patch12 -p1 %patch13 -p1 -%patch14 -p1 -%patch15 -p1 pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) -%patch11 -p0 -%patch12 -p1 +%patch10 -p0 +%patch11 -p1 popd %build @@ -128,6 +124,16 @@ fi %exclude /usr/lib/debug %changelog +* Thu May 6 2021 wangxiao 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 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 8.0.22-3 -- modify symbol issues of spec - -* Mon Nov 30 2020 weishengjing 8.0.22-2 -- add libprotobuf-lite.so to /usr/lib64 - -* Wed Nov 18 2020 weishengjing 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 - 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