[dev-db/mysql-5.1.58-r1] Bumped mysql-5.1.58 to fix all the issues related to the ebuild and the mysql-v2 eclass. Fixes bug 375063.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

3 files changed, 286 insertions, 16 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5b91d4e34ad2..427d1ddbcd71 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.583 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.584 2011/07/21 05:59:30 jmbsvicetto Exp $
+
+*mysql-5.1.58-r1 (21 Jul 2011)
+
+  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.58-r1.ebuild:
+  [dev-db/mysql-5.1.58-r1] Bumped mysql-5.1.58 to fix all the issues related to
+  the ebuild and the mysql-v2 eclass. Fixes bug 375063.
 
   14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -mysql-5.4.3_beta.ebuild, -mysql-5.5.1_alpha_pre2.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5381b08e4d6e..124ab98ae3a2 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
@@ -29,6 +29,7 @@ DIST mysql-extras-20101104-1842Z.tar.bz2 1255196 RMD160 712cc8d8c4f84dc5419e0c69
 DIST mysql-extras-20101128-2122Z.tar.bz2 1237793 RMD160 43b536c060d3a1bafa993ec4c55c1b13a78926cc SHA1 409b47603948bceea3531414af42b74915e698b8 SHA256 a804e4418fff742a72fc4cc8c83f1107a86f95b2fafde96002436905a9b5f729
 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
+DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20bbdd SHA1 b532250266fb20af81b4b6b9b56d47de048789ce SHA256 9250045fb9af28896c2f266c8c9b33409b525f1481b2ba70d104ec9ba5b4a6d8
@@ -44,24 +45,25 @@ EBUILD mysql-5.1.53.ebuild 8645 RMD160 5106b1271e7564d7cd234aaa09b958d206e4e50f
 EBUILD mysql-5.1.56-r1.ebuild 8668 RMD160 634a23c158b9a4a0edab5cb3de1f0b0bf86cb7d8 SHA1 5ab3e7c33af2c0e06ea437e749ef8c30fd1fada6 SHA256 05f5f6103f1a99c1dfa0e5ca6e9cfb7c647897595925175dc047886b834a68ba
 EBUILD mysql-5.1.56.ebuild 8659 RMD160 afec6db5737ec2049241488e593cd681d42ca493 SHA1 b85f9e79befbf722e5d017b15c342ecc746744fa SHA256 badf220bea95fe69591b5fff807eeb9cdb49f4d0009567a609aa900cbbf49b6a
 EBUILD mysql-5.1.57.ebuild 8715 RMD160 f086ab37e0230cc1187d06073a261664b4b5e38e SHA1 558b14a34400841bec569aeab1492331f2994382 SHA256 4307074e0ae888e350f0496dd874a6e7c370caf8308ab596b6bbb772cd4533d0
+EBUILD mysql-5.1.58-r1.ebuild 8725 RMD160 a2a8099856f4a039bcda808057f331fbbbdd8f48 SHA1 6f87b3f02ed1bacbbbd8ad5e670d9f3ae0975fa8 SHA256 cac74d6f6f448afa1ef6e2bb4bf93b42584c9a6feb63c48adff90950feb96379
 EBUILD mysql-5.1.58.ebuild 8715 RMD160 4305acc12217685c7f32066067b216215cc96772 SHA1 41bfa19a00638c3ec92ebbb893be1a2423da764a SHA256 f357e63db8d923b463e4de55272d63afbf49f611830461122f24162cf61c1790
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
-MISC ChangeLog 112036 RMD160 f38697295a82d4a50f23911c888101331eb232f1 SHA1 e0d0332fa6d6137089cfa76e413ebbefa671e2e5 SHA256 756971ed7731d2a15675569ab05285a106bbed7109d7b0f010427ad32b6b6b68
+MISC ChangeLog 112299 RMD160 4a5862f6b39bda810173c9b87a5d96b59b59f058 SHA1 4f3ca5cba75fafb122667a5cb2a06e44429a7a6b SHA256 6c2e5f781cac04b6c58eb9a8245cbfdd42010b08b061f74d4d5604d5b58c0456
 MISC metadata.xml 1389 RMD160 711fe2927a95bff06abbba5209a1e03fd99ba7b5 SHA1 adaf717edeadad3ebe8e7b486d75477b2ec5433b SHA256 562726facccb1c1808b74c0e17f052ca03c92c0ada689375e527b2a5405a5a0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOHmkQAAoJEC8ZTXQF1qEPSlIP/356pdM0uCbyt26VucsUnapD
-8zlvvOOU0g1v+X0f7qFiQ1EVL3u/PIZQGfC5w57+1VFJ47c4+xVfmVz8wL0jWl6J
-3z2tP3Oo+0mZHXA0cd7cA6ccolBGpUsmFTTHbz/sqqhU0bnh3vVWcpjqZyu6IEDe
-vN0aT8SaOEz74bLAannIelGtd7NB81aUywKSpoEjtjMjjZ1YPtGXPgqLwy1ndNm4
-DpVk0LryjT+IbJl19vzosNAn70LNzyBGdserAw2JwgNloDbkSz2KREISG6vglICq
-gw8CwrPD6vfc5mX190noQwE8LJWSlI4y+oJo/t2h38LDZfiWtt79F/Pb5z5drliC
-p80bjp+fU2VFELdJLvomu3Y8LF8lzdoMXpRWkRfa9K8HvIuCQpcZpcuW7Gb0q1mc
-UYg69etebW1gq4aDrGUB4w9sTlbAAV/EXhydYegxnyJMNk2l4NNYIUQgk0EDCDpP
-exJlkFzATZp3eDc2sAuW7St+ttUjqyzvCykId4APMcM0HG9oh3KoVsdlUqP2oNl6
-xNJL1Fb1zTIBvY91HCW0LB4U5vPgWe3BsNGZ1BOoUg1TeRwdnRIxbTKeDhs26sfM
-WBydJ3Psq3vu3Wh/i7Z0/ZbrWGJMgetso9I4uxZt7fu/ZH5cXRCi6OeGv9DaI2p+
-rmGIdUKxcfeahMOm3KB0
-=rKPT
+iQIcBAEBAgAGBQJOJ8BRAAoJEC8ZTXQF1qEPIO0P/jjFahPOKk8FD8COqlsX2RWv
+c96E4j/vEPhce/cTD8gf1krfBLoFLaF5H7KLHEuB+kUZFJkD30HUVMoktNS5KQQl
+fv7FFtPNW/MOESkUAnHIS0sdqYcAEr3MAQLALGxAVQAJvhwK7TNyO5VbdCCXSrtV
+B97fEsvL+lORy8ME2CQymgzbB7UpiRyVuCgqAmhmhi1/8OGnGRtkUo0J8u3I6rC2
+au5RUKYoDnQ1vi7dwTJNb0lNSXeOM1nGSYi+tSWlrVggeSPJb3uwv0oe+a2duqUI
+X2flw1z71TyPGkyhNElEqXqwUspAbhhFNeZlAVepHl0mijNNH73KEqwiMkAYfbNe
+Da/m9OrUXsrZP6FvZmJHnDv3luY4CjJc6ok044Nfm0BGPzMaXDNej5dJ/ani5sZJ
+TWoXCO1VmKBHT7YBRCOD0hP0L/y/CUazKsB+W4sv9eMExM6yzA1pWXIjYtRItkbo
+LdQGbgkbuLNyoNWwHZ38FCAZLazacGmUtKlTz0NA+su8CZ9gYJ7JJzTUkR3wpItF
+yr0mC2OTUeeqqQhlqBrZX1HrbNjYZiF4nD2iB7Y3Y5N0orPEzFZaSKl/YdemheWg
+T0RKohNViq/+kKVFaLPL+BhOdTwg5B06IT1w3JBOKNBqw04veYc4iYWg6Lh1He9E
+R4Op6VGnYi3wzD6R+E/k
+=t7uk
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.1.58-r1.ebuild b/dev-db/mysql/mysql-5.1.58-r1.ebuild
new file mode 100644
index 000000000000..b0825f518093
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.58-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58-r1.ebuild,v 1.1 2011/07/21 05:59:30 jmbsvicetto Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="20110721-0450Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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 mysql-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))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# 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.0.*|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.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
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			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
+}