From 965e4581ba120efdfe2bfcb9846b1e9c89bd2424 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Fri, 8 May 2015 07:47:03 +0200
Subject: [PATCH] Fix openssl test to match openssl default ciphers

Conflicts:
	mariadb.spec
---
 mariadb-ssltest.patch | 36 ++++++++++++++++++++++++++++++++++++
 mariadb.spec          |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 mariadb-ssltest.patch

diff --git a/mariadb-ssltest.patch b/mariadb-ssltest.patch
new file mode 100644
index 0000000..8405ba5
--- /dev/null
+++ b/mariadb-ssltest.patch
@@ -0,0 +1,36 @@
+DHE-RSA-AES256-GCM-SHA384 is not what we get in Fedora openssl, so we need
+to replace a different cipher.
+
+diff -up mariadb-10.0.18/mysql-test/t/openssl_1.test.ssltest mariadb-10.0.18/mysql-test/t/openssl_1.test
+--- mariadb-10.0.18/mysql-test/t/openssl_1.test.ssltest	2015-05-08 07:26:43.836965643 +0200
++++ mariadb-10.0.18/mysql-test/t/openssl_1.test	2015-05-08 07:28:16.144215861 +0200
+@@ -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
+ 
+@@ -257,7 +257,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 -up mariadb-10.0.18/mysql-test/t/ssl_timeout.test.ssltest mariadb-10.0.18/mysql-test/t/ssl_timeout.test
+--- mariadb-10.0.18/mysql-test/t/ssl_timeout.test.ssltest	2015-05-08 07:22:24.504341009 +0200
++++ mariadb-10.0.18/mysql-test/t/ssl_timeout.test	2015-05-08 07:26:04.192885581 +0200
+@@ -7,7 +7,7 @@
+ connect (ssl_con,localhost,root,,,,,SSL read_timeout=5);
+ 
+ --echo # Check ssl turned on
+---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';
+ 
+ # --error CR_SERVER_LOST
diff --git a/mariadb.spec b/mariadb.spec
index f1a0732..0974996 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -166,6 +166,7 @@ Patch31:          %{pkgnamepatch}-string-overflow.patch
 Patch32:          %{pkgnamepatch}-basedir.patch
 Patch33:          %{pkgnamepatch}-covscan-signexpr.patch
 Patch34:          %{pkgnamepatch}-covscan-stroverflow.patch
+Patch36:          %{pkgnamepatch}-ssltest.patch
 Patch37:          %{pkgnamepatch}-notestdb.patch
 
 BuildRequires:    cmake
@@ -503,6 +504,7 @@ MariaDB is a community developed branch of MySQL.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch36 -p1
 %patch37 -p1
 
 # removing bundled cmd-line-utils is now disabled