2015-08-11 20:05:43 UTC

This commit is contained in:
Repository QA checks
2015-08-11 16:05:44 -04:00
parent a82d000336
commit 39bb09c4cc
3 changed files with 46 additions and 1 deletions
@@ -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 | \
@@ -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
}
@@ -0,0 +1,13 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
DESCRIPTION=C client library for MariaDB/MySQL
EAPI=5
HOMEPAGE=https://dev.mysql.com/downloads/connector/c/
IUSE=+ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)]
SLOT=0/18
SRC_URI=mirror://mysql/Downloads/Connector-C/mysql-connector-c-6.1.6-src.tar.gz
_eclasses_=cmake-multilib e82cd2608890af2e6a4965cc715b0135 cmake-utils f474224ef49d530640a43a04ae94928e eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 02090c5a622458303e6bf68837ac6b96 multibuild 4550e10791f720f7af3fdd911aedf518 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
_md5_=c2170b4600196e247471c38b9b96c4fa