From 54511c2417aafc4137f2cc60fc0e794b4cce8988 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 13 Feb 2013 00:47:45 +0000 Subject: Bump from mysql overlay, thanks to Brian Evans . (Portage version: 2.2.0_alpha162/cvs/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) --- dev-db/mariadb/ChangeLog | 11 ++- dev-db/mariadb/mariadb-5.1.67.ebuild | 171 +++++++++++++++++++++++++++++++++++ dev-db/mariadb/mariadb-5.2.14.ebuild | 171 +++++++++++++++++++++++++++++++++++ dev-db/mariadb/mariadb-5.3.12.ebuild | 171 +++++++++++++++++++++++++++++++++++ dev-db/mariadb/mariadb-5.5.29.ebuild | 134 +++++++++++++++++++++++++++ 5 files changed, 657 insertions(+), 1 deletion(-) create mode 100644 dev-db/mariadb/mariadb-5.1.67.ebuild create mode 100644 dev-db/mariadb/mariadb-5.2.14.ebuild create mode 100644 dev-db/mariadb/mariadb-5.3.12.ebuild create mode 100644 dev-db/mariadb/mariadb-5.5.29.ebuild (limited to 'dev-db') diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index a9123771ca26..6af89dcb6a1d 100644 --- a/dev-db/mariadb/ChangeLog +++ b/dev-db/mariadb/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-db/mariadb # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.26 2013/01/21 23:04:04 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.27 2013/02/13 00:47:45 robbat2 Exp $ + +*mariadb-5.3.12 (13 Feb 2013) +*mariadb-5.1.67 (13 Feb 2013) +*mariadb-5.2.14 (13 Feb 2013) +*mariadb-5.5.29 (13 Feb 2013) + + 13 Feb 2013; Robin H. Johnson +mariadb-5.1.67.ebuild, + +mariadb-5.2.14.ebuild, +mariadb-5.3.12.ebuild, +mariadb-5.5.29.ebuild: + Bump from mysql overlay, thanks to Brian Evans . 21 Jan 2013; Robin H. Johnson -mariadb-5.1.62.ebuild, -mariadb-5.2.12.ebuild, -mariadb-5.3.6.ebuild, -mariadb-5.5.23.ebuild, diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild new file mode 100644 index 000000000000..24ac7f4462cb --- /dev/null +++ b/dev-db/mariadb/mariadb-5.1.67.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.67.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $ + +EAPI="4" +MY_EXTRAS_VER="20121101-2319Z" + +# 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="~alpha ~amd64 ~arm ~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() { + # 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.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-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.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-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.4.*|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.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild new file mode 100644 index 000000000000..0c99bfd5ba4a --- /dev/null +++ b/dev-db/mariadb/mariadb-5.2.14.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.14.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $ + +EAPI="4" +MY_EXTRAS_VER="20121101-2319Z" + +# 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="~alpha ~amd64 ~arm ~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() { + # 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.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-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.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-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.4.*|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.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild new file mode 100644 index 000000000000..d58f65830029 --- /dev/null +++ b/dev-db/mariadb/mariadb-5.3.12.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.12.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $ + +EAPI="4" +MY_EXTRAS_VER="20121101-2319Z" + +# 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="~alpha ~amd64 ~arm ~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() { + # 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.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-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.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-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.4.*|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.5.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild new file mode 100644 index 000000000000..56e401235110 --- /dev/null +++ b/dev-db/mariadb/mariadb-5.5.29.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $ + +EAPI="4" +MY_EXTRAS_VER="20130120-0100Z" + +# 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 ~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 +} -- cgit v1.2.3-65-gdbad