Version bump using the straight patchset from 5.0.60 to aid security. Later revisions will contain new patches. Please note that FEATURES=usersandbox may cause very weird src_test failures.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.28-rc2-00338-g65fc716 x86_64

3 files changed, 121 insertions, 12 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 42da8f90fc2f..5118003cb841 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.459 2008/08/05 16:30:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.460 2008/11/14 01:06:12 robbat2 Exp $
+
+*mysql-5.0.70 (14 Nov 2008)
+
+  14 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.70.ebuild:
+  Version bump using the straight patchset from 5.0.60 to aid security.
+  Later revisions will contain new patches. Please note that
+  FEATURES=usersandbox may cause very weird src_test failures.
 
   05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7d86f66e528a..2741e55aadc1 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX my.cnf 1231 RMD160 21aad0c2aa4aecc5963043e5127c0648b4e4fa5c SHA1 febf824dfc1b1c76ffef10c165b5098430c2b2ca SHA256 303d5a4344c40246974e849a18c66508234961e7ba325cbc0f75777463283776
 AUX my.cnf-4.0 4293 RMD160 cbe4ea7688059f48145af2b49f6530452d076736 SHA1 58d8abc9c02f0546d320baa89b739c79555fe963 SHA256 b479299cda817cbda77f8f43d79e23120a7569a3165b0c98ddcedfee7c0900a3
 AUX my.cnf-4.1 4212 RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 SHA1 5c68c2ccfbb05c3547a3e5a6554839c27496bcb4 SHA256 7460667229e18b1f0e446105431e7ae31177e3e7774ff6736eba8b057cd3fc80
@@ -19,6 +16,7 @@ DIST mysql-5.0.44.tar.gz 24388270 RMD160 7b380cf13d040149e5f0e75b582124ec996e0b0
 DIST mysql-5.0.54.tar.gz 27397332 RMD160 50898b7339cad1339cfdcf01e75c8e851d837d80 SHA1 8b540ccce64a1c4cf470d4f78c8d811ebad8da1d SHA256 d3431038e594c6e6b480d2d7a24bca7166bb5e593c9d807140257ed06b105a66
 DIST mysql-5.0.56.tar.gz 27648999 RMD160 319d29e0ad85555b807ef4288e51002c6dfce82b SHA1 56e72a4b95ec38d304e902e21785944ccce85b59 SHA256 cff6e258d70c65deaaebca3f7cffd22fd27c06852e08d804f2af2197dbbd79f5
 DIST mysql-5.0.60.tar.gz 27918671 RMD160 3d7d35e585f96d0729a38146cdb6fdf7308f87bb SHA1 fc8477bb7e5737f7da8d6bc07fa468b18c3a7f7b SHA256 cd94b44413701d34449b1be649f3268625fd16df47b962c7204300d5b259ec73
+DIST mysql-5.0.70.tar.gz 28589887 RMD160 3b3e654518003ddecc0b50afb608dab8754adb3b SHA1 8e0cc8f8ebffad8340f40b9a57dc01a9c5c3b5d7 SHA256 d6532f623cb47100758f554b04ca14d848e3381e9848db899cc6b32dd555b325
 DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb
 DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172
 DIST mysql-extras-20070108.tar.bz2 49996 RMD160 eb7459e2390c4d877f4c4d5cf9bb3d14c39c4212 SHA1 58f8db940a1e524ae1527e9efe9f2c2e1be4ef86 SHA256 55d46ac681036cda8f95d5f169d494cd3c6a25fbc7ec327a949518adf64a8ba8
@@ -47,12 +45,6 @@ EBUILD mysql-5.0.54.ebuild 2220 RMD160 3517d7753582c76d47f21b002799f1384b926c95
 EBUILD mysql-5.0.56.ebuild 3257 RMD160 a931ff0f2fc841c878f612d78740ea0b6c4a19ac SHA1 b0075e5b76e0ffe8b10ee8d3727dba5ec8bd7ab5 SHA256 ed23a12a92f35a6cb2be7542b0e089277ef888890771e7cef6ef4aac2933f175
 EBUILD mysql-5.0.60-r1.ebuild 3281 RMD160 484ac8150e546d8d8af6d02c33da93457ac94c63 SHA1 cd8dccb1f53d953bda2e06c3ecd7720d2371e745 SHA256 6e4cbb6c073dcaade89b626c76592682b10c721e831d2d9439dc3cd9893f55b1
 EBUILD mysql-5.0.60.ebuild 3289 RMD160 d8c5764cff391c70c42649467b787307bef9e517 SHA1 6a9162dcb88b1434f753530d1595223565f3d831 SHA256 2099baf5b98993016aea54ecb272287355f6091c6462ee884d190a46fd53ecef
-MISC ChangeLog 88654 RMD160 b6e79b31dcb23a2bc193e59baff5325f4037eca6 SHA1 0759c938788c2cc10b19a9ce5ba470e73cebd24c SHA256 2f8b74dba2a630527dc966722757c9fa0d5becdcaac32efbd3d79eabd6a38321
+EBUILD mysql-5.0.70.ebuild 3712 RMD160 4b72c7f0d22edbed76757c9dad6e8b3218c7ee8f SHA1 3e8e080ba215313150b35e274cce93da73d3712a SHA256 052f33e307b8e606887c07ba85b36fd0a0fd45fc4bdedcbd9895b7d32b00defb
+MISC ChangeLog 88959 RMD160 42e0298df12b213d3c982075950b4ed3091d61ce SHA1 08365a93b5bf47b7f749cdfe1b066ca1a77d9a70 SHA256 29b1310c13cb121d2dde17b85dca00c88936e31654889beabe0eed1aa175e249
 MISC metadata.xml 746 RMD160 24dadde02462666d5b05608b73a87094de82af1a SHA1 596f0628975fc92ff1cb4d665f7fa5d7eac04505 SHA256 070b3c63ddedff2023166fd0f82bd9dc6a691079c10a6ee968ca7b28e97af5a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkQ648ACgkQ67wieSYcaxcZPACg70PZg2I40jD9cUTJMM3wzHNG
-L3kAoNPRnDyjYQz4MTxmvqJtZ66QKCEJ
-=Ic1T
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.0.70.ebuild b/dev-db/mysql/mysql-5.0.70.ebuild
new file mode 100644
index 000000000000..5517b3260a96
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.70.ebuild
@@ -0,0 +1,110 @@
+# 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.70.ebuild,v 1.1 2008/11/14 01:06:12 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
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		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"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus2=$?
+		[[ $retstatus2 -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus1 -eq 0 ]] || failures="test-ns"
+		[[ $retstatus2 -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
+}