Version bump, security bug #178860, should also fix #179398 DATE/DATETIME upstream regression.

(Portage version: 2.1.2.7)

3 files changed, 87 insertions, 1 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 793edfa07cbf..5b1b99116df0 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.410 2007/05/31 22:05:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.411 2007/06/07 02:15:41 robbat2 Exp $
+
+*mysql-5.0.42 (07 Jun 2007)
+
+  07 Jun 2007; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.42.ebuild:
+  Version bump, security bug #178860, should also fix #179398 DATE/DATETIME
+  upstream regression.
 
   31 May 2007; Christoph Mende <angelos@gentoo.org> mysql-5.0.40.ebuild:
   Stable on amd64 wrt security bug 177913
diff --git a/dev-db/mysql/files/digest-mysql-5.0.42 b/dev-db/mysql/files/digest-mysql-5.0.42
new file mode 100644
index 000000000000..01f1078375c0
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.42
@@ -0,0 +1,6 @@
+MD5 696ca8ff6e2e67f9b37252c3bcf6ba52 mysql-5.0.42.tar.gz 24255814
+RMD160 a0c5e5615423aa75ba8ad52c6dfb36d31bbc4fc6 mysql-5.0.42.tar.gz 24255814
+SHA256 29f80b85ec66b55d5f7340c23c400cf69c5a6ab8d7cf6ddc560776a56017928e mysql-5.0.42.tar.gz 24255814
+MD5 c93af0ab37b79b31545f0dce5e02103d mysql-extras-20070415.tar.bz2 51424
+RMD160 8babddf636b175cc044cbc821ab64e62eedcb6ce mysql-extras-20070415.tar.bz2 51424
+SHA256 cbaed8e7e35899417d3e265798f4f9ffd046af99f4032b38b114c36b6887a704 mysql-extras-20070415.tar.bz2 51424
diff --git a/dev-db/mysql/mysql-5.0.42.ebuild b/dev-db/mysql/mysql-5.0.42.ebuild
new file mode 100644
index 000000000000..2938bba4c5c3
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.42.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.42.ebuild,v 1.1 2007/06/07 02:15:41 robbat2 Exp $
+
+MY_EXTRAS_VER="20070415"
+SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
+
+inherit 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='202_all_embedded-library-compile-5.0.38.patch 706_all_fix-nullpointer-dos.patch 707_all_fix-nullpointer-dos-testcase.patch'
+
+src_test() {
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus1
+		local retstatus2
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# mysqladmin start before dir creation
+		mkdir -p "${S}"/mysql-test/var{,/log}
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		if ! hasq "userpriv" ${FEATURES} ; then
+			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
+			mysql_disable_test	"im_life_cycle"			"fails as root"
+			mysql_disable_test	"im_options_set"		"fails as root"
+			mysql_disable_test	"im_options_unset"		"fails as root"
+			mysql_disable_test	"im_utils"				"fails as root"
+
+			# As of 5.0.38, these work with the sandbox
+			# but they break if you are root
+			for t in \
+			loaddata_autocom_ndb \
+			ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
+			ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
+			ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
+			ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
+			ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
+			ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb \
+			mysql_upgrade
+			do
+				mysql_disable_test	"${t}"	"fails as root"
+			done
+		fi
+
+		[ "${PV}" == "5.0.42" ] && mysql_disable_test "archive_gis" "Broken in 5.0.42"
+
+		# We run the test protocols seperately
+		make -j1 test-ns force=--force
+		retstatus1=$?
+		[[ $retstatus1 -eq 0 ]] || eerror "test-ns failed"
+
+		make -j1 test-ps force=--force
+		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"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}