[dev-db/mariadb] Bumped to 5.2.9 release.

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

3 files changed, 194 insertions, 15 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index e487344e45ce..636ce962df7d 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.12 2011/08/19 15:49:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.13 2011/09/30 02:53:07 jmbsvicetto Exp $
+
+*mariadb-5.2.9 (30 Sep 2011)
+
+  30 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mariadb-5.2.9.ebuild:
+  [dev-db/mariadb] Bumped to 5.2.9 release.
 
 *mariadb-5.2.8 (19 Aug 2011)
 
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 09e4c23fa33e..e76c3fd7db8f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,6 +8,7 @@ DIST mariadb-5.1.50.tar.gz 24567591 RMD160 d143e06ea847aab33922749d1e29548354df8
 DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
 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
 DIST mysql-extras-20100324-0235Z.tar.bz2 1054397 RMD160 7c0800f08ca96cd6dbdd812cb7a922d96077361c SHA1 bf77a1e759bfc1bff1ba0914a5701543de4d953f SHA256 6345de31176cbc69b13e92a4d459432c54a82fcd5f54350c4280287da9b3b0c1
 DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
@@ -18,22 +19,23 @@ EBUILD mariadb-5.1.50.ebuild 7538 RMD160 1c0cfff5ad2233f2d1301f5f12af9553732ff75
 EBUILD mariadb-5.1.55.ebuild 6041 RMD160 b9cfd17d2500e7160cde6a1cccb92648e13c86a8 SHA1 e9680d5a69434b1b53263d81bb59f8fa9b9d0c7b SHA256 5eb823eeba29e70ca50a214adc98223846d4a2cc581b3da2bc15e733c4cb8517
 EBUILD mariadb-5.2.7.ebuild 6003 RMD160 83935160307449104e5c85e6a8554f3d900fe1da SHA1 ab167467573b63492fabbf4da740c232ff6d9c12 SHA256 f5a19b793564446b2ac578800eb014d95ad683def25e6c9ba4de2bcef8068c62
 EBUILD mariadb-5.2.8.ebuild 6003 RMD160 21b5740ecf79ab7ae9dc5dd1df2aa8fbd2383327 SHA1 40340a06dbcbb4b0a1647d0be38cb0883d98053e SHA256 78e441eeda08268dcaafbf40f77ee7aeefaf3532866bce9f356ef83641c0d323
-MISC ChangeLog 2589 RMD160 957fcdfc1c4fe6bccaa7af3325756606d5bc54b6 SHA1 f4adc2e191ea74ae978b4d7282c40c31267a39e2 SHA256 51ed0133d5699cae136f7f5bfadfae9c3fba5b42b145a1ec1fbe79f4eada81c2
+EBUILD mariadb-5.2.9.ebuild 6003 RMD160 17b654aed9042885edb76605779743ab6847277e SHA1 669173b00e39b5e195f957cc838386c42fb249fe SHA256 e607738aa08119a3cd6e3a7d744450ab0c1125f0417871500f88396371684b1f
+MISC ChangeLog 2756 RMD160 88bb819e6d4d67959758fd5549571c3fad85800b SHA1 ec032c398edd824c3d9ae7338b538dc0908a9355 SHA256 5234aa7be93cdcc97d4a8d1c467d4e8900ab080ddbaa7b905dedfb791541da76
 MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOToXvAAoJEC8ZTXQF1qEPp0AQAKTjBNWghXlOgApyZ46z87Yl
-foJTriFdZTJx5BQQSrjwW/LTEOXKxGDWMkp17jzWVLP5BpH1AJaDH6bVhNBmaJh1
-X+H8GqXUY0iDizsoSVFv0LEdMnRcdddjss4nfUlK+hpm9PdSBzch1Gi8LP4PqwIA
-qadFEwRSF8e/tubJDAIiJJcPLMiDuBARpPrJnkAUL/2mcwpAmpmSNMTJt3tMagwW
-w/yKOJNgEu1wL7d/MI2Y8a7cNgh8SnROTsS3KN36Fw3IZGLRxtcrDBeOqSG4vr0e
-08/S0yL2Q/P9GiglVrXhELyl36KKkdy5uDimECvhWhA6xdqyt9NoSpQW330tJ2mw
-WQWBlIoXUFmFUO+9qFUR5s1FadysvuUDJYiyiyu3GFPNS4sRX+6kmawmNDkCKzoM
-r8dvCmlfjsJFr7CigTVVzYJ9UKjxedb18N5YDQ3s8Nj0tznHCmuBgGCzDr3NAvSi
-PzuNQyy2RAtWvkmz4hShrRkL+a3CV4ZHEDIl9xIw3ebHVRbOxoe/NC7rt0GOx/92
-KV2VQ1Jfx0ntubMhzrXQ4xuak2oFA2oS9duINXyRkjozIerM5yEMNrqkJi8b8vQ+
-FeeB57mWuQq0l9mp/cd9a07W9g65rFaFxZ4WlaL8UuG3A1892CP/sjdYIUvy/lDl
-ijqoHzOyN1jD3i575wa3
-=Wp2w
+iQIcBAEBAgAGBQJOhS7iAAoJEC8ZTXQF1qEPUF4P/39zIr6a1qKUVMb/ZdcWP6Xj
+DQOJC+vIY9YJGn547pPJESj9BuRxXTaaxGyU2xu3nuhNwger3WO4lx73qu94Kkhd
+9Xw+KbwiBVFaYUB8nCl+MyvPRTrWdEYHyemNMVV3Qpm4jr5MwbzU5pXq3Fr+FVv7
+SkYRVHbJmuxpfK4RT6CvPPLW/9Hzk0dKeLJskTnYUEjDZrpkTziDJC6iYvcEqN0X
+q3qUH/UIFofYvwSzddR3YnVLRPHX1HLsvTqpP4BBWepYadH2oGhTpwGz1TLw4f4a
+cYxx9/70rZsBzb0ipQMLGFiq4wNLy8ClldY6JI+XPI0a5Yds38XGaz5aSy8cFc1C
+1scTARkcU3ruUZbgV67mBtxmt/vwNS6RO8zHyxzsqtr61Hoq7gOnCOVBA7QtKA7e
+B9mLV8pIVUahBiuX6wrFkDIKQZBwFsI+akSc1jDzgM2gQLNg3frcKdV7PW/6stgd
++WqBznpa1bldWE/PSIddNPLXtyiqEA/9AU3QFIi10+/Eedn3yl536IOtSbrVddbF
+s9yo4H9RB1DKIbKnqbrDaRCd3+kHhsLAoax1ZL/B1WjHnjRLoBlJD1s99miPE5oS
+qKUcYF1Cx1dBDMAbT4eQVNtxZQa4avrlGr4ENgmDZoM5iJndUpLlAxasULzCyEI0
+0T7kBAOpGGQSeV623FDR
+=O7jx
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
new file mode 100644
index 000000000000..33925c09da88
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.9.ebuild,v 1.1 2011/09/30 02:53:07 jmbsvicetto Exp $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="2"
+
+# 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
+}