5 files changed, 92 insertions, 1 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 4f57b225e596..fbfdc8a35a52 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.338 2006/05/17 21:20:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.339 2006/05/31 21:22:12 chtekk Exp $
+
+*mysql-5.0.22 (31 May 2006)
+*mysql-4.1.20 (31 May 2006)
+
+  31 May 2006; Luca Longinotti <chtekk@gentoo.org> -mysql-4.0.26-r1.ebuild,
+  -mysql-4.1.18-r61.ebuild, +mysql-4.1.20.ebuild, -mysql-5.0.19-r1.ebuild,
+  -mysql-5.0.21.ebuild, +mysql-5.0.22.ebuild:
+  Bump MySQL to 4.1.20 and 5.0.22, fixes a security bug.
+  Also drop older MySQL versions, at least the ones we can drop. :)
 
   17 May 2006; Diego Pettenò <flameeyes@gentoo.org> mysql-4.1.19.ebuild:
   Add ~x86-fbsd keyword for 4.1 series.
diff --git a/dev-db/mysql/files/digest-mysql-4.1.20 b/dev-db/mysql/files/digest-mysql-4.1.20
new file mode 100644
index 000000000000..824c2e8567ab
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.20
@@ -0,0 +1,6 @@
+MD5 a1dc5375f6580db5073d542200a9ad5b mysql-4.1.20.tar.gz 17319370
+RMD160 0db1eaeed752be2faeae3b99f0c54a23d00f4e5d mysql-4.1.20.tar.gz 17319370
+SHA256 3ffabb5ba1ae0950a9d433820dfb87584470904765fe958bff34b8e342f05436 mysql-4.1.20.tar.gz 17319370
+MD5 adb4a601377ca0e006dc6bbd9e0655cc mysql-patchset-4.1.20-r1.tar.bz2 3731
+RMD160 eca0f171d58f7b0fd5318cfe593dfef691365683 mysql-patchset-4.1.20-r1.tar.bz2 3731
+SHA256 7db09253309bfdde81a14945d689c7dd25a29549915f8ec0f87642af8fcef4c7 mysql-patchset-4.1.20-r1.tar.bz2 3731
diff --git a/dev-db/mysql/files/digest-mysql-5.0.22 b/dev-db/mysql/files/digest-mysql-5.0.22
new file mode 100644
index 000000000000..b889c4359916
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.22
@@ -0,0 +1,6 @@
+MD5 b0533dce52a3147234e588f51affbcab mysql-5.0.22.tar.gz 19542405
+RMD160 12aad812756b2a97a380bc504c514db15a997362 mysql-5.0.22.tar.gz 19542405
+SHA256 e744e64b8bd8c0c51969d68e5a502f5c4708ed0eda41fdf7a4d27344116af75f mysql-5.0.22.tar.gz 19542405
+MD5 eeb6eb4d11192b4e905ac307c90bd878 mysql-patchset-5.0.22-r1.tar.bz2 3486
+RMD160 67ebc6c46d7c5f3dd9ddd93daeb632d41b4b1d15 mysql-patchset-5.0.22-r1.tar.bz2 3486
+SHA256 7ac41048e034a1878e7f29409953b0de1090a9afeeeb4e126af113edc65aeefa mysql-patchset-5.0.22-r1.tar.bz2 3486
diff --git a/dev-db/mysql/mysql-4.1.20.ebuild b/dev-db/mysql/mysql-4.1.20.ebuild
new file mode 100644
index 000000000000..ff5af5b24438
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.20.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.20.ebuild,v 1.1 2006/05/31 21:22:12 chtekk Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
+
+inherit mysql
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+src_test() {
+	cd "${S}"
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql/mysql-5.0.22.ebuild b/dev-db/mysql/mysql-5.0.22.ebuild
new file mode 100644
index 000000000000..15c326fdb919
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.22.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.22.ebuild,v 1.1 2006/05/31 21:22:12 chtekk Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
+
+inherit mysql
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+src_test() {
+	cd "${S}"
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}