Bug #238487, lots of patching fun to enable building of a shared embedded libmysqld for Amarok. Ported from the mysql-5.0.76 patch.

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

3 files changed, 159 insertions, 2 deletions

diff --git a/dev-db/mysql-community/ChangeLog b/dev-db/mysql-community/ChangeLog
index ff0cf5e7eb17..639e5e18c2cb 100644
--- a/dev-db/mysql-community/ChangeLog
+++ b/dev-db/mysql-community/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-community
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.25 2009/02/28 10:41:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.26 2009/04/12 07:46:29 robbat2 Exp $
+
+*mysql-community-5.0.77-r1 (12 Apr 2009)
+
+  12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-community-5.0.77-r1.ebuild:
+  Bug #238487, lots of patching fun to enable building of a shared embedded
+  libmysqld for Amarok. Ported from the mysql-5.0.76 patch.
 
 *mysql-community-5.0.77 (28 Feb 2009)
 
diff --git a/dev-db/mysql-community/Manifest b/dev-db/mysql-community/Manifest
index 0549fc11ccfe..4d5940cb4e82 100644
--- a/dev-db/mysql-community/Manifest
+++ b/dev-db/mysql-community/Manifest
@@ -17,6 +17,7 @@ DIST mysql-extras-20080601.tar.bz2 106566 RMD160 6e6470c8908e0e944ff8a71886db6e8
 DIST mysql-extras-20090211-1206Z.tar.bz2 111217 RMD160 243e1ace611f07f30c148c272d064fc916a47821 SHA1 2ba4041b6749575380fda0e6ae551284aaefcbfc SHA256 9a9a40aac283059492b10ff3dc059a90990dc3b7963405054ead1c750d63d081
 DIST mysql-extras-20090212-0556Z.tar.bz2 211564 RMD160 7641929dd98bc0b5b6fbe76a9b6c731334a3e6c6 SHA1 8f09c516d93390b5cad85387acf1d8d52f0c59b0 SHA256 f20a1483f04fbf8a44d1bce921813da644fc3a1dd0fe45929ef463d5600d2eba
 DIST mysql-extras-20090228-0714Z.tar.bz2 254114 RMD160 06ffc92f35e7d40910dcb66a80d1f8078caf7f0f SHA1 773e2bc42f8930a45d78f47435307644f554aa06 SHA256 9c7fd45ac4207556c55d5ba7f921831de50cb4cfe1284852b12bd0f548f11fba
+DIST mysql-extras-20090412-0644Z.tar.bz2 251842 RMD160 ec59bac7e056a04821d561133b79de332670f671 SHA1 3e87dc02ddfde094df1cd91271d0cb64ec3dcafc SHA256 264c4d2f39edc844f9ec284c6025a477a6512496d906dfbce882835e4bf0a2a2
 DIST pbxt-0.9.73-beta.tar.gz 2706652 RMD160 a4d974a8519b62868e948966910a84dbded05abe SHA1 f6ed2ba49ec82646581edcb06e054c46a5ba1ded SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d
 DIST pbxt-0.9.8-beta.tar.gz 2828272 RMD160 c0d5f0a67cc7cddecce9e198afe0ef3521a52cb4 SHA1 ada001c5e71dd1c6c201ebe5fafb67b359f10495 SHA256 976cf0539f2756e6a3b81014161f5ae8b77261aee6455c46a7e5de1054708b37
 EBUILD mysql-community-5.0.27-r1.ebuild 2065 RMD160 ecb37de175bfa063f3da81ff5ec553517f2a6154 SHA1 c6de0af065df49dd968a45013d9cd138e7556e29 SHA256 07992f25f92ef317fc817ed963331bd7fc879d87ee7cc642be97b0a68b519dc5
@@ -25,9 +26,10 @@ EBUILD mysql-community-5.0.51a.ebuild 3281 RMD160 3f70696b23e56aaf9f4585e34f3bd8
 EBUILD mysql-community-5.0.67.ebuild 3709 RMD160 3c1c497b93d70d6ab4d51fe9e6634dbddd201712 SHA1 b91122039c12a3559ce41c65dc9ee8e8d1d6950a SHA256 9a567202c203c72bc2b3d71766c5c1a4591a217beff22a81863f6e1f85038390
 EBUILD mysql-community-5.0.75-r1.ebuild 4946 RMD160 7baa27f295ad8200272621e68ceeb79dfa515863 SHA1 249308292e49fa88a53daa72c0f88fd2b23df178 SHA256 0a66065718e3a3771e0cbe71ca5a42a4a3ec1e00752c094fcbb70001c21f3e38
 EBUILD mysql-community-5.0.75.ebuild 4943 RMD160 7a5ba93dd5f6460fee0fb4dc50f975faa84d6fc7 SHA1 88a08bc254c42de09f8811216d088ee293f7ce45 SHA256 4698dfdc4e90e02b62384b189d29fe0d9941dcd8379f42c84acfab07eb0f3b0d
+EBUILD mysql-community-5.0.77-r1.ebuild 4946 RMD160 80ac1257d2769c436d10946d9fcca9b113ce0eeb SHA1 9bdc2582dc71aeac28f62f31306616a91ef25e56 SHA256 a8110c6739d1dbb519dd79a3fd6a9c6a9b8824c62ed8db3196642f2b93d0a45f
 EBUILD mysql-community-5.0.77.ebuild 4943 RMD160 8776ca0670740647929a04ccfb010c03b7a16930 SHA1 b5c201b8b771e4673b43d6f0e324e521c2ad82f8 SHA256 4702407a6c34cc310dfc313c0749d4d5634bb9669504f5c3df2a58b63cd0d14e
 EBUILD mysql-community-5.1.14_beta-r1.ebuild 2243 RMD160 fce130cbbf40a21ad00caac4507e4ec5d9d5e2ae SHA1 a6efcc19ba925789127da2498a0b5f3656ceb346 SHA256 6e6921b7e0e9f8df5fac72130c887e523aa0e89bddc9df30aa8649011d5ed166
 EBUILD mysql-community-5.1.15_beta.ebuild 2238 RMD160 ac8814006e3cef0a9c38b46043b6a39cf5d95e5b SHA1 5d39e06de717de60ab2e27a2f62e2ec08cda3633 SHA256 de9d28c7b0f8b8ebebaf67b63025a1b83815cc2107d03d8817b18598cf11b168
 EBUILD mysql-community-5.1.21_beta.ebuild 2417 RMD160 3e8a6348c0f0d1ce4e88e88c60eb70abe15f9cc7 SHA1 1fc209435fe778389bf65c7baced30d244315395 SHA256 de6226108483cb459e12a013e0cb5d3b58f2269fe00946f1c83e821da2729411
-MISC ChangeLog 5909 RMD160 d8aa0b736871f38e835dae11d94dc5fbf89b3cd7 SHA1 1567e974fc0c5cbaeea129efc42060a38fb61545 SHA256 87c19a6f3d1402d7f83670e5a2f47579d2e82f88ad46d18d4ccfe4ff805e0f3a
+MISC ChangeLog 6178 RMD160 730bb3b11b69f87425e7127573ae194b0a44e33b SHA1 29e6e9639b5e16be0e1ded79b3276280819cb73f SHA256 c38c6fefb679ce10848c1e43a6a231479803c0a4b271101202f675933b3dec7b
 MISC metadata.xml 750 RMD160 eceaf08cb4bf34e17aba164ca333dedec402ff9e SHA1 b315be48cc8f4b8a51495345881f7108bad84e0b SHA256 ba5444de7010aab54b4a95a4a96f00247d8068fd9cc9ab9cf2747844e9695469
diff --git a/dev-db/mysql-community/mysql-community-5.0.77-r1.ebuild b/dev-db/mysql-community/mysql-community-5.0.77-r1.ebuild
new file mode 100644
index 000000000000..0f2fbb0b274d
--- /dev/null
+++ b/dev-db/mysql-community/mysql-community-5.0.77-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.0.77-r1.ebuild,v 1.1 2009/04/12 07:46:29 robbat2 Exp $
+
+MY_EXTRAS_VER="20090412-0644Z"
+#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-7])
+				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
+
+		# Community-only: test broken
+		[ "${PV}" == "5.0.75" ] && \
+			mysql_disable_test \
+				"func_in" \
+				"Broken in 5.0.75 under prepared statements only"
+
+		# 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
+}