diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-db/mysql-connector-c/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-db/mysql-connector-c/files')
| -rw-r--r-- | dev-db/mysql-connector-c/files/conn-c-includes.patch | 15 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c/files/mysql_com.patch | 31 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c/files/openssl-cmake-detection.patch | 12 |
3 files changed, 58 insertions, 0 deletions
diff --git a/dev-db/mysql-connector-c/files/conn-c-includes.patch b/dev-db/mysql-connector-c/files/conn-c-includes.patch new file mode 100644 index 000000000000..fcde71f3f4ee --- /dev/null +++ b/dev-db/mysql-connector-c/files/conn-c-includes.patch @@ -0,0 +1,15 @@ +diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt +--- a/include/CMakeLists.txt 2015-07-14 13:06:04.424091000 -0400 ++++ b/include/CMakeLists.txt 2015-07-14 13:24:43.434091000 -0400 +@@ -55,6 +55,11 @@ + byte_order_generic_x86.h + little_endian.h + big_endian.h ++ my_thread_local.h ++ thr_cond.h ++ thr_lock.h ++ thr_mutex.h ++ thr_rwlock.h + ${HEADERS_GEN_CONFIGURE} + ) + diff --git a/dev-db/mysql-connector-c/files/mysql_com.patch b/dev-db/mysql-connector-c/files/mysql_com.patch new file mode 100644 index 000000000000..36a7d5a23791 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql_com.patch @@ -0,0 +1,31 @@ +--- a/include/mysql_com.h 2014-06-10 23:10:43.000000000 -0400 ++++ b/include/mysql_com.h 2015-08-11 15:20:54.487091000 -0400 +@@ -179,7 +171,7 @@ + #define CLIENT_IGNORE_SIGPIPE 4096 /* IGNORE sigpipes */ + #define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */ + #define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */ +-#define CLIENT_RESERVED2 32768 /* Old flag for 4.1 authentication */ ++#define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ + #define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */ + #define CLIENT_MULTI_RESULTS (1UL << 17) /* Enable/disable multi-results */ + #define CLIENT_PS_MULTI_RESULTS (1UL << 18) /* Multi-results in PS-protocol */ +@@ -226,7 +216,7 @@ + | CLIENT_IGNORE_SIGPIPE \ + | CLIENT_TRANSACTIONS \ + | CLIENT_RESERVED \ +- | CLIENT_RESERVED2 \ ++ | CLIENT_SECURE_CONNECTION \ + | CLIENT_MULTI_STATEMENTS \ + | CLIENT_MULTI_RESULTS \ + | CLIENT_PS_MULTI_RESULTS \ +--- a/libmysql/client_settings.h 2015-02-25 16:09:49.000000000 -0500 ++++ b/libmysql/client_settings.h 2015-08-11 15:44:10.804091000 -0400 +@@ -31,7 +31,7 @@ + CLIENT_LONG_FLAG | \ + CLIENT_TRANSACTIONS | \ + CLIENT_PROTOCOL_41 | \ +- CLIENT_RESERVED2 | \ ++ CLIENT_SECURE_CONNECTION | \ + CLIENT_MULTI_RESULTS | \ + CLIENT_PS_MULTI_RESULTS | \ + CLIENT_PLUGIN_AUTH | \ diff --git a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch new file mode 100644 index 000000000000..3a5f53e7ba35 --- /dev/null +++ b/dev-db/mysql-connector-c/files/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" |