From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 29FF8138010 for ; Fri, 2 Nov 2012 00:05:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87580E064B; Fri, 2 Nov 2012 00:05:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A468DE064B for ; Fri, 2 Nov 2012 00:05:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C064333C878 for ; Fri, 2 Nov 2012 00:05:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 03BF9E5448 for ; Fri, 2 Nov 2012 00:05:07 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1351814643.69974caf362024643b3f85ba33d564b371fd68f6.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/Manifest dev-db/mysql/metadata.xml dev-db/mysql/mysql-5.0.92.ebuild dev-db/mysql/mysql-5.1.65.ebuild dev-db/mysql/mysql-5.1.66.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 69974caf362024643b3f85ba33d564b371fd68f6 X-VCS-Branch: master Date: Fri, 2 Nov 2012 00:05:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dbe4de42-79c3-4a2a-b5b4-aa312a9d736e X-Archives-Hash: a5f3a6f46ee4aaf975f639d7f2cc1499 commit: 69974caf362024643b3f85ba33d564b371fd68f6 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Nov 2 00:04:03 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Nov 2 00:04:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=69974caf Clean up and fix patch versions. (Portage version: 2.2.0_alpha121/git/Linux x86_64, unsigned Manifest commit) --- dev-db/mysql/Manifest | 2 +- dev-db/mysql/metadata.xml | 5 + dev-db/mysql/mysql-5.0.92.ebuild | 196 -------------------------------------- dev-db/mysql/mysql-5.1.65.ebuild | 2 +- dev-db/mysql/mysql-5.1.66.ebuild | 2 +- 5 files changed, 8 insertions(+), 199 deletions(-) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index b2deced..3cbf597 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,4 +1,3 @@ -DIST mysql-5.0.92.tar.gz 22440590 SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55 SHA512 8fdc609761be56f64c71d5334611c1744f5496cef3adb68bbc52f5249d34174373e7b3fb15e6592d138cfd77d1b46d23bc9991ff49fd0d2636abe71304493fe2 WHIRLPOOL 58fb2dc8fabd376000418f5a7fd0aecda6b824704ebff2f3f2ca0776458f1e0e28e2fcfe7194253dd7437f6c14c8cc6625d19b59714ba421379f3b8f0f08a579 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517 DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 SHA512 62c623c32d9b79ccccc0fecd921d06cb40de91d1a92daf8b325ca7e8f17bc17bd35ab56fa524b40235ca933aabd71b3900f0c60901f8907da86a860dd93fc26a WHIRLPOOL 92b84e006147781c50f27600ed8cfd9c8e527d8e4a032d8560f20dd48080cf0b3d1d6008beaacf317af92ddd37fe9b2882e1b152db57763179d9f1b62eabe612 DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23 @@ -16,5 +15,6 @@ DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329f DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213 +DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml index 3da4f4a..f34987e 100644 --- a/dev-db/mysql/metadata.xml +++ b/dev-db/mysql/metadata.xml @@ -2,6 +2,11 @@ mysql + Make tables contain up to 1.844E+19 rows Add support for NDB clustering (deprecated) diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.92.ebuild deleted file mode 100644 index 311ddbf..0000000 --- a/dev-db/mysql/mysql-5.0.92.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -MY_EXTRAS_VER="live" - -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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="" - -# 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_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.0 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.0.*) - for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; 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 - - case $PV in - 5.0.91) - for t in archive archive_gis archive-big \ - federated_archive mysqldump-max \ - ; do - mysql_disable_test $t "Broken in 5.0.91" - done - ;; - esac - - # 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-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" - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - failures="" - [[ $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 -} diff --git a/dev-db/mysql/mysql-5.1.65.ebuild b/dev-db/mysql/mysql-5.1.65.ebuild index fc7e609..0a2d724 100644 --- a/dev-db/mysql/mysql-5.1.65.ebuild +++ b/dev-db/mysql/mysql-5.1.65.ebuild @@ -4,7 +4,7 @@ EAPI="4" -MY_EXTRAS_VER="live" +MY_EXTRAS_VER="20121101-2319Z" # PBXT PBXT_VERSION='1.0.11-6-pre-ga' # XtraDB diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild index fc7e609..0a2d724 100644 --- a/dev-db/mysql/mysql-5.1.66.ebuild +++ b/dev-db/mysql/mysql-5.1.66.ebuild @@ -4,7 +4,7 @@ EAPI="4" -MY_EXTRAS_VER="live" +MY_EXTRAS_VER="20121101-2319Z" # PBXT PBXT_VERSION='1.0.11-6-pre-ga' # XtraDB