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 67FAF13800E for ; Fri, 27 Jul 2012 16:10:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66241E04C8; Fri, 27 Jul 2012 16:09:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 21EF0E04C8 for ; Fri, 27 Jul 2012 16:09:06 +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 61F911B408F for ; Fri, 27 Jul 2012 16:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3A6E5E5444 for ; Fri, 27 Jul 2012 16:09:03 +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: <1333983675.bc6f75ef5c2b213b8eb8088cf3f03fdefdeec620.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.3.0_beta.ebuild dev-db/mariadb/mariadb-5.3.1_beta.ebuild dev-db/mariadb/mariadb-5.3.3_rc.ebuild dev-db/mariadb/mariadb-5.3.5.ebuild dev-db/mariadb/mariadb-5.3.6.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: bc6f75ef5c2b213b8eb8088cf3f03fdefdeec620 X-VCS-Branch: master Date: Fri, 27 Jul 2012 16:09:03 +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: c5861ee2-48e4-41ef-af5b-4e2410dab42d X-Archives-Hash: 014e408d950cf88e9b534787f046896d commit: bc6f75ef5c2b213b8eb8088cf3f03fdefdeec620 Author: Brian Evans lavabit com> AuthorDate: Mon Apr 9 15:01:15 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Apr 9 15:01:15 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bc6f75ef Security commit. MariaDB 5.3.6 includes a important remote security fix. See http://kb.askmonty.org/en/mariadb-536-release-notes. Remove old 5.3 series versions. --- dev-db/mariadb/Manifest | 12 +- dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 171 -------------------- dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 171 -------------------- dev-db/mariadb/mariadb-5.3.3_rc.ebuild | 171 -------------------- .../{mariadb-5.3.5.ebuild => mariadb-5.3.6.ebuild} | 0 5 files changed, 3 insertions(+), 522 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index d2405e1..4e5d0b7 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -5,10 +5,7 @@ DIST mariadb-5.2.10.tar.gz 25242675 RMD160 f5b5a7776e41e29449f60dc0528ccefba0d73 DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3 DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611 -DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a -DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad -DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2 -DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3 +DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f @@ -18,10 +15,7 @@ EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e3 EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0 EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0 EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0 -EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6 -EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6 -EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971 -EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df6883345836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382 -EBUILD mariadb-5.5.22.ebuild 4184 RMD160 fc4a1468e5db24a8be919960b69ebb972eeff379 SHA1 a1e7d9f733bba7357f51ea70d1888a0e68714859 SHA256 dc079c6447715da7c3d8cefdfe72843291af6e239676dd6fe1c2cb970d62824e +EBUILD mariadb-5.3.6.ebuild 5927 RMD160 2e6ff9328c5e1c07c3e53c233a54b4af4cb7343a SHA1 a66164dadde6d87cff93af791a071d5d7f71711e SHA256 bbdd621bcafcd5ff6d722ee5cdcf527d278d90fbe5cb7138a40e94fe7a33bd8f +EBUILD mariadb-5.5.22.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04 MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592 MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild deleted file mode 100644 index 75579d1..0000000 --- a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -MY_EXTRAS_VER="20110819-0415Z" -EAPI="4" - -# Build system -BUILD="autotools" - -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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" - -# 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() { - # 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))" - - # 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.1.*|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-v2_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.2.*|5.3.*|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-v2_disable_test "$t" "False positives in Gentoo" - done - ;; - esac - - # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. - # These tests are picking up a 'connect-timeout' config from somewhere, - # which is not valid, and since it does not have 'loose-' in front of - # it, it's causing a failure - case ${PV} in - 5.1.5*|5.5.*|6*) - for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do - mysql-v2_disable_test "$t" \ - "False positives in Gentoo: connect-timeout" - done - ;; - esac - - use profiling && use community \ - || mysql-v2_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-v2_disable_test $t "ndb not supported in mariadb" - 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 -} diff --git a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild deleted file mode 100644 index 75579d1..0000000 --- a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -MY_EXTRAS_VER="20110819-0415Z" -EAPI="4" - -# Build system -BUILD="autotools" - -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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" - -# 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() { - # 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))" - - # 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.1.*|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-v2_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.2.*|5.3.*|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-v2_disable_test "$t" "False positives in Gentoo" - done - ;; - esac - - # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. - # These tests are picking up a 'connect-timeout' config from somewhere, - # which is not valid, and since it does not have 'loose-' in front of - # it, it's causing a failure - case ${PV} in - 5.1.5*|5.5.*|6*) - for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do - mysql-v2_disable_test "$t" \ - "False positives in Gentoo: connect-timeout" - done - ;; - esac - - use profiling && use community \ - || mysql-v2_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-v2_disable_test $t "ndb not supported in mariadb" - 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 -} diff --git a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild deleted file mode 100644 index a461c4f..0000000 --- a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -MY_EXTRAS_VER="20110819-0415Z" -EAPI="4" - -# Build system -BUILD="autotools" - -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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" - -# 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() { - # 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))" - - # 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.1.*|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-v2_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.2.*|5.3.*|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-v2_disable_test "$t" "False positives in Gentoo" - done - ;; - esac - - # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. - # These tests are picking up a 'connect-timeout' config from somewhere, - # which is not valid, and since it does not have 'loose-' in front of - # it, it's causing a failure - case ${PV} in - 5.1.5*|5.5.*|6*) - for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do - mysql-v2_disable_test "$t" \ - "False positives in Gentoo: connect-timeout" - done - ;; - esac - - use profiling && use community \ - || mysql-v2_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-v2_disable_test $t "ndb not supported in mariadb" - 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 -} diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild similarity index 100% rename from dev-db/mariadb/mariadb-5.3.5.ebuild rename to dev-db/mariadb/mariadb-5.3.6.ebuild