summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-08-11 15:55:22 -0400
committerBrian Evans <grknight@gentoo.org>2015-08-11 15:55:22 -0400
commitd5582b7db025e9b136fa4a8f9f300cc08c0ef90b (patch)
tree335bd5016d7755e7be172b83f9b9f44bb2bb73fb /dev-db
parentapp-portage/cpuinfo2cpuflags: marked ~{86,64}-{macos,solaris}, bug #554828 (diff)
downloadgentoo-d5582b7db025e9b136fa4a8f9f300cc08c0ef90b.tar.gz
gentoo-d5582b7db025e9b136fa4a8f9f300cc08c0ef90b.tar.bz2
gentoo-d5582b7db025e9b136fa4a8f9f300cc08c0ef90b.zip
dev-db/mysql-connector-c Add API patch for CLIENT_SECURE_CONNECTION symbol
Restore CLIENT_SECURE_CONNECTION symbol which was changed to CLIENT_RESERVED2 Filed upstream bug https://bugs.mysql.com/bug.php?id=78028 Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql-connector-c/files/mysql_com.patch31
-rw-r--r--dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild (renamed from dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild)3
2 files changed, 33 insertions, 1 deletions
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 00000000000..36a7d5a2379
--- /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/mysql-connector-c-6.1.6.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
index 9c8061a8fc6..969af888120 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
@@ -43,7 +43,8 @@ DOCS=( README Docs/ChangeLog )
src_prepare() {
epatch "${FILESDIR}/openssl-cmake-detection.patch" \
- "${FILESDIR}/conn-c-includes.patch"
+ "${FILESDIR}/conn-c-includes.patch" \
+ "${FILESDIR}/mysql_com.patch"
epatch_user
}