[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Brian Evans]

commit: cedf64ba91607985f9e5dd2faf314afbe20b6f67
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Sep 16 20:55:34 2015 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Sep 16 20:55:34 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cedf64ba

mysql-connector-c: Revbump with preinst message

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql-connector-c/files/mysql_com.patch | 31 +
 .../mysql-connector-c-6.1.6-r2.ebuild  | 80 ++
 eclass/mysql-multilib.eclass   | 10 +++
 3 files changed, 121 insertions(+)

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 000..36a7d5a
--- /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.0 -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_RESERVED232768   /* 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.0 -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-r2.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
new file mode 100644
index 000..f77fcf5
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="2.8.12"
+
+inherit cmake-multilib eutils multilib
+
+MULTILIB_WRAPPED_HEADERS+=(
+   /usr/include/mysql/my_config.h
+)
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/c/;
+LICENSE="GPL-2"
+
+SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+
+SUBSLOT="18"
+SLOT="0/${SUBSLOT}"
+IUSE="+ssl static-libs"
+
+CDEPEND="
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   "
+RDEPEND="${CDEPEND}
+   !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(+)]
+   "
+DEPEND="${CDEPEND}"
+
+DOCS=( README Docs/ChangeLog )
+
+src_prepare() {
+   epatch "${FILESDIR}/openssl-cmake-detection.patch" \
+   "${FILESDIR}/conn-c-includes.patch" \
+   "${FILESDIR}/mysql_com.patch"
+   epatch_user
+}
+
+multilib_src_configure() {
+   mycmakeargs+=(
+   -DINSTALL_LAYOUT=RPM
+   -DINSTALL_LIBDIR=$(get_libdir)
+   -DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+   -DWITH_DEFAULT_FEATURE_SET=OFF
+   -DENABLED_LOCAL_INFILE=ON
+   -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DWITH_ZLIB=system
+   -DENABLE_DTRACE=OFF
+   -DWITH_SSL=$(usex ssl system bundled)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${ED}" -name "*.a" -delete || die
+   fi
+}
+

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mysql/

[Brian Evans]

commit: c66425b1feb5c5cefdc30ffb515aeb3c28055139
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Jul 31 02:27:34 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Jul 31 02:27:34 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c66425b1

Version bump with eclass additions

 dev-db/mysql/Manifest  |  1 +
 ...sql-5.6.25-r1.ebuild = mysql-5.6.26-r1.ebuild} |  6 +++-
 ...{mysql-5.6.25-r1.ebuild = mysql-5.6.26.ebuild} | 21 ++
 eclass/mysql-multilib.eclass   | 32 --
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8f2737c..692f7a5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,6 +6,7 @@ DIST mysql-5.5.44.tar.gz 21789766 SHA256 
85f05b257db39e63c82ff4b5ce4e0c6d2b07560
 DIST mysql-5.5.45.tar.gz 21832364 SHA256 
744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 
1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8
 WHIRLPOOL 
3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
 DIST mysql-5.6.24.tar.gz 33178592 SHA256 
37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 
cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee7703c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7
 WHIRLPOOL 
26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
 DIST mysql-5.6.25.tar.gz 33203321 SHA256 
15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 
cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243
 WHIRLPOOL 
68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194
+DIST mysql-5.6.26.tar.gz 33278710 SHA256 
b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 
455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62
 WHIRLPOOL 
e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
 DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 
bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 
1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e
 WHIRLPOOL 
48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 
1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 
443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c
 WHIRLPOOL 
29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 
17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 
65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34
 WHIRLPOOL 
3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec

diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild 
b/dev-db/mysql/mysql-5.6.26-r1.ebuild
similarity index 94%
copy from dev-db/mysql/mysql-5.6.25-r1.ebuild
copy to dev-db/mysql/mysql-5.6.26-r1.ebuild
index b0ce8d0..a334c33 100644
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25-r1.ebuild,v 1.1 
2015/07/28 02:26:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.2 
2015/07/30 20:40:19 grknight Exp $
 
 EAPI=5
 
@@ -27,6 +27,10 @@ RDEPEND=${RDEPEND}
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+# disable until we see what happens with it
+MYSQL_CMAKE_NATIVE_DEFINES=-DWITHOUT_VALIDATE_PASSWORD=1
+
 # Official test instructions:
 # USE='server embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \

diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild 
b/dev-db/mysql/mysql-5.6.26.ebuild
similarity index 88%
rename from dev-db/mysql/mysql-5.6.25-r1.ebuild
rename to