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

["Brian Evans" <grknight@gentoo.org>]

commit:     899bac7f1cba22db87f7786f0b6409385af3e091
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 23:26:53 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun May 28 23:26:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=899bac7f

dev-db/mariadb: Version bump to 10.2.6 GA

Needs refinement and lots of testing

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mariadb/ChangeLog             |   6 +
 dev-db/mariadb/Manifest              |  27 ++--
 dev-db/mariadb/mariadb-10.2.6.ebuild | 242 +++++++++++++++++++++++++++++++++++
 3 files changed, 262 insertions(+), 13 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index d366a03..ffea8ea 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mariadb-10.2.6 (28 May 2017)
+
+  28 May 2017; Brian Evans <grknight@gentoo.org> +mariadb-10.2.6.ebuild:
+  dev-db/mariadb: Version bump to 10.2.6 GA  Needs refinement and lots of
+  testing
+
   02 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.2.ebuild,
   mariadb-10.2.4.ebuild, mariadb-10.2.5.ebuild:
   dev-db/mariadb: Remove failed MYSLOT experiment

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3c9b43a..293ae9c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,6 +9,7 @@ DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8
 DIST mariadb-10.2.2.tar.gz 62683612 SHA256 55cf9e357ae4511fc1330e7cb8a15746d99b3a7875b6da9bcf1acfb1aa6f893a SHA512 f1d0671e31db2f3aef86c26d9dd8765732e609e7d5ea9c1a452fb0f42cf449bfd17c80a4d11f8bf64074b6536070602e11cedb16b0f36acf1c9e889f0c106e4e WHIRLPOOL b9117275adff53c44fa81b255324d806c9f4dcbfd4f40c3b0cd2fd50d898207617e35543e3aab32104a5151ec290ed79ecd25793271b860f5bb05abd29064db7
 DIST mariadb-10.2.4.tar.gz 63235247 SHA256 b73e353c29a0171d1057f14191c83d1f17e6f58ca09a79dda4b12c0e12b7f975 SHA512 bb6b35b6abd834d4ce2e27f4e06abbf790769e3d56b89d25d06126c21abb1bcce3d8f19c49e2c2052bf89e5ebc3c67c5092dfb25577870f8f561ce87777367ae WHIRLPOOL e2ba3b38e80b47dcca02e741ecc91ec8a1f96d72836422fb890be6d4ffa9cfebcd85c09bf11b1a492ad1edd9923299ff516b0428564c33ac0482c0443229a5f9
 DIST mariadb-10.2.5.tar.gz 67183039 SHA256 6629bd2392ccba2fb30ce3a27efddba1f695ac739538007ad1d15caeed19ff50 SHA512 1a1911266110e86ef93aad73521d9ddde154357613a6ea7198cc1409aa4532998ddda69d64abcde2a6cf6b8c38c29bf730a6605253fb0f43d5bd4e1db48ed50e WHIRLPOOL d544341ade0705980fc72acdf97428100d5439ed6f2ca747d0fe291d85f597b7bd54e8c162a4771e042e3f31eb6c1ded473f31b5f233e84dec1095d16547ddb7
+DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
@@ -20,19 +21,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkH6BJfFIAAAAAALgAo
+iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrXLpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7bgORAA1EXfSPk8v+zk8aM4ARnDhhT499Y0TQTgmpDC5lvc09j8nZa1CQrYoNcc
-dBGB02LvlELfoCu9oGQHSc2wSyx3B66nfFLEhBFPtDu5ib2LnigubO46zcAB0CLB
-FUWZHEN7m3kkpBV1m6NIJoqx1QIc6H+62mRxO/ofMcP9McFFQ2bKi+XJps8857xJ
-WFFvaVi+OaFjyrvIbUJa638+OMfNVJKGvvEQRHNgimp8vrV7vdlGbBLSzsvbf6e9
-AqslDTXQ08+1KBIxHdz1aJaltwS66U+qQKoef77vhCWP6l9HP4KhcHB4AUtcBacp
-RbGe9X9E+49D3XpkB1j5vAqFDHCrlTt0C64DNJ5cw7fmXr+gtT/Qn2PPyMp1le9g
-9MZmtlfp/d4vrZ1t3qaqeAlY0yl1uLpVR97RjwCLxva9LFdMzK0M+houPVmaLZEL
-/AIWjUhPZa77DfYaLoRmUbLSaqAL24u8Myk6JIiGmcELuhC1glio2PKwsmFxk57/
-NerjvVzsZziVSFhVSIwA4JD0VBocJo+Dm2iQM3wqZ7DN1pVHm/qRsSquPnXKHvcw
-OQ+05ZvdI5g+3q/VS7tbr/mjM/9aADTadrQigyksiLVLfHm2QvrVVrlXNAqO9MGD
-uOjjfxmbrFHpk1VGa7t3Q4iQskPFbFnhDfXESNqskatC/lu7/zM=
-=zLXQ
+o7aHRw/3bnUIu2LKwPhI/RguY9izGM7lcaysGe/cMJfYNqSupJhBJTlfEmdQt6Ct
+9rRQbsaQQvFA+3RkdhUxqHojHLw4Zf9DYLNldhlvQbSWETTne8K1xwz1vHZ46B3q
+md1QObh/RWj70/0fwF+7rDMfAFdMJuV+4rHVV6hSgc56EDCjz4LNUpCQ/vSByYcc
+gjfOiwZFDfElNpaFXXZwv/XX9ioti/dcan8m4XjolrFWTFE0lRRVNviXgBzJODPO
+QyvPsrrtN9Zcx58kpW9rGlSTxr+LLRCKWxwicw53bdiwGxe1ibt03mEqOgGIIDuO
+TQvYNg2bHMknqIjYag6NEHMqszm0ThEYJNV/aKj/fRzrap3BDZ76CkiVWL2REmcx
+MYb7ItNnyfR8yLiHXfayUTZ8R6kWGbkcJVBDC+nwyNDO9RromrKWl5fKQRX53KAY
+9QDRdJ10epfNzUajdQ+EkX9yFr6IQEqYNsxIfSCzxUqDa38UarNgWGMSLt2DVKb0
+HZMr5CyRRTdmwLhy/SJdlwhgvuErsABWaVBA37wXLFewbCHp2fShcz573vlmjlKw
+HEuDJIynxgUxyPpjA3eB4fFP7HpB+lREqCSe3+JJPyIZJ3glUHVWO4EYTe9lDHhF
+VxAGnPSL/fYxZDE4NrUgrwkpLRP1gWIeqvZJVWL9bxM0/AGA8Q==
+=zvn5
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
new file mode 100644
index 0000000..d19c155
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20160131-0252Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="19"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+#	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+#	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+#	"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
+PATCHES=(
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+)
+
+COMMON_DEPEND="
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	server? ( galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-${WSREP_REVISION}*
+		sst-rsync? ( sys-process/lsof )
+		sst-xtrabackup? ( net-misc/socat[ssl] )
+	) )
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mariadb/mariadb_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	local MYSQL_CMAKE_EXTRA_DEFINES=(
+			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
+			-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+			-DCONC_WITH_EXTERNAL_ZLIB=YES
+			-DWITH_EXTERNAL_ZLIB=YES
+			-DSUFFIX_INSTALL_DIR=""
+			-DINSTALL_INCLUDEDIR=include/mariadb
+			-DINSTALL_INFODIR=share/info
+			-DINSTALL_LIBDIR=$(get_libdir)
+			-DINSTALL_ELIBDIR=$(get_libdir)/mariadb
+			-DINSTALL_MANDIR=share/man
+			-DINSTALL_MYSQLSHAREDIR=share/mariadb
+			-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+			-DINSTALL_SCRIPTDIR=share/mariadb/scripts
+			-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+	)
+
+	if use test ; then
+		MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	fi
+
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+			-DINSTALL_SQLBENCHDIR=share/mariadb
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# plugins.cracklib_password_check
+		# Can randomly fail due to cracklib return message
+		#
+		# plugins.two_password_validations
+		# Varying policies make it unsuitable for automated testing
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp main.bootstrap \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help plugins.cracklib_password_check \
+			plugins.two_password_validations \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}" || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd || die
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}