From: Robin H. Johnson <robbat2@gentoo.org>
Date: Sun, 15 Apr 2007 12:52:25 +0000 (+0000)
Subject: Version bump, for two security bugs: #171934 and #170126.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cc046aa931c3964f8307bbff49e57647ff46ea01;p=gentoo.git

Version bump, for two security bugs: #171934 and #170126.
Package-Manager: portage-2.1.2.3
---

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d28e0fdedebe..fa56924043c5 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # 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.390 2007/03/06 16:11:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.391 2007/04/15 12:52:25 robbat2 Exp $
+
+*mysql-5.0.38 (15 Apr 2007)
+
+  15 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.38.ebuild:
+  Version bump, for two security bugs: #171934 and #170126.
 
   06 Mar 2007; Luca Longinotti <chtekk@gentoo.org> mysql-5.0.34.ebuild:
   Port libtool fix properly to mysql.eclass.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 194061f550c7..66e53592d594 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -21,10 +21,12 @@ DIST mysql-4.1.23-bk-20070101.tar.bz2 12171000 RMD160 3e7abcb4665b55bfe74305484b
 DIST mysql-5.0.26.tar.gz 25986952 RMD160 98ee85457de4bc8c8f8acddc8b6f0dc7687f32c7 SHA1 7197159f9214722aa41b82ad80f87b4af5d232ce SHA256 4266fe6a3593700d4157b8cc4278fa8ae98837d4757735fc6ed70d9df6bb2680
 DIST mysql-5.0.32.tar.gz 24820282 RMD160 14639884c1bdde356654c4c5fc75d2ff613cd1d1 SHA1 daa13b48b0ddca029bdf97b578481a9cf3e4ac15 SHA256 13891620173721d1b3723c73d2eafd1615566f0df14f21c551d645d5cff547e8
 DIST mysql-5.0.34.tar.gz 23015439 RMD160 5294b76edb004162247e9e032929fe728887202b SHA1 1b1a920aa0720a7d9abec839d31f384e75970934 SHA256 45ccd88a33964c58027cbd3cf5c5223ae04f9cfefd0ad15ca0ee6dbda3eff0b4
+DIST mysql-5.0.38.tar.gz 23307140 RMD160 7c69373e4c3de1d04b3494890d43ee61f49ce3de SHA1 be1ab0c73799a848194d3ab1c11cdbfa8d638018 SHA256 c8a4e746a1465b1768c356713b0e0b62818eb5132c8bb674747dabc5f37786c4
 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
 DIST mysql-extras-20070217.tar.bz2 50155 RMD160 fd8cb330772fcc77bc3ac501a899f8c704d0d798 SHA1 2ce58115db0f703d98c4f7b0c0b1835123c07386 SHA256 401a8fed36f87d81d53c5c392a017d85a3a27c1694e38350ba30d68732197ea0
+DIST mysql-extras-20070415.tar.bz2 51424 RMD160 8babddf636b175cc044cbc821ab64e62eedcb6ce SHA1 4654ef18cbc7171065dbfebe82abdf4227ad6c4c SHA256 cbaed8e7e35899417d3e265798f4f9ffd046af99f4032b38b114c36b6887a704
 EBUILD mysql-3.23.58-r1.ebuild 7368 RMD160 416ab8a672004c11de9b9abfad84f06ee11b703f SHA1 02b5fde7a0c4a31584eb88a39dc0c4586033f988 SHA256 b391e2cb52ffccf96efc7ac6671574f24782590881583eeba7e837c8695eac35
 MD5 0b7476fa7d1d77e1ce6a8a5343ef959a mysql-3.23.58-r1.ebuild 7368
 RMD160 416ab8a672004c11de9b9abfad84f06ee11b703f mysql-3.23.58-r1.ebuild 7368
@@ -53,10 +55,14 @@ EBUILD mysql-5.0.34.ebuild 2053 RMD160 b6e4417d4645dfafceab4219247e6b4ecebadcfe
 MD5 62685ebdf91e30eb7a80d2972d608bc7 mysql-5.0.34.ebuild 2053
 RMD160 b6e4417d4645dfafceab4219247e6b4ecebadcfe mysql-5.0.34.ebuild 2053
 SHA256 2359fda98097cdc84e2254601b6cc8bdbb2650149a8bdc6a563d373cfac58a55 mysql-5.0.34.ebuild 2053
-MISC ChangeLog 79216 RMD160 e0e2bedc2d30f2b81c7aaf4144b4df07d6654031 SHA1 ffd282bc1d84a998683e701738e9a7b0acfb8930 SHA256 4c37c0572d4b1787948a11a8ab2d225701cca1a6f0307767afe4f8bd096bf79b
-MD5 2f2607646c84b5ff56abf9abc0c16ef3 ChangeLog 79216
-RMD160 e0e2bedc2d30f2b81c7aaf4144b4df07d6654031 ChangeLog 79216
-SHA256 4c37c0572d4b1787948a11a8ab2d225701cca1a6f0307767afe4f8bd096bf79b ChangeLog 79216
+EBUILD mysql-5.0.38.ebuild 2704 RMD160 1fba3ad4341411bf43bdbb43713f3185105aab54 SHA1 57b6de56db3d7b89b701cad5621f41b8537cebf6 SHA256 2eaa45c8ca4510beb2e6716b843e400ebc1c9200ea46f631641c38ce78b7aaf6
+MD5 d41d5bd3517e527e207bfc74d870d1d5 mysql-5.0.38.ebuild 2704
+RMD160 1fba3ad4341411bf43bdbb43713f3185105aab54 mysql-5.0.38.ebuild 2704
+SHA256 2eaa45c8ca4510beb2e6716b843e400ebc1c9200ea46f631641c38ce78b7aaf6 mysql-5.0.38.ebuild 2704
+MISC ChangeLog 79382 RMD160 559c2f5c5a792b7a8a0313960b486b44298059dc SHA1 b3504e563da59351fe1326db40e53981c5645901 SHA256 c51947e6fb51cbcbf88ee4297ee2b5dae5298b4b6635a4c6c508f295d3169087
+MD5 d53e005effecbbb44d9654c617e7ea76 ChangeLog 79382
+RMD160 559c2f5c5a792b7a8a0313960b486b44298059dc ChangeLog 79382
+SHA256 c51947e6fb51cbcbf88ee4297ee2b5dae5298b4b6635a4c6c508f295d3169087 ChangeLog 79382
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
@@ -82,3 +88,6 @@ SHA256 58b445942b6605ffec334f2805c0b937abb3e21f27238e61d18569d2b691b7d8 files/di
 MD5 6132a850af92c7f8d28c84a0b7bc49e5 files/digest-mysql-5.0.34 509
 RMD160 6cb8f998c942a149475971606705a16fcec719f3 files/digest-mysql-5.0.34 509
 SHA256 058bad5959836f6f68009c90d2287919c5069f282a44a8716efb209a7c1ab8e0 files/digest-mysql-5.0.34 509
+MD5 418b2e5e095f30b0da73c70c4fd5ada3 files/digest-mysql-5.0.38 509
+RMD160 121512a905253af9e9cd47b9c63190714e1f19fd files/digest-mysql-5.0.38 509
+SHA256 e623dc038199eb0e0d62b4490c664c535260aa64bd8610436014382af7fe06f3 files/digest-mysql-5.0.38 509
diff --git a/dev-db/mysql/files/digest-mysql-5.0.38 b/dev-db/mysql/files/digest-mysql-5.0.38
new file mode 100644
index 000000000000..6e7dbacea0ae
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.38
@@ -0,0 +1,6 @@
+MD5 9abf789eb57b7c21294ae50eb4a94462 mysql-5.0.38.tar.gz 23307140
+RMD160 7c69373e4c3de1d04b3494890d43ee61f49ce3de mysql-5.0.38.tar.gz 23307140
+SHA256 c8a4e746a1465b1768c356713b0e0b62818eb5132c8bb674747dabc5f37786c4 mysql-5.0.38.tar.gz 23307140
+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.38.ebuild b/dev-db/mysql/mysql-5.0.38.ebuild
new file mode 100644
index 000000000000..5cb31c17b6a8
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.38.ebuild
@@ -0,0 +1,75 @@
+# 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.38.ebuild,v 1.1 2007/04/15 12:52:25 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"
+
+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"
+		fi
+
+		# As of 5.0.38, these work with the sandbox
+		# Tested by robbat2, on ppc64-32ul and amd64.
+		##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 with sandbox enabled"
+		##done
+
+		# Both of these seem to work as of 5.0.38
+		##use "extraengine" && mysql_disable_test "federated" "fails with extraengine USE"
+		##use "ssl" && mysql_disable_test "ssl_des" "fails requiring PEM passphrase"
+	
+		# Revisit after 5.0.38
+		[ "${PV}" == "5.0.38" ] && use "extraengine" && mysql_disable_test "archive_gis" "fails with extraengine USE"
+
+		# We run the test protocols seperately
+		make test-ns force=--force
+		retstatus1=$?
+
+		[ "${PV}" == "5.0.38" ] && mysql_disable_test "errors" "fails under the PS protocol"
+		make test-ps force=--force
+		retstatus2=$?
+
+		# Just to be sure ;)
+		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
+}