mysql73-cluster: fix build with newer openssl.

TritonDataCenter · Mar 26, 2015 · 6080ca8 · 6080ca8
1 parent c3a7d14
commit 6080ca8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/mysql73-cluster/distinfo b/mysql73-cluster/distinfo
@@ -6,6 +6,7 @@ Size (mysql-cluster-gpl-7.3.6.tar.gz) = 42119293 bytes
 SHA1 (patch-CMakeLists.txt) = fabc427d8e7974cb8af1ce057f994b1436628443
 SHA1 (patch-cmake_dtrace.cmake) = 3df1213e41eabf8006390b3e27250063efb2879d
 SHA1 (patch-cmake_plugin.cmake) = 1be952a33471d79660521ecc52477d051fa1a586
+SHA1 (patch-cmake_ssl.cmake) = 6c41cd60e851006d7fb8f8664c28a5f11b96a52e
 SHA1 (patch-mysys__ssl_CMakeLists.txt) = f88dc14c3f69042c6eeeadc7d6135db98296d768
 SHA1 (patch-scripts_mysql__install__db.pl.in) = 7a45264301177b83cede2457f67e8078dc36a6ce
 SHA1 (patch-storage_archive_CMakeLists.txt) = 7cabac32bd500e23a7c2ecaaff2d9fe86b1e8c80

diff --git a/mysql73-cluster/patches/patch-cmake_ssl.cmake b/mysql73-cluster/patches/patch-cmake_ssl.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- cmake/ssl.cmake.orig	2014-07-02 09:22:14.000000000 +0000
++++ cmake/ssl.cmake
+@@ -166,7 +166,7 @@ MACRO (MYSQL_CHECK_SSL)
+     # 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 "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+     )
+     STRING(REGEX REPLACE
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"