Bump for new security vulnerability, fix ported from MariaDB code.

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

5 files changed, 408 insertions, 26 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 83c9b2c5dd1c..01fab77960e6 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.610 2012/04/13 18:00:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.611 2012/04/21 20:25:04 robbat2 Exp $
+
+*mysql-5.5.22-r1 (21 Apr 2012)
+*mysql-5.1.62-r1 (21 Apr 2012)
+
+  21 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.62-r1.ebuild,
+  +mysql-5.5.22-r1.ebuild, metadata.xml:
+  Bump for new security vulnerability, fix ported from MariaDB code.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> mysql-5.0.91.ebuild,
   mysql-5.0.92.ebuild, mysql-5.0.96.ebuild, mysql-5.1.51.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7f1491c744cc..a4222ed6bfdc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4324 RMD160 dbf65ae929107c374994e39364af6f3515a9aa45 SHA1 0ec588cfd977b513eb11c3563f89042563ebce21 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -35,6 +32,7 @@ DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d979
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 RMD160 99b71ba2d567aef06fceda962d5d8d3ae8150b61 SHA1 91c28858bd3585ff7e1b3a5f199fdf2b28729d5b SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495
+DIST mysql-extras-20120421-2004Z.tar.bz2 1836159 RMD160 4471590e7b939f58fb534e6f8c3cb952257d5ef6 SHA1 c756c84373286df164015e50fdc842d9e7245ebd SHA256 11cbf44c5983adf496ea6e00c461ea54915ddb1baf527c05953284b409d8bc6d
 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-4.0.27-r1.ebuild 1105 RMD160 55f3ea683ea8c57bc2197a64b81b50a0933a57b2 SHA1 0adb182c9cb4640e6f3a1e6b6f501190a3c46067 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce
@@ -52,28 +50,13 @@ EBUILD mysql-5.1.57.ebuild 8719 RMD160 2b3573c5c3480a74a69e6be8c3c6c0b2e79aec98
 EBUILD mysql-5.1.58-r1.ebuild 8725 RMD160 b24dfc0ef0585fff9c90be233e38d0a18a8729e1 SHA1 44e88a0c9b7b8274e01db08fbd59264441af879a SHA256 5bcf90202f0feeea590291aacd639a5e15a2f1f4e8b4ad02c67b72e70b00aea6
 EBUILD mysql-5.1.59.ebuild 8735 RMD160 6c6414519d83c587e0cd9d784f2421d8aefde9be SHA1 44c8a608cb92777dc990742a562d8433ab1d3798 SHA256 3d883c45c0b74802b85952ecafff61aeabf7213ce3a9ed2e3f68075270848eb1
 EBUILD mysql-5.1.61.ebuild 8876 RMD160 878011eabf7d60ced6d1c9a6e7e652d303e808d9 SHA1 53c84735e2613bac400c37d4ccddd967b724285e SHA256 1f7374fb2868b3d5a90d0e080551c44ff053f2d2d801e8b4a8011e35eb436cb1
+EBUILD mysql-5.1.62-r1.ebuild 8891 RMD160 80f546655eb4a682a5eda4933ca05939d32331da SHA1 ccb8828ca2cddf2c04479c41c995cb42be7f00f7 SHA256 193954c04945c693d18ba6f310363ba40484d75aca46d369abe81c340ae340d6
 EBUILD mysql-5.1.62.ebuild 8888 RMD160 f732e281033be3b4e7808dd08119028e41b42da5 SHA1 402e8b18aae6bb79d4bdae3b2bb3ac1fa65f37cf SHA256 5e2253c512d9bb7931e98ece31752612d8df2c86bc8b0545c710d2dff17055f0
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 ab95178bb615cfdf73d6085b424c2127e45640e0 SHA1 d5ec9a7dde6788c6cb1a189f45d02e532ce5861c SHA256 b178e2dbcb0afb843b53cf2c0148dfc52a1909141435d43fd32d4e4dfee94e3a
 EBUILD mysql-5.5.20.ebuild 4230 RMD160 83ff016f9baa86b9d39501c8bd7dda9069f9b2db SHA1 2d666a87cd4c4723c9e4882702504def6498781d SHA256 bd74a5f69a5c8ec88fb25ec9aa1dd61875d299412392b6b7581d8133f64b054e
 EBUILD mysql-5.5.21.ebuild 4230 RMD160 f9d3e2c7cde75dbe52de2cbd4ed396d117d069ce SHA1 83d3f33aee47b7adfaf01ab8f148a34d29148dc8 SHA256 79752caf1d42dd5556eb7630d8b993440398bc82ab5ac37703602a7561c89c26
+EBUILD mysql-5.5.22-r1.ebuild 4233 RMD160 8348a2fa613f25789c8db617dc2b32ded90f0b24 SHA1 64c852c9fa690ac78c196df7516b4dae45976dd8 SHA256 5c93603c095d412700eb8467c60e396a0eb54f9cbf911ed1d87b718fc6f30c6e
 EBUILD mysql-5.5.22.ebuild 4230 RMD160 11a576b2ecec34044893b63f9058652e934c533c SHA1 98357f3db7cb5141fb5c0237bbe8c3062deb7f01 SHA256 5470e7679bb1a3259e01786d281d367960a49d64dc4282ab58b9776e1d5786dd
-MISC ChangeLog 8674 RMD160 8f25010f09c8258978bc8d8764383542239ecf49 SHA1 b61e930b93dc0389b35e9a414a8b177b52eee8de SHA256 ef5e65b2badef058e6b6671a25faea1f186cc9920be03e064585921dc59009ac
+MISC ChangeLog 8930 RMD160 5b3698469427b0e7cfbc466c9172feabfea9c23a SHA1 946d9b7711f4efd3032d41ac65190946515b99ce SHA256 9812672081ef0020c761fe0bfa6c9e57eb7e2b01ea39f0859a623bb1f5df82f0
 MISC ChangeLog-2010 108404 RMD160 11fd27413d19e453f2cfe1877c93f53d06c81f82 SHA1 4722e0f32417772921ab328942a7dcbd743b3c56 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd
-MISC metadata.xml 1497 RMD160 82a73ef66a72224add24244ddf39df290a1f67dc SHA1 3a1fd203707ee79ea61202e559b8e912653ffbff SHA256 dde83b854d83894cffd06d26a28ed66e7a0788ba70a745ece4ff719445cc9bf1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPiGp4AAoJEDxpGckxwJCB6jIQAKXSKR7mKC/d5yyB6tgNJVvt
-BC1/OG2DrW+ft3PKxkFykOQ5010NBAezsVgIiy+aPWp0VNjKmacnOlvl0A4CbE02
-JjmE0pMOSWO9N//CEPRM/0W/n6kPmvcxirBLIEbzMO7DytCUMHrwL4OiO35Y6myJ
-oZbzJLXAlO2PSj8ieT3ehuAcQmcuKTntCEKG/IBRbE5uWiHIO821wmEKEhgIGEao
-IcRH8Y4RiRq+sQK++r7AwKvIP7nGsI3NP/GgLMsA9GjHAnNeGgrukBIfAm9futoo
-6Wfgdw3gVnXQzaIWETDq0p8EJ118vuCA8eYXHjM3/36rRaquR4ET4hFG0EXtBwi0
-M44ugCm8HO6VJixALGLFtuDhVH/2phhM12HBloJYjPJUpN05Ko6DwkagJisti12N
-fsnXwaLdJK/azPElnQuZHbbQ7GVzzWKieuS4VpABoDnAFavvftLCfNFAhxNRCXni
-jVzJRq7kfxQ+Grz+hq659Jv3f8r9THG/MPRldV3EFG0t4PbQ+dmNoI52kJsLwkGt
-/Vjz9ptYLpFKa9fz5bvAtDDkXc2EvN8IgDjpwmdXd5MuUbxxaNLbg/z65VOYZKhN
-efgSva2kp18O+gz1/1YEbUDLE238ecXEACgr69rzmvMTlb01+TcK5i8EVaEm+jMS
-QTCQT2vfRKu7jUkb8tXV
-=LFCM
------END PGP SIGNATURE-----
+MISC metadata.xml 1431 RMD160 de753e0090af84e89cd764d3998b9ba407cfebd8 SHA1 b3fb90e94e6e88099f2b4466aa6aef189cab6317 SHA256 00319f82dff22d5316e30049e0611c611503e4d54e73a4c011bd3914036f5efb
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index cb76fa27fb41..351eb3c6ff28 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -5,9 +5,7 @@
 <!-- 
 Please note that this list is shared between the following packages:
 dev-db/mysql
-dev-db/mysql-community
-dev-db/mariadb (upcoming)
-dev-db/mysql-cluster (upcoming)
+dev-db/mariadb
 -->
 <use>
   <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
diff --git a/dev-db/mysql/mysql-5.1.62-r1.ebuild b/dev-db/mysql/mysql-5.1.62-r1.ebuild
new file mode 100644
index 000000000000..bea0589ddf32
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.62-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.62-r1.ebuild,v 1.1 2012/04/21 20:25:04 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20120421-2004Z"
+# 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 ~amd64-linux ~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
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			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
+}
diff --git a/dev-db/mysql/mysql-5.5.22-r1.ebuild b/dev-db/mysql/mysql-5.5.22-r1.ebuild
new file mode 100644
index 000000000000..30382e96a041
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.22-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.22-r1.ebuild,v 1.1 2012/04/21 20:25:04 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20120421-2004Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~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
+
+# 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() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# 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 ! 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"
+
+		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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# 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
+}