From a02d19b863bb35aa5cd87d2a65f76e280a6d40dd Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 11:26:40 +0000 Subject: [PATCH] import CS mariadb-10.3.39-1.module_el8+652+dd7ee08c --- .gitignore | 2 +- .mariadb.metadata | 2 +- SOURCES/mariadb-10.3.39-tests.patch | 101 ++++++++++++++++++++++++++++ SOURCES/mariadb-mdev-30402.patch | 12 ++++ SPECS/mariadb.spec | 14 +++- 5 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 SOURCES/mariadb-10.3.39-tests.patch create mode 100644 SOURCES/mariadb-mdev-30402.patch diff --git a/.gitignore b/.gitignore index d8d0bcc..2b032ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.3.35.tar.gz +SOURCES/mariadb-10.3.39.tar.gz diff --git a/.mariadb.metadata b/.mariadb.metadata index 4d3a05a..81ef032 100644 --- a/.mariadb.metadata +++ b/.mariadb.metadata @@ -1 +1 @@ -ea904f8e036c72f0b1db78cf2d350c1dd8250375 SOURCES/mariadb-10.3.35.tar.gz +25972d22ed05249782141392f0893e71c7d549a9 SOURCES/mariadb-10.3.39.tar.gz diff --git a/SOURCES/mariadb-10.3.39-tests.patch b/SOURCES/mariadb-10.3.39-tests.patch new file mode 100644 index 0000000..54f5ff9 --- /dev/null +++ b/SOURCES/mariadb-10.3.39-tests.patch @@ -0,0 +1,101 @@ +--- mariadb-10.3.39/mysql-test/include/default_mysqld.cnf 2023-05-03 06:32:44.000000000 +0200 ++++ ../../mariadb-10.3.39/mysql-test/include/default_mysqld.cnf 2023-07-07 13:58:40.255283041 +0200 +@@ -127,3 +127,8 @@ local-infile + # tables. Let's enable it in the [server] group, because this group + # is read after [mysqld] and [embedded] + loose-aria ++ ++[mysqltest] ++loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem ++loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem ++loose-ssl-key=@ENV.MYSQL_TEST_DIR/std_data/server-key.pem + +--- mariadb-10.3.39/mysql-test/include/wait_until_connected_again.inc 2023-05-03 06:32:44.000000000 +0200 ++++ ../../mariadb-10.3.39/mysql-test/include/wait_until_connected_again.inc 2023-07-07 13:55:30.424368106 +0200 +@@ -11,7 +11,7 @@ let $counter= 5000; + let $mysql_errno= 9999; + while ($mysql_errno) + { +- --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013 ++ --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013,2026 + show status; + + dec $counter; + +--- mariadb-10.3.39/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test 2023-05-03 06:32:45.000000000 +0200 ++++ ../../mariadb-10.3.39/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test 2023-07-07 13:54:31.152082427 +0200 +@@ -53,7 +53,7 @@ insert into t4 values (3),(4); + connection master; + # The get_lock function causes warning for unsafe statement. + --disable_warnings +---error 0,1317,2013 ++--error 0,1317,2013,2026 + reap; + --enable_warnings + connection master1; + +--- mariadb-10.3.39/mysql-test/suite/innodb/t/innodb_bug51920.test 2023-05-03 06:32:44.000000000 +0200 ++++ ../../mariadb-10.3.39/mysql-test/suite/innodb/t/innodb_bug51920.test 2023-07-07 15:11:39.000404508 +0200 +@@ -36,7 +36,7 @@ let $wait_condition = + # depending on platform. + # + connection con1; +--- error 1317, 2006, 2013, ER_CONNECTION_KILLED ++-- error 1317, 2006, 2013, 2026, ER_CONNECTION_KILLED + reap; + connection default; + DROP TABLE bug51920; + +--- mariadb-10.3.39/mysql-test/main/lock_kill.test 2023-05-03 06:32:44.000000000 +0200 ++++ ../../mariadb-10.3.39/mysql-test/main/lock_kill.test 2023-07-07 15:13:54.335086789 +0200 +@@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE; + eval KILL $conid; + --enable_query_log + --connection con1 +---error 0,2006,2013,ER_CONNECTION_KILLED ++--error 0,2006,2013,2026,ER_CONNECTION_KILLED + reap; + --connection default + --disconnect con1 +@@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE; + eval KILL $conid; + --enable_query_log + --connection con1 +---error 0,2006,2013,ER_CONNECTION_KILLED ++--error 0,2006,2013,2026,ER_CONNECTION_KILLED + reap; + --connection default + --disconnect con1 + +--- mariadb-10.3.39/mysql-test/main/loadxml.test 2023-05-03 06:32:44.000000000 +0200 ++++ ../../mariadb-10.3.39/mysql-test/main/loadxml.test 2023-07-07 15:15:14.862492763 +0200 +@@ -83,7 +83,7 @@ connection default; + connection addconroot; + # Read response from connection to avoid packets out-of-order when disconnecting + # Note, that connection can already be dead due to previously issued kill +---error 0,2013 ++--error 0,2013,2026 + --reap + disconnect addconroot; + connection default; + +--- mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.test 2023-05-03 06:32:45.000000000 +0200 ++++ ../../mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.test 2023-07-10 11:48:28.859497746 +0200 +@@ -1,3 +1,3 @@ + --replace_regex /varchar\([0-9]+\)/varchar(pathlen)/ + show create table information_schema.disks; +-select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; ++select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks; + +--- mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.result 2023-05-03 06:32:45.000000000 +0200 ++++ ../../mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.result 2023-07-10 12:47:10.460233056 +0200 +@@ -7,6 +7,6 @@ DISKS CREATE TEMPORARY TABLE `DISKS` ( + `Used` bigint(32) NOT NULL, + `Available` bigint(32) NOT NULL + ) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +-select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; +-sum(Total) > sum(Available) sum(Total)>sum(Used) ++select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks; ++sum(Total) >= sum(Available) sum(Total) >= sum(Used) + 1 1 + diff --git a/SOURCES/mariadb-mdev-30402.patch b/SOURCES/mariadb-mdev-30402.patch new file mode 100644 index 0000000..069bf76 --- /dev/null +++ b/SOURCES/mariadb-mdev-30402.patch @@ -0,0 +1,12 @@ +--- mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh 2023-08-11 11:31:40.415022889 +0200 ++++ ../../mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh 2023-08-11 11:32:01.924161077 +0200 +@@ -340,6 +340,9 @@ get_transfer() + "Use workaround for socat $SOCAT_VERSION bug" + fi + fi ++ if check_for_version "$SOCAT_VERSION" '1.7.4'; then ++ tcmd="$tcmd,no-sni=1" ++ fi + fi + + if [ "${sockopt#*,dhparam=}" = "$sockopt" ]; then diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index f6ccf19..dc72386 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -142,7 +142,7 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.3.35 +Version: 10.3.39 Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 @@ -190,7 +190,10 @@ Patch9: %{pkgnamepatch}-ownsetup.patch Patch10: %{pkgnamepatch}-annocheck.patch # Patch12: Downstream fix for a correct pkgconfig file location Patch12: %{pkgnamepatch}-pcdir.patch - +# Patch13: Fix failing 10.3.39 ssl and disks tests +Patch13: %{pkgnamepatch}-10.3.39-tests.patch +# Patch14: Backport MDEV-30402 socat patch +Patch14: %{pkgnamepatch}-mdev-30402.patch BuildRequires: cmake gcc-c++ BuildRequires: multilib-rpm-config @@ -695,6 +698,8 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \; %patch9 -p1 %patch10 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 # workaround for upstream bug #56342 #rm mysql-test/t/ssl_8k_key-master.opt @@ -1584,6 +1589,11 @@ fi %endif %changelog +* Thu Jun 22 2023 Anton Bobrov - 3:10.3.39-1 +- Rebase to 10.3.39 +- CVEs fixed: + CVE-2022-47015, CVE-2018-25032, CVE-2022-32091, CVE-2022-32084 + * Thu Jun 30 2022 Zuzana Miklankova - 3:10.3.35-1 - Rebase to 10.3.35