Bug#20756770 MYSQL SERVER DOESN'T COMPILE AGAINST OPENSSL 1.0.1M

Tor Didriksen · bjornmu · commit 134c413d351d · 2015-03-30T14:04:16.000+02:00
The #define in openssl/opensslv.h contains an extra space in 1.0.1M
Fix the regexp that is used for parsing the version number.

(cherry picked from commit e5f6940dfc10580117249fefaee511e44df55326)
diff --git a/cmake/ssl.cmake b/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"

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ MACRO (MYSQL_CHECK_SSL)`
`166`	`166`	`# Encoded as MNNFFPPS: major minor fix patch status`
`167`	`167`	`FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"`
`168`	`168`	`OPENSSL_VERSION_NUMBER`
`169`		`- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"`
	`169`	`+ REGEX "^#[ ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]."`
`170`	`170`	`)`
`171`	`171`	`STRING(REGEX REPLACE`
`172`	`172`	`"^.OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).$" "\\1"`