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 E70B01381FD for ; Fri, 27 Jul 2012 16:11:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4A16E0586; Fri, 27 Jul 2012 16:09:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 85954E057F for ; Fri, 27 Jul 2012 16:09:08 +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 046E41B402F for ; Fri, 27 Jul 2012 16:09:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3190BE543F for ; Fri, 27 Jul 2012 16:09:05 +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: <1340631417.c76e8c81d7e65b6159fe51ebcfd9e005bb786301.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/Manifest dev-db/mariadb/mariadb-5.5.24.ebuild dev-db/mariadb/mariadb-5.5.25.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: c76e8c81d7e65b6159fe51ebcfd9e005bb786301 X-VCS-Branch: master Date: Fri, 27 Jul 2012 16:09:05 +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: 03dfd0b1-0fa6-4166-8e50-cb6fe43e2404 X-Archives-Hash: f0fc86d747845bed1aecd79de242ca22 commit: c76e8c81d7e65b6159fe51ebcfd9e005bb786301 Author: Brian Evans lavabit com> AuthorDate: Mon Jun 25 13:36:57 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jun 25 13:36:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c76e8c81 Version bump --- dev-db/mariadb/Manifest | 4 + dev-db/mariadb/mariadb-5.5.24.ebuild | 134 ++++++++++++++++++++++++++++++++++ dev-db/mariadb/mariadb-5.5.25.ebuild | 134 ++++++++++++++++++++++++++++++++++ 3 files changed, 272 insertions(+), 0 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index bea7cdd..5959949 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -5,6 +5,8 @@ DIST mariadb-5.1.62.tar.gz 24931609 RMD160 873961f72de719fed085085c8cb8560c7cef5 DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797 +DIST mariadb-5.5.24.tar.gz 27438507 RMD160 237dd9e77c110c11d078362cb7c84c3dcefbf785 SHA1 70b5190c58508ae269853e3fbd75c1f850306ff5 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b +DIST mariadb-5.5.25.tar.gz 27488554 RMD160 9ba60ac2d768b4f89b76ed65f14de3c18e8590b2 SHA1 18101986c45d97766eb67293d8995b8835ab592a SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 DIST mysql-extras-20120425-1449Z.tar.bz2 1836573 RMD160 13bc759ef9c4ce7dddaca46e49f60ff3e5b8133c SHA1 119f009ab4f07ccccdc276445afdaf5bd86e1c54 SHA256 92d7a3f425225bc4d9774e1b7617a7aaaa65097bc62ca7106698c976afc47e50 @@ -16,5 +18,7 @@ EBUILD mariadb-5.2.12.ebuild 6046 RMD160 474a23da89d8530a8f368c0a2a691646cfaf36e EBUILD mariadb-5.3.6-r1.ebuild 6072 RMD160 2c28f7e09f0e6b57d22592411184c5bda7757756 SHA1 0d1571e7991e3f37288d9bb1f9f1dac373e1b584 SHA256 0c3dcdb04bb346749842f2261f4c05f93e412518d7f709d0e75bc7e69115f665 EBUILD mariadb-5.3.6.ebuild 6072 RMD160 c38b9b1e538b68d1e51df194f49c674f021c598f SHA1 087692428be05007f463e7bf1a3de14398a55ce2 SHA256 f10c3de112d2fb09486bea4387b85f54521bd8a97f5ace2eff4d5714a92cf16e EBUILD mariadb-5.5.23.ebuild 4531 RMD160 e0933a095d5d7267d6a4d02ea62a1c9eceea48e5 SHA1 ed731058038a62f1d8b5eebf9e6b20c14ef6bd65 SHA256 1a4c62cdb210f9742e72db123af39e7a867b64a1ecb76b2828da42dfab58d345 +EBUILD mariadb-5.5.24.ebuild 4531 RMD160 e0933a095d5d7267d6a4d02ea62a1c9eceea48e5 SHA1 ed731058038a62f1d8b5eebf9e6b20c14ef6bd65 SHA256 1a4c62cdb210f9742e72db123af39e7a867b64a1ecb76b2828da42dfab58d345 +EBUILD mariadb-5.5.25.ebuild 4531 RMD160 e0933a095d5d7267d6a4d02ea62a1c9eceea48e5 SHA1 ed731058038a62f1d8b5eebf9e6b20c14ef6bd65 SHA256 1a4c62cdb210f9742e72db123af39e7a867b64a1ecb76b2828da42dfab58d345 MISC ChangeLog 5202 RMD160 b1347ba86cc4baee8678289b8d8dd7363b3cc7cd SHA1 42300e5bfa29446eb01daaf0771fe6e2050341d5 SHA256 7446f05fafadc91d5d386f5c24ffbcaaf12820e9fef8c12ab003f6dc3802b042 MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a diff --git a/dev-db/mariadb/mariadb-5.5.24.ebuild b/dev-db/mariadb/mariadb-5.5.24.ebuild new file mode 100644 index 0000000..46fb196 --- /dev/null +++ b/dev-db/mariadb/mariadb-5.5.24.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +MY_EXTRAS_VER="20120416-2021Z" + +# Build system +BUILD="cmake" + +inherit toolchain-funcs mysql-v2 +# 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-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="${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 +src_prepare() { + sed -i \ + -e '/^noinst_PROGRAMS/s/basic-t//g' \ + "${S}"/unittest/mytap/t/Makefile.am + mysql-v2_src_prepare +} + +# Official test instructions: +# USE='berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-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, funcs_1.is_triggers, funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test, main.mysql_client_test_nonblock: + # 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) + # + # plugins.unix_socket + # fails because portage strips out the USER enviornment variable + # + + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help main.flush_read_lock_kill \ + sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; 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 +} diff --git a/dev-db/mariadb/mariadb-5.5.25.ebuild b/dev-db/mariadb/mariadb-5.5.25.ebuild new file mode 100644 index 0000000..46fb196 --- /dev/null +++ b/dev-db/mariadb/mariadb-5.5.25.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +MY_EXTRAS_VER="20120416-2021Z" + +# Build system +BUILD="cmake" + +inherit toolchain-funcs mysql-v2 +# 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-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="${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 +src_prepare() { + sed -i \ + -e '/^noinst_PROGRAMS/s/basic-t//g' \ + "${S}"/unittest/mytap/t/Makefile.am + mysql-v2_src_prepare +} + +# Official test instructions: +# USE='berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-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, funcs_1.is_triggers, funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test, main.mysql_client_test_nonblock: + # 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) + # + # plugins.unix_socket + # fails because portage strips out the USER enviornment variable + # + + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help main.flush_read_lock_kill \ + sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; 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 +}