mysql_config did not return correct output, per bug #224451. Revision bump with a fix.

Package-Manager: portage-2.1.5.2

3 files changed, 115 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5d3170dc6a0c..37c475e1d6ea 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.452 2008/05/29 19:54:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.453 2008/06/01 21:27:03 robbat2 Exp $
+
+*mysql-5.0.60-r1 (01 Jun 2008)
+
+  01 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-5.0.60-r1.ebuild:
+  mysql_config did not return correct output, per bug #224451. Revision bump
+  with a fix.
 
   29 May 2008; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.27-r1.ebuild,
   mysql-4.1.22-r1.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4bb035e36f0e..9c3605e9edef 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -26,6 +26,7 @@ DIST mysql-extras-20071115.tar.bz2 56027 RMD160 5e57e4a81c5874f2a4bb0c685d52d8bd
 DIST mysql-extras-20080124.tar.bz2 106526 RMD160 8f9f556308c96c4cd5cffd0506c99ea59e7c25c2 SHA1 574f5dbf4a8bb53d352cb2fbe391ad5c484eb932 SHA256 c4b33dd391834252d20d4b083ac4bd6999253a8f20d894dd93b0795c6b318829
 DIST mysql-extras-20080310.tar.bz2 106499 RMD160 ddc48002d0b5d0d03d1b88dbf037757a3aa38994 SHA1 c5584a0ff7121722c9e9359e1fdcc8744a2d215c SHA256 4b963976b26607827e61187a72589eefefe84bc811da37f7bfa07779bdb61b59
 DIST mysql-extras-20080529.tar.bz2 106586 RMD160 588c3ea358b0378523c44852476c37b88820c294 SHA1 9c5f4c840f070eed8c1979dedfabc593904718ab SHA256 8936d759d12502b2fe1a3539fd93eeb22e2e9ce5fa26f4d67b80995b24b23975
+DIST mysql-extras-20080601.tar.bz2 106566 RMD160 6e6470c8908e0e944ff8a71886db6e80af9465b0 SHA1 a462cf953452283bafd785ac9c109104b673bbd1 SHA256 de7bb63eb6de3b7b14d8d65b5248258b18e00524eac08dddf373f98361402ed9
 EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20bbdd SHA1 b532250266fb20af81b4b6b9b56d47de048789ce SHA256 9250045fb9af28896c2f266c8c9b33409b525f1481b2ba70d104ec9ba5b4a6d8
 EBUILD mysql-4.0.27-r1.ebuild 1036 RMD160 922e573a47f8bedcbcf84593afda5c7a8442883b SHA1 ab699184637a46733d39afb5bcbe03272f208b8f SHA256 e0daac03627eaf1d99f6b8b27583bcd09f5f4c50dd071ca4cb9b5c724ee49fc1
 EBUILD mysql-4.1.22-r1.ebuild 1268 RMD160 46e7c253ba8fcf6ce15fbbbc78f5a54aee8e5f65 SHA1 e362b7616f0fcd62078cfe533513a24546c91d8f SHA256 a8773b5bbe4bafee5137e35a24e482384913793e3727f4ff07dbee6ccd35947f
@@ -41,6 +42,7 @@ EBUILD mysql-5.0.44-r2.ebuild 2124 RMD160 56a7628537341a6fb4835c51e341eae76d23a4
 EBUILD mysql-5.0.44.ebuild 2408 RMD160 8dae8ad755696f61cddebefd7120d08cd97238d7 SHA1 ebde9919f0a160587862e59c8346242f7d774eda SHA256 047f53fd8b02154e68e7ac4f2e79c9b09c9501116df07b6926b6dcd289b72c56
 EBUILD mysql-5.0.54.ebuild 2224 RMD160 aa5ea015a3742d212f110f09c4ccadc3b7a775b8 SHA1 151c6bb62f72ff261bae00e48c8d5d1d46d03e73 SHA256 96d475d003e49aa8f09330e566ec27b35dfaff8d37c97d5f932da699802092e3
 EBUILD mysql-5.0.56.ebuild 3257 RMD160 a931ff0f2fc841c878f612d78740ea0b6c4a19ac SHA1 b0075e5b76e0ffe8b10ee8d3727dba5ec8bd7ab5 SHA256 ed23a12a92f35a6cb2be7542b0e089277ef888890771e7cef6ef4aac2933f175
+EBUILD mysql-5.0.60-r1.ebuild 3292 RMD160 21dc42c93a4fd9b8496aae3b8bb324b4c72da9e3 SHA1 2e3ec84fab2260e65b92482c1277d5782da470fa SHA256 3d93f3619884f5cb86060c48e2dab37a5944743fbd168d57b392d750fa0a6cda
 EBUILD mysql-5.0.60.ebuild 3289 RMD160 d8c5764cff391c70c42649467b787307bef9e517 SHA1 6a9162dcb88b1434f753530d1595223565f3d831 SHA256 2099baf5b98993016aea54ecb272287355f6091c6462ee884d190a46fd53ecef
-MISC ChangeLog 87455 RMD160 f1f8b10bcc78663490dd198fa37578ea00da15be SHA1 61a6a7e9cac314e80e1d4eba0351803cd60eb5e8 SHA256 b3e63278cf8da9fa5d28b151845e45254de4ae1dbac930fda727996bd3d74843
+MISC ChangeLog 87659 RMD160 58cedb690046fa1ffa613f23691a83b95cae8382 SHA1 991ef7cd6c2d70e05fa258de2ba53ab6d76ead4c SHA256 f14ebe95a14b8d458cdaaf23e70a5785edbdb531767de1f2315fd875ee9f7a24
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
diff --git a/dev-db/mysql/mysql-5.0.60-r1.ebuild b/dev-db/mysql/mysql-5.0.60-r1.ebuild
new file mode 100644
index 000000000000..72b2bec7ccec
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.60-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.60-r1.ebuild,v 1.1 2008/06/01 21:27:03 robbat2 Exp $
+
+MY_EXTRAS_VER="20080601"
+SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
+
+inherit toolchain-funcs mysql
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+# 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_test() {
+	make 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
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus1
+		local retstatus2
+		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_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.44|5.0.45|5.0.46|5.0.48|5.0.5[0-6]*)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.44-56 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_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_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_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_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus1=$?
+		[[ $retstatus1 -eq 0 ]] || eerror "test-ns failed"
+
+		make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus2=$?
+		[[ $retstatus2 -eq 0 ]] || eerror "test-ps failed"
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus1 -eq 0 ]] || die "test-ns failed"
+		[[ $retstatus2 -eq 0 ]] || die "test-ps failed"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}