From f2f64dbfe1d4de32a2bba2f0455d13692ef786b5 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 19 Jun 2010 12:10:51 +0000 Subject: [PATCH] dev-db/mariadb: Bump git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@2267 6952d904-891a-0410-993b-d76249ca496b --- dev-db/mariadb/ChangeLog | 4 + dev-db/mariadb/Manifest | 4 +- dev-db/mariadb/mariadb-5.1.47-r1.ebuild | 214 ++++++++++++++++++++++++ 3 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 dev-db/mariadb/mariadb-5.1.47-r1.ebuild diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index ef9a419..b58890f 100644 --- a/dev-db/mariadb/ChangeLog +++ b/dev-db/mariadb/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Jun 2010; Mario Fetka + +mariadb-5.1.47-r1.ebuild: + Bump + 30 May 2010; Mario Fetka +metadata.xml: bump mariadb with the extraengines diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index be5eeee..c8fa2d4 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -2,6 +2,7 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc799 AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4 DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e236a3 SHA1 c6082203eea91a4efb95a11d06fccc4215a465a4 SHA256 f93dbf85ad03fe1928738e5552b8a7f911a0c3f2d644784a355a8f1b8fc2c29b DIST mariadb-5.1.44b.tar.gz 21685379 RMD160 a0236051d10a1241faafa5572d03bf1c57848798 SHA1 be3f9679c2bab131bb72f9e23f7161b799a7902a SHA256 4af1ac4aac903fd4ea8201fc6d1412e270dd2b8db9912fd876a4d8ee7fea45f5 +DIST mariadb-5.1.47.tar.gz 22893627 RMD160 fed0f4cd2fe97f27c94e0dfe032ba472f47b14e5 SHA1 3e4426c917e561c39bf665d3074cce2bf7599411 SHA256 c05e948d8efb5188b1ceaf70002ea794b70d5e9d52a2f53070bce40d5d9af91b DIST mysql-storage-filesystem-0.1.1-gentoo-r7.tar.gz 17099 RMD160 fcc3fe5a9f6d0b4f1b0f2d36969634c7f2701ff7 SHA1 b8e846b18b6b43927d050e9f418a75ac5728e2ba SHA256 0ece3795d61d25f8a61fa62e8add858c05415c4c47acb225f221afea1d7736af DIST mysql-storage-oqgraph-0.7-gentoo-r6.tar.gz 5215783 RMD160 4fb92c2f86ce5282d9abc74a970ff54c3d12d224 SHA1 ad9e1b475484c0478f485d2e771bb9d62928a350 SHA256 85b4cb5f6d91f5431808a8f2fcefb053f56baeed861873be5c90a414c0330315 DIST mysql-storage-pbms-0.5.12-beta-gentoo-r3.tar.gz 310868 RMD160 09ba4c281f0d9d6bdd11ce417bae97d4fe76f9ab SHA1 b81b65c5018997f5d17009a5306fd489d4da68db SHA256 0a18f9a8a04a46ca9fa686818a4b67b2250192293e36f14e9fcd59e5e7fb2c94 @@ -10,5 +11,6 @@ DIST mysql-storage-sphinx-0.9.9-gentoo-r3.tar.gz 117988 RMD160 b18328ca54f919e3d DIST mysql-storage-spider-2.20-gentoo-r1.tar.gz 176918 RMD160 043ac94be10e77fba1f22ec351b203dc3fd8de74 SHA1 54e36fe9928b7a70105ce124eea59e3fd668042c SHA256 0aee30d205240027c901a79ea5cd10be016c2a9c74a66c25d9a56af97db9362c EBUILD mariadb-5.1.42-r1.ebuild 6921 RMD160 d7ff8a33eee45fbd74948aea9ff9b2c0480cd368 SHA1 affd7cbd325d1a5a9b4079d90666ea37e94e2950 SHA256 463e5efece60c9ef96bc3f8d1d6d1be0bc0355d928612cdb69b10fb95466d158 EBUILD mariadb-5.1.44b-r1.ebuild 7212 RMD160 e4c0074869830a9b8386a6a96101096cca462f3d SHA1 73924a9a022ced59f0a3476bb95b39123867a172 SHA256 498c436d00dba1c7db80936239efc201b1225842e9425b8f116beb5683f63e92 -MISC ChangeLog 418 RMD160 a2ea71035cbde95e56564bea8131f98ca7980b05 SHA1 19e38fcdfdaa3ed92943f5ede21a3f92eb2ae84c SHA256 12421169bdbc6645459cfc5f0d3b6b7b20e5939ef334149f2ea805a44744734b +EBUILD mariadb-5.1.47-r1.ebuild 7212 RMD160 e4c0074869830a9b8386a6a96101096cca462f3d SHA1 73924a9a022ced59f0a3476bb95b39123867a172 SHA256 498c436d00dba1c7db80936239efc201b1225842e9425b8f116beb5683f63e92 +MISC ChangeLog 506 RMD160 57f46c6848e93bf30bd697a20e2691608eceed0e SHA1 d6202d74bdc85938632e2d3e9d5cbfc9e2a8afbd SHA256 5d1d846b31eaaf061862459c8c90c252836f54967c5fd8f3313791c2b4ee82bb MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/dev-db/mariadb/mariadb-5.1.47-r1.ebuild b/dev-db/mariadb/mariadb-5.1.47-r1.ebuild new file mode 100644 index 0000000..e974c7e --- /dev/null +++ b/dev-db/mariadb/mariadb-5.1.47-r1.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $ + +MY_EXTRAS_VER="live" +EAPI=2 + +#GO_MYSQL_PATCHES="http://ftp.disconnected-by-peer.at/mysql/go-mysql-patches-1.tar.gz" +# revision-0.2-alpha-gentoo-r5 + +MYSQL_STORAGE="pbms-0.5.12-beta-gentoo-r3 + soliddb-0081-gentoo-r3 + filesystem-0.1.1-gentoo-r7 + sphinx-0.9.9-gentoo-r3 + spider-2.20-gentoo-r1 + oqgraph-0.7-gentoo-r6" + +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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~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="!media-sound/amarok[embedded]" + +# 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_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))" + + # 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.*|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_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.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_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 + + # 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 +}