diff --git a/0001-disable-some-unstable-testcases.patch b/0001-disable-some-unstable-testcases.patch new file mode 100644 index 0000000000000000000000000000000000000000..529a77cf316698cbe59ce189a17f012709fd1824 --- /dev/null +++ b/0001-disable-some-unstable-testcases.patch @@ -0,0 +1,55 @@ +diff -Naur mariadb-10.3.34/mysql-test/unstable-tests mariadb-10.3.34_patched/mysql-test/unstable-tests +--- mariadb-10.3.34/mysql-test/unstable-tests 2022-02-11 03:31:00.000000000 +0800 ++++ mariadb-10.3.34_patched/mysql-test/unstable-tests 2022-03-03 11:35:46.130367650 +0800 +@@ -133,6 +133,9 @@ + main.ssl_ca : MDEV-10895 - SSL connection error on Power + main.ssl_cipher : MDEV-17184 - Failures with OpenSSL 1.1.1 + main.ssl_timeout : MDEV-11244 - Crash ++main.ssl_7937 : ++main.ssl_crl_clients : ++main.ssl_8k_key : + main.stat_tables : Modified in 10.3.28 + main.stat_tables_par_innodb : MDEV-14155 - Wrong rounding + main.status : MDEV-13255 - Wrong result +@@ -368,6 +371,7 @@ + innodb.undo_truncate_recover : MDEV-17679 - Server has gone away + innodb.update_time : MDEV-14804 - Wrong result + innodb.xa_recovery : MDEV-15279 - mysqld got exception ++innodb.innodb_defrag_binlog : + + #----------------------------------------------------------------------- + +@@ -467,6 +471,7 @@ + parts.partition_exch_qa_10 : MDEV-11765 - wrong result + parts.partition_innodb_status_file : MDEV-12901 - Valgrind + parts.partition_special_innodb : MDEV-16942 - Timeout ++parts.partition_alter4_innodb : + + #----------------------------------------------------------------------- + +@@ -491,6 +496,9 @@ + perfschema.stage_mdl_table : MDEV-12638 - Wrong result + perfschema.start_server_low_digest : MDEV-21221 - Wrong result + perfschema.threads_mysql : MDEV-10677 - Wrong result ++perfschema.nesting : ++perfschema.socket_summary_by_instance_func : ++perfschema.cnf_option : + + #----------------------------------------------------------------------- + +@@ -629,6 +637,7 @@ + rpl.rpl_user_variables : MDEV-20522 - Wrong result + rpl.rpl_variables : MDEV-20150 - Server crash + rpl.sec_behind_master-5114 : MDEV-13878 - Wrong result ++rpl.rpl_connection : + + #----------------------------------------------------------------------- + +@@ -687,6 +696,7 @@ + sys_vars.slow_query_log_func : MDEV-14273 - Wrong result + sys_vars.thread_cache_size_func : MDEV-11775 - Wrong result + sys_vars.wait_timeout_func : MDEV-12896 - Wrong result ++sys_vars.slave_parallel_threads_basic : + + #----------------------------------------------------------------------- + diff --git a/0002-add-install-db-command.patch b/0002-add-install-db-command.patch new file mode 100644 index 0000000000000000000000000000000000000000..1eef9c12cb2efe0a806790d04b791b35f2f3cfe3 --- /dev/null +++ b/0002-add-install-db-command.patch @@ -0,0 +1,11 @@ +diff -Naur mariadb-10.3.34/support-files/mariadb.service.in mariadb-10.3.34_patched/support-files/mariadb.service.in +--- mariadb-10.3.34/support-files/mariadb.service.in 2022-02-11 03:31:02.000000000 +0800 ++++ mariadb-10.3.34_patched/support-files/mariadb.service.in 2022-03-03 11:45:17.906359320 +0800 +@@ -82,6 +82,7 @@ + + # Needed to create system tables etc. + # ExecStartPre=@scriptdir@/mysql_install_db -u mysql ++ExecStartPre=@scriptdir@/mysql_install_db --user="mysql" --skip-test-db + + # Start main service + # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf diff --git a/0003-disable-some-unstable-testcases-2.patch b/0003-disable-some-unstable-testcases-2.patch new file mode 100644 index 0000000000000000000000000000000000000000..68dd6c6031bc87829d2cbcf9f7e4fd7bdaa40fbf --- /dev/null +++ b/0003-disable-some-unstable-testcases-2.patch @@ -0,0 +1,23 @@ +diff -Naur mariadb-10.3.34/mysql-test/unstable-tests mariadb-10.3.34_patched/mysql-test/unstable-tests +--- mariadb-10.3.34/mysql-test/unstable-tests 2022-03-03 11:43:57.725496322 +0800 ++++ mariadb-10.3.34_patched/mysql-test/unstable-tests 2022-03-03 11:49:42.589164265 +0800 +@@ -59,9 +59,10 @@ + main.events_bugs : MDEV-12892 - Crash + main.events_restart : MDEV-12236 - Server shutdown problem + main.events_slowlog : MDEV-12821 - Wrong result ++main.events_1 : Skip on ARM + main.flush : MDEV-19368 - mysqltest failed but provided no output + main.func_gconcat : MDEV-21379 - Valgrind warnings; modified in 10.3.28 +-main.func_like : Modified in 10.3.28 ++main.func_like : Modified in 10.3.28 - Skip on ARM + main.func_math : MDEV-20532 - Floating point differences + main.gis : MDEV-13411 - wrong result on P8 + main.gis-json : Modified in 10.3.28 +@@ -178,6 +179,7 @@ + binlog.binlog_no_uniqfile_crash : MDEV-24078 - Server crash upon shutdown + binlog.binlog_stm_mix_innodb_myisam : MDEV-24057 - Wrong result + binlog.binlog_xa_recover : MDEV-12908 - Extra checkpoint ++binlog.binlog_mysqlbinlog2 : Skip on ARM + binlog.flashback-largebinlog : MDEV-19764 - Out of memory + binlog.load_data_stm_view : MDEV-16948 - Wrong result + diff --git a/add-install-db-command.patch b/add-install-db-command.patch deleted file mode 100644 index 2a530493d90976e4cef2636c6bdc9b80c3c8f10c..0000000000000000000000000000000000000000 --- a/add-install-db-command.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 22caf578e446809de75555ec8252f09da50c8db1 Mon Sep 17 00:00:00 2001 -From: eulerstorage -Date: Sun, 19 Jan 2020 22:54:38 +0800 -Subject: [PATCH] add mysql install db command - ---- - support-files/mariadb.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in -index 8d43b6d..56ccb1a 100644 ---- a/support-files/mariadb.service.in -+++ b/support-files/mariadb.service.in -@@ -73,7 +73,7 @@ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \ - && systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1" - - # Needed to create system tables etc. --# ExecStartPre=@scriptdir@/mysql_install_db -u mysql -+ExecStartPre=@scriptdir@/mysql_install_db --user="mysql" --skip-test-db - - # Start main service - # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf --- -1.8.3.1 - diff --git a/disable-some-unstable-testcases-2.patch b/disable-some-unstable-testcases-2.patch deleted file mode 100644 index 0a2441717b2af2cc415f6d49cc1d27c0a3198a27..0000000000000000000000000000000000000000 --- a/disable-some-unstable-testcases-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc8fd081680454b6b29cac8feb6774fd60b37eb5 Mon Sep 17 00:00:00 2001 -From: eulerstorage -Date: Tue, 3 Mar 2020 17:24:08 +0800 -Subject: [PATCH] skip some unstable test cases - ---- - mysql-test/unstable-tests | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests -index 9ea0ebc..99a328b 100644 ---- a/mysql-test/unstable-tests -+++ b/mysql-test/unstable-tests -@@ -41,6 +41,7 @@ binlog.binlog_flush_binlogs_delete_domain : MDEV-14431 - binlog.binlog_killed : MDEV-12925 - Wrong result - binlog.binlog_tmp_table_row : Added in 10.1.35, 10.2.17 - binlog.binlog_xa_recover : MDEV-8517 - Extra checkpoint -+binlog.binlog_mysqlbinlog2 : Skip on ARM - binlog.load_data_stm_view : MDEV-16948 - Wrong result - binlog_tmp_table_row : Added in 10.3.9 - -@@ -346,11 +347,13 @@ main.events_2 : MDEV-13277 - main.events_bugs : MDEV-12892 - Crash - main.events_restart : MDEV-12236 - Server shutdown problem - main.events_slowlog : MDEV-12821 - Wrong result -+main.events_1 : Skip on ARM - main.explain_slowquerylog : Modified in 10.2.16 - main.func_json : Modified in 10.3.9 - main.func_misc : Modified in 10.3.8 - main.func_time_hires : Modified in 10.3.8 - main.func_time : Modified in 10.3.9 -+main.func_like : Skip on ARM - main.gis : MDEV-13411 - wrong result on P8 - main.grant2 : Modified in 10.3.8 - main.grant : Modified in 10.3.9 --- -1.8.3.1 - diff --git a/disable-some-unstable-testcases.patch b/disable-some-unstable-testcases.patch deleted file mode 100644 index fae887c4c4f6306c0c9f50998780d0f4d91a36af..0000000000000000000000000000000000000000 --- a/disable-some-unstable-testcases.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ea4fbf5f164c60f736a5e987478dd1a4fc976371 Mon Sep 17 00:00:00 2001 -From: eulerstorage -Date: Mon, 13 Jan 2020 17:35:50 +0800 -Subject: [PATCH] Disable some unstable testcase - -Some testcases are unstable, they will fail if the test environment -is not suitable, for example network is broken. ---- - mysql-test/unstable-tests | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests -index 2c28c9a..9ea0ebc 100644 ---- a/mysql-test/unstable-tests -+++ b/mysql-test/unstable-tests -@@ -262,6 +262,7 @@ innodb.truncate_purge_debug : Include fil - innodb.update_time : MDEV-14804 - Wrong result - innodb.undo_log : Include file modified in 10.2.17, 10.3.9 - innodb.xa_recovery : MDEV-15279 - mysqld got exception -+innodb.innodb_defrag_binlog : - - #----------------------------------------------------------------------- - -@@ -389,6 +390,8 @@ main.mysql_upgrade_noengine : MDEV-14355 - main.mysql_upgrade_ssl : MDEV-13492 - Unknown SSL error - main.olap : Modified in 10.3.8 - main.openssl_1 : MDEV-13492 - Unknown SSL error -+main.openssl_6975 : -+main.ssl_cipher : - main.order_by_optimizer_innodb : MDEV-10683 - Wrong result - main.partition_debug_sync : MDEV-15669 - Deadlock found when trying to get lock - main.partition_innodb_plugin : MDEV-12901 - Valgrind warnings -@@ -418,6 +421,11 @@ main.ssl_ca : MDEV-10895 - main.ssl_cert_verify : MDEV-13735 - Server crash - main.ssl_connect : MDEV-13492 - Unknown SSL error - main.ssl_timeout : MDEV-11244 - Crash -+main.ssl_7937 : -+main.ssl_crl_clients : -+main.ssl_8k_key : -+main.ssl : -+main.ssl_cipher : - main.statistics_close : Added in 10.3.8 - main.statistics : Modified in 10.3.8 - main.stat_tables : Modified in 10.1.35, 10.2.17, 10.3.9 -@@ -523,6 +531,7 @@ parts.partition_exch_qa_10 : MDEV-11765 - parts.partition_innodb_status_file : MDEV-12901 - Valgrind - parts.partition_special_innodb : MDEV-16942 - Timeout - parts.truncate_locked : Added in 10.1.35, 10.2.17, 10.3.9 -+parts.partition_alter4_innodb : - - #----------------------------------------------------------------------- - -@@ -549,6 +558,9 @@ perfschema.stage_mdl_global : MDEV-11803 - perfschema.stage_mdl_procedure : MDEV-11545 - Missing row - perfschema.stage_mdl_table : MDEV-12638 - Wrong result - perfschema.threads_mysql : MDEV-10677 - Wrong result -+perfschema.nesting : -+perfschema.socket_summary_by_instance_func : -+perfschema.cnf_option : - - #----------------------------------------------------------------------- - -@@ -716,6 +728,7 @@ rpl.rpl_temporary_error2 : MDEV-10634 - rpl.sec_behind_master-5114 : MDEV-13878 - Wrong result - - rpl/extra/rpl_tests.* : MDEV-10994 - Not maintained -+rpl.rpl_connection : - - #----------------------------------------------------------------------- - -@@ -769,6 +782,7 @@ sys_vars.slow_query_log_func : MDEV-14273 - sys_vars.sysvars_innodb : Modified in 10.3.8 - sys_vars.thread_cache_size_func : MDEV-11775 - Wrong result - sys_vars.wait_timeout_func : MDEV-12896 - Wrong result -+sys_vars.slave_parallel_threads_basic : - - #----------------------------------------------------------------------- - --- -1.8.3.1 - diff --git a/mariadb-10.3.9.tar.gz b/mariadb-10.3.34.tar.gz similarity index 82% rename from mariadb-10.3.9.tar.gz rename to mariadb-10.3.34.tar.gz index d12c13bcc252ffdf442ebf0c2ec5dcdfed803559..69ca485a9840fcea3975cec28bb151acb09eec3f 100644 Binary files a/mariadb-10.3.9.tar.gz and b/mariadb-10.3.34.tar.gz differ diff --git a/mariadb.spec b/mariadb.spec index 6a3f95f890a2619d59600415169654dea4eb4622..02d4822adbea0abb41ba02d7b78964a7008dc275 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,18 +1,18 @@ %global runtest 0 Name: mariadb -Version: 10.3.9 -Release: 10 +Version: 10.3.34 +Release: 1 Epoch: 3 Summary: One of the most popular database servers License: GPLv2 with exceptions and LGPLv2 and BSD URL: http://mariadb.org -Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz +Source0: https://downloads.mariadb.com/MariaDB/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Patch0001: disable-some-unstable-testcases.patch -Patch0002: add-install-db-command.patch -Patch0003: disable-some-unstable-testcases-2.patch +Patch0001: 0001-disable-some-unstable-testcases.patch +Patch0002: 0002-add-install-db-command.patch +Patch0003: 0003-disable-some-unstable-testcases-2.patch BuildRequires: selinux-policy-devel, cmake, gcc-c++ BuildRequires: systemd, systemd-devel @@ -288,7 +288,6 @@ cmake -L ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz mkdir -p %{buildroot}/%{_libdir}/pkgconfig -mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/%{name}/ install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/%{name}/ @@ -302,11 +301,9 @@ mkdir -p %{buildroot}%{_rundir}/%{name} install -p -m 0755 -d %{buildroot}%{_localstatedir}/lib/mysql mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{name}-server.cnf -mv %{buildroot}%{_sysusersdir}/sysusers.conf %{buildroot}%{_sysusersdir}/%{name}.conf rm %{buildroot}%{_sysconfdir}/init.d/mysql rm %{buildroot}%{_libexecdir}/rcmysql -rm %{buildroot}%{_tmpfilesdir}/tmpfiles.conf echo "d %{_rundir}/%{name} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} @@ -352,10 +349,11 @@ rm %{buildroot}%{_includedir}/mysql/{mysql_version.h,errmsg.h,ma_list.h,ma_pvio. mariadb_ctype.h,mariadb_dyncol.h,mariadb_stmt.h,mariadb_version.h,ma_tls.h,mysqld_error.h,mysql.h} rm -r %{buildroot}%{_includedir}/mysql/{mariadb,mysql} - -rm %{buildroot}%{_mandir}/man1/tokuft* rm -r %{buildroot}%{_datadir}/sql-bench +mkdir -p %{buildroot}/%{_libdir}/security/ +mv %{buildroot}/lib64/security/pam_user_map.so %{buildroot}/%{_libdir}/security/pam_user_map.so + %check @@ -496,6 +494,9 @@ fi %{_libdir}/%{name}/INFO_* %exclude %{_libdir}/%{name}/plugin/ha_oqgraph.so +%{_libdir}/security/pam_user_map.so +%{_sysconfdir}/security/user_map.conf + %{_mandir}/man1/aria* %{_mandir}/man1/galera* %{_mandir}/man1/mariadb-service-convert.1* @@ -519,6 +520,10 @@ fi %{_mandir}/man1/replace.1* %{_mandir}/man1/resolve* %{_mandir}/man1/wsrep_*.1* +%{_mandir}/man1/mariabackup.1.gz +%{_mandir}/man1/mbstream* +%{_mandir}/man1/mysql_embedded* +%{_mandir}/man1/mysql_ldb* %{_mandir}/man8/mysqld.8* %{_datadir}/%{name}/*.sql @@ -555,6 +560,7 @@ fi %{_includedir}/* %{_datadir}/aclocal/mysql.m4 %{_libdir}/pkgconfig/mariadb.pc +%{_libdir}/pkgconfig/libmariadb.pc %files oqgraph-engine @@ -599,12 +605,41 @@ fi %changelog -* Tue Jul 27 2021 bzhaoop -3:10.3.9-10 +* Wed Fed 23 2022 bzhaoop - 3:10.3.34-1 +- Bump version to latest 10.3.34 version +- For resolving the CVEs, which includes: +- CVE-2021-46659 +- CVE-2021-46664 +- CVE-2021-46665 +- CVE-2021-46663 +- CVE-2021-46662 +- CVE-2021-46666 +- CVE-2021-46667 +- CVE-2021-46661 +- CVE-2021-46669 +- CVE-2021-46657 +- Above all CVEs needs to bump to the latest version for resolve. +- Refresh all patches relies on the latest tar package. + +* Tue Jul 27 2021 bzhaoop -3:10.3.9-13 - Increase the build speed -* Thu Aug 18 2020 xinghe - 3:10.3.9-9 +* Mon Apr 26 2021 bzhaoop -3:10.3.9-12 +- Fix CVE-2021-27928 +- Fix CVE-2020-15180 + +* Tue Sep 8 2020 lihaotian -3:10.3.9-11 +- Update the source0 url + +* Fri Jul 10 2020 volcanodragon -3:10.3.9-10.1 +- Rename patch names + +* Thu Aug 18 2020 xinghe - 3:10.3.9-9.2 - Add release version for update +* Fri Jul 3 2020 jinzhimin -3:10.3.9-9.1 +- Add conflict between mysql + * Mon Mar 2 2020 steven - 3:10.3.9-8 - Add requires exclude for perls and skip some test cases diff --git a/mariadb.yaml b/mariadb.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e3c00551137f021a369423bcb74ff44bbf978a16 --- /dev/null +++ b/mariadb.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: MariaDB/server +tag_prefix: "mariadb-" +seperator: "."