databases/mysql-connector-c: UNBREAK

- Update version 6.1.5=>6.1.6
- Fix patch files to reflect 'make makepatch'
- Take MAINTAINERSHIP

4 files changed, 33 insertions, 6 deletions

diff --git a/databases/mysql-connector-c/files/patch-CMakeLists.txt b/databases/mysql-connector-c/files/patch-CMakeLists.txt
index 3085b8c10489..30ad71fa38de 100644
--- a/databases/mysql-connector-c/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-c/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-01-31 15:10:13.000000000 +0100
-+++ CMakeLists.txt	2014-01-31 15:10:39.000000000 +0100
-@@ -535,7 +535,7 @@
+--- CMakeLists.txt.orig	2015-02-25 21:09:49 UTC
++++ CMakeLists.txt
+@@ -541,7 +541,7 @@ ADD_SUBDIRECTORY(packaging/WiX)
  #
  # RPM installs documentation directly from the source tree
  #
diff --git a/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake b/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake
index 10d60d0cf938..890cb1100937 100644
--- a/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake
+++ b/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake
@@ -1,6 +1,6 @@
---- cmake/install_layout.cmake.orig	2013-12-23 20:24:06.000000000 +0100
-+++ cmake/install_layout.cmake	2014-01-31 15:09:54.000000000 +0100
-@@ -112,14 +112,14 @@
+--- cmake/install_layout.cmake.orig	2015-02-25 21:09:49 UTC
++++ cmake/install_layout.cmake
+@@ -112,14 +112,14 @@ FILE(GLOB plugin_tests
  #
  # STANDALONE layout
  #
diff --git a/databases/mysql-connector-c/files/patch-cmake_ssl.cmake b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake
new file mode 100644
index 000000000000..c240d3089cda
--- /dev/null
+++ b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake
@@ -0,0 +1,14 @@
+--- cmake/ssl.cmake.orig	2015-02-25 21:09:49 UTC
++++ cmake/ssl.cmake
+@@ -164,9 +164,9 @@ MACRO (MYSQL_CHECK_SSL)
+     # Verify version number. Version information looks like:
+     #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
+     # Encoded as MNNFFPPS: major minor fix patch status
+-    FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
++    FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/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"
diff --git a/databases/mysql-connector-c/files/patch-vio_viossl.c b/databases/mysql-connector-c/files/patch-vio_viossl.c
new file mode 100644
index 000000000000..3fd5e7740a69
--- /dev/null
+++ b/databases/mysql-connector-c/files/patch-vio_viossl.c
@@ -0,0 +1,13 @@
+--- vio/viossl.c.orig	2015-06-20 10:21:51 UTC
++++ vio/viossl.c
+@@ -392,8 +392,10 @@ static int ssl_do(struct st_VioSSLFd *pt
+   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
+   SSL_set_fd(ssl, sd);
+ #ifndef HAVE_YASSL
++#ifdef SSL_OP_NO_COMPRESSION
+   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
+ #endif
++#endif
+ 
+   /*
+     Since yaSSL does not support non-blocking send operations, use