From 8efcf923f4f87375f99deb6f9069fc7b4b66529b Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Fri, 6 Feb 2015 14:07:46 +0000 Subject: [PATCH] Version bump with security fixes; drop old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 --- dev-db/mariadb-galera/ChangeLog | 9 +- dev-db/mariadb-galera/Manifest | 38 +++--- .../mariadb-galera-10.0.13.ebuild | 123 ------------------ .../mariadb-galera-10.0.14.ebuild | 123 ------------------ ...5.ebuild => mariadb-galera-10.0.16.ebuild} | 18 ++- 5 files changed, 39 insertions(+), 272 deletions(-) delete mode 100644 dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild delete mode 100644 dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild rename dev-db/mariadb-galera/{mariadb-galera-10.0.15.ebuild => mariadb-galera-10.0.16.ebuild} (85%) diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog index 815143e779ee..bf0202fe50b6 100644 --- a/dev-db/mariadb-galera/ChangeLog +++ b/dev-db/mariadb-galera/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mariadb-galera # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.12 2015/01/28 17:41:06 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.13 2015/02/06 14:07:36 grknight Exp $ + +*mariadb-galera-10.0.16 (06 Feb 2015) + + 06 Feb 2015; Brian Evans +mariadb-galera-10.0.16.ebuild, + -mariadb-galera-10.0.13.ebuild, -mariadb-galera-10.0.14.ebuild, + -mariadb-galera-10.0.15.ebuild: + Version bump with security fixes; drop old 28 Jan 2015; Brian Evans metadata.xml: Drop old USE description diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest index c3cd66589af5..a0ec7bc8861b 100644 --- a/dev-db/mariadb-galera/Manifest +++ b/dev-db/mariadb-galera/Manifest @@ -3,31 +3,25 @@ Hash: SHA256 AUX my.cnf-5.5 5358 SHA256 c282f0545addccf14ca8f983eb26cba38af27177b7785ab20e6ae1af0930f7fc SHA512 82eb974309ddb0cbab5ec9f8e6699181efcd6e67dddb59ce9d98301c3f041276cdd813bdb3a8e7244fcb65f6f55ae587341789180430e6508cbff57e6cf92d3d WHIRLPOOL 0eb6d850b970c1eddbcee4543ca87baee18f08347b308cfcb69168f60c1fc4127a492135b75db03f7bf94490f908cbf38df3bc0cd8560a5de5a058a3f3d09125 AUX my.cnf-5.6 5259 SHA256 ce22f1829abad1770614b161ad86a01007458f1080332aaa9f1ed9c4fb526705 SHA512 565e638ed41d9706dc1294a558e0e5bf7e576bfc6ca097ed016e142e0010bfceafe6ea56403408496a6acecf833410881284b1233dec15b15f86f1abf4c9cbfb WHIRLPOOL bd0d85adf51a0acc8ef2f04305ae61a2242a3a20c66f5a44a1d98cc75ed429a1d8aabebe1b64fae948ecb66d68029fab410f047ab82d213cca95ad8b8dfb2be2 -DIST mariadb-galera-10.0.13.tar.gz 51542182 SHA256 9302c5ca8447e4f33e6f043dbdf56ec0028e1da8dfb713b9f1a81b1d6cd8d2fd SHA512 0274a344ef7da7f663f5822fcd5caa2672e4464e05d06c924050b9f7aaa34c0016067c9dda1f46697519d1eb6b80492f3ac2c7bbb86b0148735fd519b9eb1125 WHIRLPOOL df9c3e1a8fde111f5b1b66d9f556ab4a1b57c42cafd21dabc3a93d8de3add7b46f7f267f17110f19355018c5d2ebc97a8b75a5117106352137a5fdda67fde111 -DIST mariadb-galera-10.0.14.tar.gz 51396249 SHA256 ce5a20df0cea64cd1efb2cbe29f91842e56d47266a550e79d87dc96f50bff769 SHA512 6e617b0050eb52f14631c9751b4d4fea699b4eca6ef33a8397fe5076f029ca7c516c6915264a175cecd735651b540ae37bc5d3214a2da6e24d8430a969b5ea45 WHIRLPOOL 6807e32ac5e6423eb216f45d9dbf5829837880ace0f96e09a6dc760c7dcd9e169744197019f879c08a661ec11ae8269d57f5063bec33b648aabdba87e4fbf2de -DIST mariadb-galera-10.0.15.tar.gz 55753400 SHA256 aea257ce0834d2c0e34e76966afecda0349995c2f6df0dbeec01f3e81ce5e0bb SHA512 e8a3addb7b6dcda8d3984d3cad17b478df70c67ce356e007385953bbd17d717cbc874713ac0066570e5b3154459666991d6f69bc80deeedff219d3efa9bac1ea WHIRLPOOL c7453899591da3a68e51a24d17283bfe2334f87db6a0e1e25313f5bade1bf5986227e21aeff086be291d55d4533d1e69556c3630048fca346cf3fa6ee864d71a -DIST mysql-extras-20140903-1928Z.tar.bz2 1494599 SHA256 3a1e4ba87b301751f1964875bdba4c4baafe270267247ee79e4285e256f272f8 SHA512 2fcf08cca2ccf62533058e1994a8aca1ffc17867495d5c7fe588d42978e9c5c2e08f93991f44b0354818db14339a09b156471a7c428de17250c54f48c5aca7c4 WHIRLPOOL fc5983a0cb3c8a8faabdb2b8f8cba183188b5cfa2e40eda0207942ed92cf69675ca1753b7c35420c5b0882d4b77d1daacf586fb08f5cb5c701b7925e549cd2c8 -DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256 9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512 c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799 WHIRLPOOL bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86 +DIST mariadb-galera-10.0.16.tar.gz 55886236 SHA256 c730c6dbeee4e2985a8db9dc15a6b6e8e64db14cef1442ee5f6732d2754ed9fb SHA512 2a3fcb79bd32420b4b69118825ed4c954fcf7d1fd2358159687bc90157aef9e440d24209ffa71887029b66adca14f439f08d3edfdcee431b9d8bc49a9c7e6762 WHIRLPOOL 60c27680e8ba91f174cb9827e9def0760e8e388f4f072e9d8b71b102a57f2e141dc6cdd66604ad802512ad24855af9216ab4d87718f30c1ff599b3222b44d31c DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326 -EBUILD mariadb-galera-10.0.13.ebuild 4239 SHA256 59b0e2a2475f9cb24d99f68f5b0df8a7d36ba816af4a96b50c733b1ccdac6779 SHA512 04dc31cfde10e2f8e8572ad40298805da3f9b3098e36d8432a228fcd7aa1bb310252ccbbae7a9fbad13d8bddf35c861ac096b83981cc9dda4b77a1f6fdee2e9a WHIRLPOOL 4adc7860df00bea4e6154988da7337d484e716cec70afc0389eab95f2908f6e405179a760e9f95c50f9b64230bb08c63ed317a404a7b5b4bd9765fdf4e4c8a71 -EBUILD mariadb-galera-10.0.14.ebuild 4179 SHA256 e9a2722f6f6d4585721ee121bdec43e82ed82df029169885ff7c3c5a866e4e34 SHA512 d9a4742d16a184cc2cac27240c4af57ba11c7ab3210cf0c6b92ea2c2970da045917163e43d62c58fab3750b864525d180bc2fd2db4353f0199877ad20eb5f472 WHIRLPOOL 5c806112f236e5c41a8e938c61bd52496e53c20771f82ae0e3ce3561e1aa47e68c9e91fa042007dfd3c4b7a706e1650b571803b11eba85368b891000d1b62540 -EBUILD mariadb-galera-10.0.15.ebuild 4298 SHA256 f48d3b4076a28f3e02f842b104b42810ad86b0f029dcbccc4337f0d47d675b97 SHA512 27ffc144c5e60bc276fc910b8efe71557fdb736bd8dd52503b3b483f9a693653b6bd747c5e273b83d89b371e6d6778723b0a92739271dfeac44abda83002006e WHIRLPOOL 1cf353b314ce8250d56c7ce7a66b367b9b92ca8e5ee4630749d713856142dde5c88869d21223f43fb61ae32b29a3397fb9ce6ff01c7040a89adf9418cb24c3bf -MISC ChangeLog 1743 SHA256 db03b96d9a6b5ca93d0987d71d8b0926c79e706f37a493b360a353096a879cb9 SHA512 b13201ae45951f968f3e676bf1e4eb71c648f1e2ac32ede53699a6cdcd4ad3f8a6dc1c7c7776cc67d52781861b4b7de6fa227b852b0366662a2e61cd8ecf3ed5 WHIRLPOOL 75366cf842646e4bc0f96b5197205f27e9bad3123bf3afda7e3c37ecb630ebe4db70cac91d8bd5b86ef060806b9cb75e98ce2e23d4375f66c1feb6330b3edb42 +EBUILD mariadb-galera-10.0.16.ebuild 4825 SHA256 420c9e3aebce78de7ef668fa74dcb8fa1b2d951d2294b63c2c211e85a2a47c4c SHA512 d159121fbbf3ef27713e40e0458d2716e630964a293a0d68ee611d7bddbaab0a12843c5c244aeab17089716226c018c402352a03d9e37132780f85977184f710 WHIRLPOOL 09504889d58df65ad0e20a0374648efca7467bbe114d33596883effdb342068ce8c949bbb917b00ebbdc75080ca24cea2cfb6fb44f84d22ada11596c1084eff8 +MISC ChangeLog 2009 SHA256 4b731634f035862a5f8e8327318ade37daaba1c9627ee32e3ae456d08f846891 SHA512 b3e7eb46c724492d057cd6565cbab442d6d031bea2801661f956c1f917e3dd21395c631a922acf7a376397c36bc7a9aff044407e352a31892c5fe2245d7a976e WHIRLPOOL 245d7ce11837e66cb51b8ee8db980214bb7b2bd2009bf827122f823e4f5b19cb7580ff54b41c81b757928e275aa925f473eb6c296265d4af02abd66d4a8e5f42 MISC metadata.xml 1521 SHA256 9f2d38d33ed259f180c31db48b43bed4b4d123d2d204735813ac999a708478a7 SHA512 a232dd0d0926b501f79ed4748ef9aa7f01d5513d4f10cb286f8948cc5a4cdc266f1ae122f0a3631e56f3929648a3c6a4d7c56ea3cf11d05c73f8bdf458508e60 WHIRLPOOL db1d1697a97ab0de1b34c4b8c24e65866d460c2cb430b1f44ef91a2f6ddeb8ff9cd4b3d268aed4e1e1ad76ea9fa63e33c4dc2a33ccf8f79ca67933c468675c02 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQIcBAEBCAAGBQJUyR8zAAoJENH3ge/59KO2fUkP/RoV7tXlKIa7Te38FZ5MyUCV -DE5/THmqJQEx8m14buDLVCcbJgVBSf77boHcx0M9AcJtm86q3YXMmPh3GfOFxqqJ -Heqxwxkpnof7SA9OtKGBZkDsCRtk0+H/gVpGdSQ9xWPcF/7D7y6QH59iw3W96qoP -HRytzHftefunN1B8Q9x55IozI+zuJ593NF38w/OnF+narmaqkpYo4c5taj7PLSfP -qvLiuixIJmBiLEsoiQNhtVilf9wCxjtBZl1C39s7evD+1YY3YJfHWa/5+t6P0Sgz -ZK+PUCRmhmG3vowniOzjtEjA3p3G52v1Lrf5rGjWxlFky7sWZucSoSQ5+pkINoQR -BWVEFvFUtF3waiWt8tcx7DW3PKMr22sjfJ64VtUjxnETUfz/M9EAPFcushzPkwUS -udKlCP0DRcKEZjx6NdBgdcsd0EnXoNq/12KGONx5hjWMma5chhKK+WKEzpzDc5eW -asey+Gye8TgEK42ddrLVvFHXv5+YZGUN5mezbNTKdRqg1vsQeSt9C8EUKqyvFbHa -at5zbHSdQMOfdKdeWYmQJTO/vCueVf1r6olGJiwz0PF4vCMf5oNtp4DhLv3cw92Q -gqufgb8NTxYJ280sfd/QyTS6YctwucCkRrIrTd87YHh/fl7Rg7B63dfY0Uxc6Bgd -rzD+0VeV8BE1JIZoRPV/ -=drXO +iQIcBAEBCAAGBQJU1MquAAoJENH3ge/59KO2uE0P/2obBEIrEsdZ1I6Wm7Dl2PyA +Qee72NvyX/VAW/kai9Yq6ic38gwLmQTVg5HywEV4owvtNRniEjfbSjPoTYA5Qo6w +V2fe1bhTP5ATFaLHIIe0C7Xu/qK8b58NwE5amX3txVZQd+YgitO1Y2gXSAxEWq1d +2wm73wOvdh6qZUlLFttZExHo8SBl2mDSzSKzC+1CF2J3SVEygmbxe4bWOyNZoCIX +7HbvmvBefrHzKWkWHcZUZRIauR3sdsympsaWSZ4Y+BmnjuIFrcNPuo0tCt1Ds3Lm +WCfsVG6SZ28qQtKLevdLd/l8T0ssnU1uOItvuL2XA6jJLXlit8jopmJAPUgM+yIJ +ze9QyHRMuFY4sQU1Oly4scYAT6dSbCNbrt2L2BJf5AXWHic8PVkrQkXC/XQpJW93 +QW5Q9DX5FQpOJMgEpKD7FzgtoKPNzDi936NRmC+LGgOqQ7eQTX/FAkppf1hiQIRZ +kZdfex0H6XbHeGHjD47mcFXj1Hp0VNwzvWWYF0GS7xa+/clSEnJrXUAlNB+pdcQj +cd8qP97KYq3f4JEJyVnAYj4c/vbLFiJLJdh/toCCMKyiqGZ9XlksLTjgX3ACGlJ8 +dTffMciw6yT3IpYrrkQDa4aTeeUy5ds51m80jZO7Y+W8SZt3XgOUfZ1kVKwYde2i +YOgbuslbW1FY2i+IUtri +=wU9o -----END PGP SIGNATURE----- diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild deleted file mode 100644 index d634c6aba0a2..000000000000 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.4 2014/10/06 17:44:30 grknight Exp $ - -EAPI="5" -MY_EXTRAS_VER="20140903-1928Z" -WSREP_REVISION="25" - -inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~amd64 ~x86" - -# 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='-cluster embedded extraengine perl ssl static-libs community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-galera-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${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))" - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # These are failing in MariaDB 10.0 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 - # mina.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # innodb.innodb_simulate_comp_failures_small - # Has a very long timeout requirement to be consistent - # Upstream bug MDEV-6546 - # - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help innodb.innodb_simulate_comp_failures_small \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-multilib_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - # Skip all CONNECT engine tests until upstream respondes to how to reference data files - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --skip-test=connect - 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-galera/mariadb-galera-10.0.14.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild deleted file mode 100644 index 8524a9412680..000000000000 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild,v 1.1 2014/10/20 23:54:49 grknight Exp $ - -EAPI="5" -MY_EXTRAS_VER="20141019-1948Z" -WSREP_REVISION="25" - -inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~amd64 ~x86" - -# 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='-cluster embedded extraengine perl ssl static-libs community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-galera-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${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))" - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # These are failing in MariaDB 10.0 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 - # mina.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # wsrep.variables: - # Expects the sys-cluster/galera library to be installed and configured - # - # wsrep.foreign_key: - # Issues a configuration deprecation warning which does not affect data - # - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help wsrep.variables wsrep.foreign_key \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-multilib_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/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-galera/mariadb-galera-10.0.15.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild similarity index 85% rename from dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild rename to dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild index ed6b1c581d1e..0d6812f4faf0 100644 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild +++ b/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild,v 1.1 2014/12/16 02:02:07 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild,v 1.1 2015/02/06 14:07:36 grknight Exp $ EAPI="5" MY_EXTRAS_VER="20141215-0144Z" @@ -94,13 +94,25 @@ multilib_src_test() { mysql-multilib_disable_test "$t" "False positives in Gentoo" done + for t in rpl.rpl_heartbeat_ssl rpl.rpl_ssl rpl.rpl_ssl1 main.ssl_cipher \ + main.ssl_8k_key main.openssl_6975 main.openssl_1 main.ssl main.ssl_compress \ + main.ssl_connect; do + mysql-multilib_disable_test "$t" "Disabled due to expired certificate" + done + + for t in wsrep.binlog_format wsrep.pool_of_threads wsrep.mdev_6832 ; do + mysql-multilib_disable_test "$t" "Skipped for MDEV-7544" + done + # Run mysql tests pushd "${TESTDIR}" # run mysql-test tests # The PATH addition is required for the galera suite to find the sst scripts + # Skipping galera tests for now until MDEV-7544 is resovled + WSREP_LOG_DIR="${T}/var-tests/wsrep" \ PATH="${BUILD_DIR}/scripts:${PATH}" \ - perl mysql-test-run.pl --force --vardir="${T}/var-tests" + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --skip-test=galera retstatus_tests=$? [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" -- 2.26.2