From cca9275b9a0ba19e38f3ee9ad32837cbb55c354e Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 27 Feb 2010 18:23:30 +0000 Subject: [PATCH] Now with PBXT support again. XtraDB 1.0.6-9 confirmed to not work yet. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- dev-db/mysql/ChangeLog | 8 +- dev-db/mysql/Manifest | 5 +- dev-db/mysql/mysql-5.1.44-r1.ebuild | 208 ++++++++++++++++++++++++++++ 3 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 dev-db/mysql/mysql-5.1.44-r1.ebuild diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 775bdcf07096..22314c133a87 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.510 2010/02/23 06:05:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.511 2010/02/27 18:23:30 robbat2 Exp $ + +*mysql-5.1.44-r1 (27 Feb 2010) + + 27 Feb 2010; Robin H. Johnson + +mysql-5.1.44-r1.ebuild: + Now with PBXT support again. XtraDB 1.0.6-9 confirmed to not work yet. 23 Feb 2010; Robin H. Johnson metadata.xml: Resync the metadata.xml between mysql packages. diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 8fec00ea6416..a807193693e2 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -33,6 +33,8 @@ DIST mysql-extras-20100131-0301Z.tar.bz2 945724 RMD160 7b6e5ac3d293dcb2f3821d3f2 DIST mysql-extras-20100131-0616Z.tar.bz2 945566 RMD160 700191ce374392b58b34ee3f448ff9e416c0c165 SHA1 d90791ab0f0f2206f08de642a0fbeb96b2884a9f SHA256 f087303677a29abaf6bb5c63399c66398a5f80835d0da3f5c7525503c6fed46b DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70 DIST mysql-extras-20100221-0021Z.tar.bz2 936455 RMD160 30bdf170c054f1593210ab523e43dc25cf108268 SHA1 bc0fb61692fbef6d6f09ec896951c7f5338bee4a SHA256 9fb417ef6e3f4dfe0dd61d0b4d6cd34ba088d0e2718b4c6e5d4cfe8fdab5c3c0 +DIST mysql-extras-20100227-1814Z.tar.bz2 936406 RMD160 d0bda421ae4c5883fc6419a59c34cd8418aa351c SHA1 ccbabd80d4de4a7df98220cd50c352c2032c081f SHA256 8c0b3c0ab898361152044261ac98a8a3256ad58e38a59ea18587c54b18619beb +DIST pbxt-1.0.10-rc.tar.gz 3146894 RMD160 6837a8b6ac3346c7298180fb39b7b84213ae3f56 SHA1 9bad6a2a8a340f151fbf8a7afd9099daf064b34d SHA256 a351895c3a9d8e2ffe156c518a3ccbad896a716ec55c9af135113360014a58ff DIST percona-xtradb-1.0.4-8.tar.gz 1355440 RMD160 7705e9b1db9adc83f0511ef675897947265b70b6 SHA1 ce2cfab0ba93f69a77e8ad3d5570eff2b89bf899 SHA256 d700a5e7d868a27fd241c25f3e470c34bfb20a8f93c998b1df2a40d0b6f80b7b 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 @@ -52,8 +54,9 @@ EBUILD mysql-5.0.90-r1.ebuild 5496 RMD160 1c1cfb2eb1bd2717ce35d81e562bc09aa5ca6f EBUILD mysql-5.0.90-r2.ebuild 5488 RMD160 22d460e700cf0feae26b3293737800608c0c28ba SHA1 fa4bdc7b9ceb334c7ec43388f735444cbc19a0c0 SHA256 c15d082c72eadcd26b1b87b8111ce05097d5a5e1172471feae0d8401d478258e EBUILD mysql-5.0.90.ebuild 5493 RMD160 40d970335ca4767420bacdf3857f71d95e03399d SHA1 6a416627ca5503ee5895b3516e6c7013475a81b4 SHA256 4ceea2fd14dc7a6cabd0ae5fc3e663af8929d8ab923b7b7b70e121a577a854cc EBUILD mysql-5.1.39-r1.ebuild 6821 RMD160 5d47332472f0b5bafa27bded75d5f04ce4830c27 SHA1 ad1b191679be05b376dc4b5e5c2364d9e3373953 SHA256 949f9c1181b8870ce5f920a6479dc9b08bad607820894081abba379b9e5dbcd7 +EBUILD mysql-5.1.44-r1.ebuild 7122 RMD160 2a48c9fea7c2e4818f368e639d6cb49e05421e40 SHA1 c71a456b958a5c1723fe05248f85a207fa831b84 SHA256 5cf30c2dff292c1e61933365f6cc501aa56ebb12cbb1ad93d744042f8a62b6f5 EBUILD mysql-5.1.44.ebuild 6773 RMD160 1923a4a903a9e8ebbd6a9b96bdbab9e7d7c33865 SHA1 921074ee43b22f56eb8bfc1bfc105c517d003968 SHA256 429d75ae3825db89c69c56ab5ebf5dbe9a174e35e70e55713ccfeea69ea0388b EBUILD mysql-5.4.3_beta.ebuild 6548 RMD160 4979565cc3b924fd638e9a84379ad0d052ccf651 SHA1 badc1510e9b1beb36e5a90f1d5aa69b378a760cf SHA256 45cf51205429b782f23b51b6d149851027a6085b4b80341e23ab3eae337a94b0 EBUILD mysql-5.5.1_alpha_pre2.ebuild 6776 RMD160 0984335c429f8632f3ab8651fb41a03501d55d94 SHA1 e6160bc3ca42a6f8e5f3d5b8abc424ef7b5edc85 SHA256 212815319e62f0da22e754aae9944907d392cd2a4661a0776e67aefaa0c06c2a -MISC ChangeLog 99182 RMD160 190df955267858371c2678a7de034446c1154239 SHA1 308ffe5b0a27c201b9fcd98568ed2eb57a3d3322 SHA256 01bae1c7755b454cb19edbed494ee1896dbeec1f3cbe46a477682ecdabcb6749 +MISC ChangeLog 99368 RMD160 ae01585b76ab434289541a4df664186f0d978d43 SHA1 fbfdea34767ab3296631fff622fa47ac76c7a8e3 SHA256 5e7fc89939066ca228bc9ca5572f6ffaa5dcdb2c78b6dc90bd5d71711d4d27b5 MISC metadata.xml 1389 RMD160 711fe2927a95bff06abbba5209a1e03fd99ba7b5 SHA1 adaf717edeadad3ebe8e7b486d75477b2ec5433b SHA256 562726facccb1c1808b74c0e17f052ca03c92c0ada689375e527b2a5405a5a0a diff --git a/dev-db/mysql/mysql-5.1.44-r1.ebuild b/dev-db/mysql/mysql-5.1.44-r1.ebuild new file mode 100644 index 000000000000..2d6efef8e20d --- /dev/null +++ b/dev-db/mysql/mysql-5.1.44-r1.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.44-r1.ebuild,v 1.1 2010/02/27 18:23:30 robbat2 Exp $ + +MY_EXTRAS_VER="20100227-1814Z" +EAPI=2 + +# PBXT +PBXT_VERSION='1.0.10-rc' +# XtraDB +# handler/i_s.cc: In function 'int i_s_innodb_buffer_pool_pages_index_fill(THD*, TABLE_LIST*, COND*)': +# handler/i_s.cc:801: error: invalid conversion from 'const char*' to 'char*' +# handler/i_s.cc: In function 'int i_s_innodb_admin_command_fill(THD*, TABLE_LIST*, COND*)': +# handler/i_s.cc:2995: warning: deprecated conversion from string constant to 'char*' +# PERCONA_VER='5.1.42-9' XTRADB_VER='1.0.6-9' + +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 ~x86 ~sparc-fbsd ~x86-fbsd" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +DEPEND="|| ( >=sys-devel/gcc-4 >=sys-devel/gcc-apple-4 )" +RDEPEND="!media-sound/amarok[embedded]" + +# 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 perl ssl community' \ +# 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 retstatus_unit + local retstatus_ns + local retstatus_ps + 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|5.0.87) + [ "$(tc-endian)" == "big" ] && \ + mysql_disable_test \ + "archive_gis" \ + "Broken in 5.0.43-70 and 5.0.87 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" + + # The entire 5.0 series has pre-generated SSL certificates, they have + # mostly expired now. ${S}/mysql-tests/std-data/*.pem + # The certs really SHOULD be generated for the tests, so that they are + # not expiring like this. We cannot do so ourselves as the tests look + # closely as the cert path data, and we do not have the CA key to regen + # ourselves. Alternatively, upstream should generate them with at least + # 50-year validity. + # + # Known expiry points: + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 + # + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be + # expired/invalid. + case ${PV} in + 5.0.*|5.1.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ + ssl_compress ssl_connect ; do \ + mysql_disable_test \ + "$t" \ + "These OpenSSL tests break due to expired certificates" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.1.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.1.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + 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 + emake test-unit + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" + retstatus_ns=$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" + retstatus_ps=$? + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + # TODO: + # When upstream enables the pr and nr testsuites, we need those as well. + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" + [[ $retstatus_ps -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 +} -- 2.26.2