From a1bb58385ba02ded0ee8cfffd800d0f88fb4315e Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 27 Apr 2010 05:48:00 +0000 Subject: [PATCH] Latest release from upstream. Please note that plugin handling has changed a lot now in the eclass, and with it PBXT and XtraDB are handled slightly differently for building. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-db/mysql/ChangeLog | 9 +- dev-db/mysql/Manifest | 6 +- dev-db/mysql/mysql-5.1.46.ebuild | 222 +++++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 dev-db/mysql/mysql-5.1.46.ebuild diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 616a22caeebf..925e96d134a5 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,13 @@ # 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.531 2010/04/26 18:59:06 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.532 2010/04/27 05:48:00 robbat2 Exp $ + +*mysql-5.1.46 (27 Apr 2010) + + 27 Apr 2010; Robin H. Johnson +mysql-5.1.46.ebuild: + Latest release from upstream. Please note that plugin handling has changed + a lot now in the eclass, and with it PBXT and XtraDB are handled slightly + differently for building. 26 Apr 2010; Fabian Groffen mysql-5.1.45-r1.ebuild: Marked ~x86-solaris diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index dacb1f36118e..04eed34c1789 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -18,6 +18,7 @@ DIST mysql-5.0.90.tar.gz 22299626 RMD160 634655530100e5c00bfab9e2c498efa8c5208ba DIST mysql-5.1.39.tar.gz 21968309 RMD160 255f643582bc5d59932d3a1719420fb9ea2dbcbe SHA1 29389e1af27ebe7d20e7e2637a8d89de35e34180 SHA256 341b35e76c7186805f791def382a37ecc8149fcb17cbd0dfd9cde1698babbd0b DIST mysql-5.1.44.tar.gz 23400457 RMD160 f98d25322893b422ee708d683ee73ec9e17ad40a SHA1 265fbca02b2ef62926e2845d5fdf394298eb3206 SHA256 15dfccb34082a633a3f1793c21c7bf1432bf009a35acef0068885b7b68ecb540 DIST mysql-5.1.45.tar.gz 22457274 RMD160 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba SHA1 2a34650dc1a7e056788882522211d07791e0b352 SHA256 7dc2fabbdd8ab1d2878ee749be9c56ffc9efe970f7f0f094aa94b18b3cd15a72 +DIST mysql-5.1.46.tar.gz 23510197 RMD160 1237834db314282f6213724ed3f249d1443c41ad SHA1 5df6cf8a24b80cb74301c8275b26391262c5ff76 SHA256 d06651225f84f33fcf590c8630f70614c66775d39d1365a81669c90ae9f5e42c DIST mysql-5.4.3-beta.tar.gz 21750728 RMD160 dc191579cc429441da7d20a1f50b25754fe37ad0 SHA1 daf96fb8adcdad23afed921727fe767ff0939711 SHA256 525e84f4c1fa135a492ead6945e03d91d5e72dc31397ca2d713b3124bbc3fcb5 DIST mysql-5.5.1-m2.tar.gz 21459964 RMD160 aa36e78efe6fdbfc020cd1599fa63dd9aa60e91b SHA1 6eb787a884523ea30b4a8b900a928a0caa159e3a SHA256 26e8d98ae2341b8ee292bc173531560011e0150da63f2d873fad191d8dbce081 DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb @@ -38,8 +39,10 @@ DIST mysql-extras-20100221-0021Z.tar.bz2 936455 RMD160 30bdf170c054f1593210ab523 DIST mysql-extras-20100227-1814Z.tar.bz2 936406 RMD160 d0bda421ae4c5883fc6419a59c34cd8418aa351c SHA1 ccbabd80d4de4a7df98220cd50c352c2032c081f SHA256 8c0b3c0ab898361152044261ac98a8a3256ad58e38a59ea18587c54b18619beb DIST mysql-extras-20100324-0213Z.tar.bz2 1054780 RMD160 8c3247e2795d64d6525903a5148de315b6429a43 SHA1 4d3300312df9a3fe63dcee96e60da2ba0f6d3ec1 SHA256 3bb9f6b354bc106b386ca65da71478d7be4ee78e6eb41505aa19e35aa6e53574 DIST mysql-extras-20100324-0329Z.tar.bz2 1054143 RMD160 fd45d2aab6a62093ac7510a7777859037df23abd SHA1 80a092893435ea7f9907af817f1fe41fd9cbc7b4 SHA256 bbf9529cad2d072d49fdf844f694a6f984740ea18b218d7cf07124a9ac838881 +DIST mysql-extras-20100427-0534Z.tar.bz2 1049886 RMD160 312c0b7b30203171d2146b2dd180a349e00feed4 SHA1 ded5170f83b7b7cf48099ad3f36e773d50475c76 SHA256 a77f7f6e6390cce234ec7bbc1c1c3ae2c46172e08cadd28d8d445444087e90f3 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 +DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c 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 @@ -64,7 +67,8 @@ EBUILD mysql-5.1.44-r3.ebuild 7387 RMD160 8184ae60562613fbd24c3f98640c4e57fa79d1 EBUILD mysql-5.1.44.ebuild 6431 RMD160 5f800c47f2304851c0edc489a199f5c072adde8f SHA1 9b270dca316fcfcd719f1e326dff937d57c95113 SHA256 e8ef8e5883ca6adc8c0a8308d9e385c967b1af2bf22cf3e19c9b8926955d0e13 EBUILD mysql-5.1.45-r1.ebuild 7400 RMD160 78f9ca7598f86a04cf045d616edf6432aa5ab993 SHA1 3b862f941bb4819d0328377c85eef556fda492fe SHA256 44bb005728308a86108c4f80b2ad2c58b8e87be3af7a96a44553e060ab85659b EBUILD mysql-5.1.45.ebuild 7384 RMD160 cc8d604e14572d4f23fde61db5b6704ad3a8e5f2 SHA1 bb5f99fc484fc0e319f273173ceeae900f435dc5 SHA256 8bba233ba2b38695529ba34b3387478e43843cda708abac87ab7a7a3c2f0c231 +EBUILD mysql-5.1.46.ebuild 7576 RMD160 19a6f609b345819deb96087a5733d5c22413932f SHA1 6b7abff55b4e2701bf5f60343ba3c2b67bed16dc SHA256 8a1fddcafa8f65856acf4ed77f7927aefa674dbd5652f523f0a9838b61cea6d4 EBUILD mysql-5.4.3_beta.ebuild 6675 RMD160 d8684e092a0200a3583c669a73471b9fcb6fe4f6 SHA1 e2829c54379498f5b0b4b2272fac599f87fd1f1f SHA256 9d62a845db7bb3752f78f2814858c7ab4f3efc70fa9a1e16f935b5a4dee8face EBUILD mysql-5.5.1_alpha_pre2.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086 -MISC ChangeLog 104084 RMD160 31ccabe1e61db5e7d68d54033fb38de590327e1a SHA1 1a5c4a44d0cf6d1a26943aad6873bdd4ebcca4f4 SHA256 8ff42e0743e1be8fdedd4a1f259581e149b0cccb231aab3623f806a880ad6e92 +MISC ChangeLog 104370 RMD160 9a638a0421d9dc344450ab77d7d7fcc8ddbfc2a0 SHA1 31adc24f94226251dfacb5c7d80f1dbb2f1e9ee5 SHA256 8aac8fcd2fec3472b3583bba46da592480a6fa8ca48700d3ccfee3e7ec2f7ce4 MISC metadata.xml 1389 RMD160 711fe2927a95bff06abbba5209a1e03fd99ba7b5 SHA1 adaf717edeadad3ebe8e7b486d75477b2ec5433b SHA256 562726facccb1c1808b74c0e17f052ca03c92c0ada689375e527b2a5405a5a0a diff --git a/dev-db/mysql/mysql-5.1.46.ebuild b/dev-db/mysql/mysql-5.1.46.ebuild new file mode 100644 index 000000000000..1ac32448fc7e --- /dev/null +++ b/dev-db/mysql/mysql-5.1.46.ebuild @@ -0,0 +1,222 @@ +# 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.46.ebuild,v 1.1 2010/04/27 05:48:00 robbat2 Exp $ + +MY_EXTRAS_VER="20100427-0534Z" +EAPI=2 + +# PBXT +PBXT_VERSION='1.0.10-rc' +# XtraDB +PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10' + +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 ~x86-solaris" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +# This is often broken still +EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch ' + +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" +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.*|5.4.*|5.5.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; 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, main.information_schema, + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # main.not_partition: + # Failure reason unknown at this time, must resolve before package.mask + # removal FIXME + case ${PV} in + 5.1.*|5.4.*|5.5.*) + for t in main.mysql_client_test main.mysql_comments \ + main.mysql_upgrade \ + main.information_schema \ + main.not_partition funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql funcs_1.is_triggers; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" + + if [ "${PN}" == "mariadb" ]; then + for t in \ + parts.part_supported_sql_func_ndb \ + parts.partition_auto_increment_ndb ; do + mysql_disable_test $t "ndb not supported in mariadb" + done + fi + + # This fail with XtraDB in place of normal InnoDB + # TODO: test if they are broken with the rest of the Percona patches + if xtradb_patch_available && use xtradb ; then + for t in main.innodb innodb.innodb_bug51378 \ + main.information_schema_db main.mysqlshow \ + main.innodb-autoinc main.innodb_bug21704 \ + main.innodb_bug44369 main.innodb_bug46000 \ + main.index_merge_innodb ; do + mysql_disable_test $t "tests broken in xtradb" + done + fi + + # create directories because mysqladmin might make 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