commit: 2eaaa54428187bab4c9cc39ea9a9d09df73b9d62
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 27 13:50:49 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 13:50:49 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=2eaaa544
Add patch to Fix detection of >=openssl-1.0.2 wrt bug 537872
---
00000_index.txt | 9 +++++++++
20017_all_mysql-openssl-cmake-detection.patch | 12 ++++++++++++
2 files changed, 21 insertions(+)
diff --git a/00000_index.txt b/00000_index.txt
index 49b7d42..58e74cd 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -1824,3 +1824,12 @@
@pn mariadb-galera
@@ Fix build on sparc and other arches with no atomics
@@ Also fix critical replication bug discovered shortly after release MDEV-7237
+
+@patch 20017_all_mysql-openssl-cmake-detection.patch
+@ver 5.06.00.00 to 5.07.99.99
+@pn mysql
+@pn percona-server
+@@ Fix detection of OpenSSL 1.0.2
+@@ Bug 537872
+@@ Upstream bug 75622
+
diff --git a/20017_all_mysql-openssl-cmake-detection.patch
b/20017_all_mysql-openssl-cmake-detection.patch
new file mode 100644
index 0000000..3a5f53e
--- /dev/null
+++ b/20017_all_mysql-openssl-cmake-detection.patch
@@ -0,0 +1,12 @@
+diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake
+--- a/cmake/ssl.cmake 2014-11-21 00:39:51.000000000 -0500
++++ b/cmake/ssl.cmake 2015-01-27 08:45:36.771744344 -0500
+@@ -166,7 +166,7 @@
+ # Encoded as MNNFFPPS: major minor fix patch status
+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+ OPENSSL_VERSION_NUMBER
+- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+ )
+ STRING(REGEX REPLACE
+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
