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 828FB1381F3 for ; Thu, 6 Jun 2013 20:32:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61368E09C0; Thu, 6 Jun 2013 20:32:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A33B3E081D for ; Thu, 6 Jun 2013 20:32:26 +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 4B9A333E300 for ; Thu, 6 Jun 2013 20:32:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DF44EE468F for ; Thu, 6 Jun 2013 20:32:23 +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: <1370274549.0471c0f4c0bb82e1e56e171bc20a74ceeb29ea9e.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/ChangeLog dev-db/mysql/Manifest dev-db/mysql/mysql-5.1.69.ebuild dev-db/mysql/mysql-5.5.31.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 0471c0f4c0bb82e1e56e171bc20a74ceeb29ea9e X-VCS-Branch: master Date: Thu, 6 Jun 2013 20:32:23 +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: fb46cbc2-f7a4-4377-afc5-cf2fd005500e X-Archives-Hash: 114db729327fbf14ff96d242a371cff4 commit: 0471c0f4c0bb82e1e56e171bc20a74ceeb29ea9e Author: Robin H. Johnson gentoo org> AuthorDate: Mon Jun 3 15:49:09 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jun 3 15:49:09 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0471c0f4 Bump. Package-Manager: portage-2.2.0_alpha177 --- dev-db/mysql/ChangeLog | 6 ++ dev-db/mysql/Manifest | 2 + dev-db/mysql/mysql-5.1.69.ebuild | 3 +- dev-db/mysql/mysql-5.5.31.ebuild | 129 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 86fc580..2f8b6cf 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*mysql-5.5.31 (03 Jun 2013) + + 03 Jun 2013; Robin H. Johnson +mysql-5.5.31.ebuild, + mysql-5.1.69.ebuild: + Bump. + *mysql-5.1.69 (28 May 2013) 28 May 2013; Robin H. Johnson +mysql-5.1.69.ebuild: diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 45f0686..89e9740 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -4,6 +4,7 @@ DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5 DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b +DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f @@ -13,5 +14,6 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80 +DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a 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/mysql-5.1.69.ebuild b/dev-db/mysql/mysql-5.1.69.ebuild index 4572194..1432faf 100644 --- a/dev-db/mysql/mysql-5.1.69.ebuild +++ b/dev-db/mysql/mysql-5.1.69.ebuild @@ -4,8 +4,7 @@ EAPI="4" -MY_EXTRAS_VER="20130128-0054Z" -MY_EXTRAS_VER="live" +MY_EXTRAS_VER="20130602-1946Z" # PBXT PBXT_VERSION='1.0.11-6-pre-ga' # XtraDB diff --git a/dev-db/mysql/mysql-5.5.31.ebuild b/dev-db/mysql/mysql-5.5.31.ebuild new file mode 100644 index 0000000..4543052 --- /dev/null +++ b/dev-db/mysql/mysql-5.5.31.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $ + +EAPI="4" + +MY_EXTRAS_VER="20130602-1946Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" + +# Build type +BUILD="cmake" + +inherit toolchain-funcs mysql-v2 +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# Define the mysql-extras source +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" + +# 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-linux" + +# 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="${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() { + + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # 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" + + 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" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + # create directories because mysqladmin might right out of order + mkdir -p "${S}"/mysql-test/var-tests{,/log} + + # These are failing in MySQL 5.5 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help-notwin + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # sys_vars.plugin_dir_basic + # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin + # instead of MYSQL_LIBDIR/plugin + # + # main.flush_read_lock_kill + # fails because of unknown system variable 'DEBUG_SYNC' + # + # main.openssl_1 + # error message changing + # -mysqltest: Could not open connection 'default': 2026 SSL connection + # error: ASN: bad other signature confirmation + # +mysqltest: Could not open connection 'default': 2026 SSL connection + # error: error:00000001:lib(0):func(0):reason(1) + # + + for t in main.mysql_client_test \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help-notwin main.flush_read_lock_kill \ + sys_vars.plugin_dir_basic main.openssl_1 ; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + + # Run mysql tests + pushd "${TESTDIR}" + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd + + # 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_tests -eq 0 ]] || failures="${failures} tests" + 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 +}