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

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     46a7cca87bee7d5dda99e43af31984470a318991
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 18:23:28 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 18:23:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=46a7cca8

[dev-db/mariadb] Bump to 5.2.10 revision.

(Portage version: 2.2.0_alpha83/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mariadb/ChangeLog             |    8 ++-
 dev-db/mariadb/Manifest              |   24 +++++-
 dev-db/mariadb/mariadb-5.2.10.ebuild |  171 ++++++++++++++++++++++++++++++++++
 3 files changed, 201 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index e513b66..3760a24 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-db/mariadb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mariadb-5.2.10 (12 Jan 2012)
+
+  12 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.2.10.ebuild:
+  [dev-db/mariadb] Bump to 5.2.10 revision.
+
   20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mariadb-5.2.7.ebuild, mariadb-5.2.8.ebuild, mariadb-5.3.0_beta.ebuild:
   [dev-db/mariadb] Bump EAPI to 4 on old mariadb versions.

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 41b28fd..4524fb6 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
 AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
 DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
+DIST mariadb-5.2.10.tar.gz 25242675 RMD160 f5b5a7776e41e29449f60dc0528ccefba0d73d36 SHA1 053326aed589b4cdb23560269890ed12ae6885a2 SHA256 dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
 DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
 DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
 DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
@@ -9,10 +13,28 @@ DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5d
 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
 DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
 EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
+EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
 EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
 EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
 EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
 EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
 EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-MISC ChangeLog 4440 RMD160 1071dcf3e8cf66865acb6843d9053b268302f285 SHA1 d11503484dd489f698ea850a1374165134b1e884 SHA256 93545c9f4bef597ecc445feb7662aca2695a20f00b43b74b158064b5a677d1ab
+MISC ChangeLog 4609 RMD160 908d75d3133038de72935ca12b3296b507f645ec SHA1 d49c7c2d31b9af509cef08e6ed5f3d2aa33c8ec0 SHA256 c829dc72f0b945e339cbce7dee93bbe4299b5a3d2f9ca80b19a72dc0adc5bec8
 MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPDyUgAAoJEC8ZTXQF1qEP5BEP/jUSoJK92Yke/0coHNMxSZ9d
+H9+m+To5+1URyRmmCPqFL0q5RJJAX4MFcbB5QRRS5NCOt/SEnCxKMScOHJUCmCry
+ShBnhjbK9yJ5m84wHDGM7xPFz/SSN1/kKZifim2u5aeU497APEZnMKE311gf53vu
+CsoD3FEYXquNKSb88bNNN9e72cQN4YVDfYwWGsqE+h8+/cFny1U3UwrJg9SFMEmA
+VbNXHTbpxZrYxY9k2BvpseLCEH1JpRNjUFDfaTLoSxjKzIxh99+bcAIekXaTERPh
+S0L8ti+3jblL+zVItNsIuVnMFuo1v63RsuQrvwQ3CAkKZiKo44mMgpQj1eyfLNzO
+qB8jUuwYpVAAzvF8ko+3ayJwE7J0S8WPGvIdn2rzbIEvc6yYonAKt5Hswe4y17Gn
+r4Gg0aoEl/vpxGdT+eKM+kYY+dkhiVih5ddDA7zN3aFwUMQcn8sB9ybnzF2GKYXa
++BpBC49bRC01CP3gpWG5N8Att2u5ahHlJaFqWq349dsC43/aHsgEc+rI1ZVO9Dyz
+fKc5iuBkNaZ4VOTCwoCS+2KrvwBvhOVc8HtD8tLirR6MPs/NTeV+QnYOd+LK2SCG
+ye4HKZGWTovkTrcAedNgU1UB/Wd874N4h3Je4GkA9+KisUqHBbPIxEO4ADeRSDPw
+CKD7SlbwvLtx6BqxJ7J6
+=41Lf
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb/mariadb-5.2.10.ebuild b/dev-db/mariadb/mariadb-5.2.10.ebuild
new file mode 100644
index 0000000..14a62d3
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.10.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# 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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}