Bug #238487, lots of patching fun to enable building of a shared embedded libmysqld for Amarok.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

3 files changed, 153 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0399f45aaace..d7bfa2fa7000 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.485 2009/03/01 10:50:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.486 2009/04/12 00:11:20 robbat2 Exp $
+
+*mysql-5.0.76-r1 (12 Apr 2009)
+
+  12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-5.0.76-r1.ebuild:
+  Bug #238487, lots of patching fun to enable building of a shared embedded
+  libmysqld for Amarok.
 
   01 Mar 2009; Raúl Porcel <armin76@gentoo.org> mysql-5.0.70-r1.ebuild:
   s390/sh stable wrt #246652
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1b7b2254d284..019ac799b614 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -33,6 +33,7 @@ DIST mysql-extras-20080601.tar.bz2 106566 RMD160 6e6470c8908e0e944ff8a71886db6e8
 DIST mysql-extras-20081129-1041Z.tar.bz2 110743 RMD160 e159b801785109860325e44fc76b96fc940f012f SHA1 38db6b3328cf6523e076f23d9cf43ae76c74678a SHA256 4975eec32d2359924fd7e40b44d8764b6511ca6a62f71611a991427409ef5202
 DIST mysql-extras-20090211-1206Z.tar.bz2 111217 RMD160 243e1ace611f07f30c148c272d064fc916a47821 SHA1 2ba4041b6749575380fda0e6ae551284aaefcbfc SHA256 9a9a40aac283059492b10ff3dc059a90990dc3b7963405054ead1c750d63d081
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 RMD160 d71ed448d9fbe61ecc9e4113bd0a7721e8321acb SHA1 9fd9370193e7038067e11cc8a26bfe4013eb6bac SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb
+DIST mysql-extras-20090412-0009Z.tar.bz2 256637 RMD160 da0e1bbc6db770171e34c2f58e35f5417ed22f0a SHA1 61c2a15ac6cb34ec2c4b83ac314f6c5d1d3b2ab3 SHA256 9a615dceed183648b1ee83dafbdadfd735a8db312032a871934b63dd847adc42
 EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20bbdd SHA1 b532250266fb20af81b4b6b9b56d47de048789ce SHA256 9250045fb9af28896c2f266c8c9b33409b525f1481b2ba70d104ec9ba5b4a6d8
 EBUILD mysql-4.0.27-r1.ebuild 1105 RMD160 55f3ea683ea8c57bc2197a64b81b50a0933a57b2 SHA1 0adb182c9cb4640e6f3a1e6b6f501190a3c46067 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce
 EBUILD mysql-4.1.22-r1.ebuild 1342 RMD160 2aec2ceab698b82b529b613087a05579eab25ed3 SHA1 815a8bc946926b4d1f0f68108d95e4f0d106bfb0 SHA256 ed529ffb30b24c8a8331a9481c6c9ac0a4707e04d7216bc02659d2a648e32fa8
@@ -54,6 +55,7 @@ EBUILD mysql-5.0.70-r1.ebuild 3975 RMD160 dd01f049c67e1d17b4383fc5904819be83364d
 EBUILD mysql-5.0.70.ebuild 3970 RMD160 ddabf55e091572995190cdd3ea5c22a1b8609df0 SHA1 cecf270df7077a8ebacb662a4797c51ad60fc5c4 SHA256 1b7a92996a94a1d77a727526ccab133ed25c88f22d1e0433929f6be8ead1545c
 EBUILD mysql-5.0.72-r1.ebuild 4228 RMD160 777947854d36e754bb7a9ed2378c1d80105ff8db SHA1 e3bbd28ac89bd83f8b8cafca71ce723d3cb50b7f SHA256 48ebf09db7b166ad33305ad822fd00f2fa5f455e9a218b1eff2f63231e3bd39c
 EBUILD mysql-5.0.72.ebuild 4219 RMD160 a1add74e93dd984f8a9653a6fc53e608b2675cc8 SHA1 65875c2815495fbf145b0f9f7471af193f50b1be SHA256 d8fa074aa6841d80875eead80d22392bd3482c00641812229dc2132f0523ea8b
+EBUILD mysql-5.0.76-r1.ebuild 4767 RMD160 5d89afffb3f0b64f17b034a8872df07b3d8d38fd SHA1 70d59716d736c4d876e04a6a7147613788b257b9 SHA256 c8828a2cc2907cd2aace14b9a660ed893f4f84738a668a8bac6e61ec81f7a852
 EBUILD mysql-5.0.76.ebuild 4766 RMD160 97719cfd24cbcbe72645251cf90070e90af44acd SHA1 18d934e2bb4f520584c0d3c73b3338768cf0c030 SHA256 ec3a5e50be57929419e0b7de9e5d7f7cec4165948b237bd4c93d0e8a09b24b8c
-MISC ChangeLog 92900 RMD160 351db75af5566a90ea2893caf2b4e9146d554fe3 SHA1 08447ad9d7f06501c538ac24ccce68fc89ed0c6d SHA256 b6024ee9fd05ed23e12a41e7ff9c46963777a02c267ca572753a03db4a1c0a49
+MISC ChangeLog 93113 RMD160 53224aaf012cec5decdfaac64b2078df508f6bfd SHA1 16fba8e0b81af35215713d8ed6d99f1027b9140d SHA256 3dd88e58efda174a7af017d18ee0a1bef41eb87aa3cb8ad0def4e1a2fd919090
 MISC metadata.xml 746 RMD160 24dadde02462666d5b05608b73a87094de82af1a SHA1 596f0628975fc92ff1cb4d665f7fa5d7eac04505 SHA256 070b3c63ddedff2023166fd0f82bd9dc6a691079c10a6ee968ca7b28e97af5a6
diff --git a/dev-db/mysql/mysql-5.0.76-r1.ebuild b/dev-db/mysql/mysql-5.0.76-r1.ebuild
new file mode 100644
index 000000000000..c3e5db99bc56
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.76-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.76-r1.ebuild,v 1.1 2009/04/12 00:11:20 robbat2 Exp $
+
+MY_EXTRAS_VER="20090412-0009Z"
+SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
+
+inherit toolchain-funcs mysql
+# 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 ~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
+
+# Official test instructions:
+# USE='berkdb cluster embedded extraengine' \
+# 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 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.4[3-9]|5.0.[56]*|5.0.70)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 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
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# SSL certs expired shortly after the release of 5.0.76. Affects older
+		# versions as well.
+		case ${PV} in
+			5.0.?|5.0.[1-6]*|5.0.7[0-6])
+				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 in 5.0.76 due to expired certificates"
+				done
+			;;
+		esac
+
+		# 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
+}