From 72a82b67aec312ecd63c515c592e9f018a4d548c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Dor=C5=88=C3=A1k?= Date: Sat, 2 Jul 2016 08:52:36 +0200 Subject: [PATCH] Update to 10.1.15 --- mariadb-test-openssl_1.patch | 20 ++++++++++++++++++++ mariadb.spec | 14 ++++++++++---- rh-skipped-tests-arm.list | 12 ++++-------- rh-skipped-tests-base.list | 13 +++++++------ sources | 2 +- 5 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 mariadb-test-openssl_1.patch diff --git a/mariadb-test-openssl_1.patch b/mariadb-test-openssl_1.patch new file mode 100644 index 0000000..9e63524 --- /dev/null +++ b/mariadb-test-openssl_1.patch @@ -0,0 +1,20 @@ +--- mariadb-10.1.15/mysql-test/t/openssl_1.test.orig 2016-06-29 22:56:09.000000000 +0200 ++++ mariadb-10.1.15/mysql-test/t/openssl_1.test 2016-07-04 10:47:13.366522457 +0200 +@@ -134,7 +134,7 @@ drop table t1; + # verification of servers certificate by setting both ca certificate + # and ca path to NULL + # +---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA ++--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA AES256-GCM-SHA384 DHE-RSA-AES256-SHA + --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1 + --echo End of 5.0 tests + +@@ -259,7 +259,7 @@ select 'is still running; no cipher requ + GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509; + FLUSH PRIVILEGES; + connect(con1,localhost,bug42158,,,,,SSL); +---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA ++--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA AES256-GCM-SHA384 DHE-RSA-AES256-SHA + SHOW STATUS LIKE 'Ssl_cipher'; + disconnect con1; + connection default; diff --git a/mariadb.spec b/mariadb.spec index 69df542..8f55dc2 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -8,7 +8,7 @@ %{!?runselftest:%global runselftest 1} # Set this to 1 to see which tests fail -%global check_testsuite 1 +%global check_testsuite 0 # In f20+ use unversioned docdirs, otherwise the old versioned one %global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}} @@ -119,11 +119,11 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.1 -%global bugfixver 14 +%global bugfixver 15 Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 2%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -163,6 +163,7 @@ Source72: mariadb-server-galera.te # Patches common for more mysql-like packages Patch1: %{pkgnamepatch}-strmov.patch Patch2: %{pkgnamepatch}-install-test.patch +Patch3: %{pkgnamepatch}-test-openssl_1.patch Patch4: %{pkgnamepatch}-logrotate.patch Patch5: %{pkgnamepatch}-file-contents.patch Patch7: %{pkgnamepatch}-scripts.patch @@ -547,6 +548,7 @@ MariaDB is a community developed branch of MySQL. %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch7 -p1 @@ -1097,8 +1099,9 @@ fi %files server-galera %doc Docs/README.wsrep %license LICENSE.clustercheck -%{_bindir}/galera_new_cluster %{_bindir}/clustercheck +%{_bindir}/galera_new_cluster +%{_bindir}/galera_recovery %{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf %config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf %attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck @@ -1284,6 +1287,9 @@ fi %endif %changelog +* Fri Jul 1 2016 Jakub Dorňák - 1:10.1.15-1 +- Update to 10.1.15 + * Thu May 26 2016 Jakub Dorňák - 1:10.1.14-2 - Fix mysql-prepare-db-dir Resolves: #1335849 diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list index 9b92367..c2fbe9d 100644 --- a/rh-skipped-tests-arm.list +++ b/rh-skipped-tests-arm.list @@ -1,12 +1,8 @@ - -connect.bin : rhbz#1096787 (pass on aarch64) -connect.endian : rhbz#1096787 - -main.partition_exchange : rhbz#1096787 -main.analyze_stmt_orderby : rhbz#1096787 -main.explain_json_innodb : rhbz#1096787 -main.explain_json_format_partitions : rhbz#1096787 main.analyze_format_json : rhbz#1096787 +main.analyze_stmt_orderby : rhbz#1096787 main.explain_json : rhbz#1096787 +main.explain_json_format_partitions : rhbz#1096787 +main.explain_json_innodb : rhbz#1096787 +main.partition_exchange : rhbz#1096787 main.subselect_cache : rhbz#1096787 main.type_year : rhbz#1096787 diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index fb33990..cb0ecbc 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -1,14 +1,15 @@ # These tests fail with MariaDB 10: - -main.userstat : rhbz#1096787 +main.multi_update : rhbz#1096787 main.set_statement_notembedded_binlog : rhbz#1096787 -main.ssl_7937 : rhbz#1096787 -main.ssl_crl_clients : rhbz#1096787 -main.openssl_1 : rhbz#1096787 main.ssl : rhbz#1096787 -main.ssl_8k_key : rhbz#1096787 +main.ssl_ca : rhbz#1096787 +main.ssl_cert_verify : rhbz#1096787 main.ssl_compress : rhbz#1096787 +main.ssl_crl_clients : rhbz#1096787 main.ssl_timeout : rhbz#1096787 +main.ssl_7937 : rhbz#1096787 +main.ssl_8k_key : rhbz#1096787 +main.userstat : rhbz#1096787 perfschema.nesting : rhbz#1096787 perfschema.socket_summary_by_event_name_func : rhbz#1096787 perfschema.socket_summary_by_instance_func : rhbz#1096787 diff --git a/sources b/sources index 7a029da..55c84ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -294925531e0fd2f0461e3894496a5adc mariadb-10.1.14.tar.gz +21bd68cbc08b4195fbfcf29d1c385fe8 mariadb-10.1.15.tar.gz