From 0fd3f8559d89d4727096c91455282a2a1dc1f995 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Feb 10 2015 13:57:43 +0000 Subject: Fix openssl test --- diff --git a/mariadb-ssltest.patch b/mariadb-ssltest.patch index 7529d7f..c39b752 100644 --- a/mariadb-ssltest.patch +++ b/mariadb-ssltest.patch @@ -4,9 +4,9 @@ which now makes mariadb/mysql FTBFS because openssl_1 test fails Related: #1044565 -diff -up mariadb-10.0.15/mysql-test/r/openssl_1.result.orig mariadb-10.0.15/mysql-test/r/openssl_1.result ---- mariadb-10.0.15/mysql-test/r/openssl_1.result.orig 2014-11-27 15:25:32.582771542 +0100 -+++ mariadb-10.0.15/mysql-test/r/openssl_1.result 2014-11-27 15:22:46.353474672 +0100 +diff -up mariadb-10.0.16/mysql-test/r/openssl_1.result.testssl mariadb-10.0.16/mysql-test/r/openssl_1.result +--- mariadb-10.0.16/mysql-test/r/openssl_1.result.testssl 2015-01-25 16:21:38.000000000 +0100 ++++ mariadb-10.0.16/mysql-test/r/openssl_1.result 2015-02-10 12:15:06.178207088 +0100 @@ -198,8 +198,6 @@ Ssl_cipher DHE-RSA-AES256-SHA Variable_name Value Ssl_cipher EDH-RSA-DES-CBC3-SHA @@ -16,9 +16,18 @@ diff -up mariadb-10.0.15/mysql-test/r/openssl_1.result.orig mariadb-10.0.15/mysq Ssl_cipher RC4-SHA select 'is still running; no cipher request crashed the server' as result from dual; result -diff -up mariadb-10.0.15/mysql-test/t/openssl_1.test.orig mariadb-10.0.15/mysql-test/t/openssl_1.test ---- mariadb-10.0.15/mysql-test/t/openssl_1.test.orig 2014-11-27 15:25:16.637743066 +0100 -+++ mariadb-10.0.15/mysql-test/t/openssl_1.test 2014-11-27 15:22:46.354474674 +0100 +diff -up mariadb-10.0.16/mysql-test/t/openssl_1.test.testssl mariadb-10.0.16/mysql-test/t/openssl_1.test +--- mariadb-10.0.16/mysql-test/t/openssl_1.test.testssl 2015-01-25 16:21:38.000000000 +0100 ++++ mariadb-10.0.16/mysql-test/t/openssl_1.test 2015-02-10 12:16:49.769911038 +0100 +@@ -132,7 +132,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 ++--replace_result AES128-GCM-SHA256 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 + @@ -222,7 +222,7 @@ DROP TABLE t1; # Common ciphers to openssl and yassl --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA @@ -28,3 +37,12 @@ diff -up mariadb-10.0.15/mysql-test/t/openssl_1.test.orig mariadb-10.0.15/mysql- --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA --disable_query_log --disable_result_log +@@ -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 ++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA + SHOW STATUS LIKE 'Ssl_cipher'; + disconnect con1; + connection default; diff --git a/mariadb.spec b/mariadb.spec index fb7042b..7bb1823 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -108,7 +108,7 @@ Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 2%{?with_debug:.debug}%{?dist} +Release: 3%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -1126,6 +1126,9 @@ fi %endif %changelog +* Tue Feb 10 2015 Honza Horak - 1:10.0.16-3 +- Fix openssl_1 test + * Wed Feb 4 2015 Jakub Dorňák - 1:10.0.16-2 - Include new certificate for tests - Update lists of failing tests diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 6d34d66..c3fc748 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -6,7 +6,6 @@ funcs_1.myisam_func_view : rhbz#1096787 main.bigint : rhbz#1096787 main.dyncol : rhbz#1096787 main.func_str : rhbz#1096787 -main.openssl_1 : rhbz#1096787 main.ssl : rhbz#1096787 main.ssl_compress : rhbz#1096787 main.ssl_crl_clients : rhbz#1096787