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 F2F011389E2 for ; Thu, 11 Dec 2014 01:26:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCFDCE0952; Thu, 11 Dec 2014 01:21:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB1EAE0B31 for ; Thu, 11 Dec 2014 01:20:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D255340798 for ; Wed, 10 Dec 2014 01:18:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D029C09E for ; Wed, 10 Dec 2014 01:18:52 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1418174314.8ee092ca461038a7f272be92e95149cc837acc04.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/Manifest dev-db/mariadb/mariadb-10.1.1_alpha.ebuild dev-db/mariadb/mariadb-10.1.2_alpha.ebuild dev-db/mariadb/metadata.xml eclass/mysql-cmake.eclass eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 8ee092ca461038a7f272be92e95149cc837acc04 X-VCS-Branch: master Date: Wed, 10 Dec 2014 01:18:52 +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: 33116480-e5fc-48f7-827b-a82733b05ec5 X-Archives-Hash: 1e33b52d6abef874f5f2c41b1c3b1fce commit: 8ee092ca461038a7f272be92e95149cc837acc04 Author: Brian Evans gentoo org> AuthorDate: Wed Dec 10 01:18:34 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Dec 10 01:18:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8ee092ca Version bump to MariaDB 10.1.2 --- dev-db/mariadb/Manifest | 2 +- ....1_alpha.ebuild => mariadb-10.1.2_alpha.ebuild} | 36 ++++++++++++---------- dev-db/mariadb/metadata.xml | 1 + eclass/mysql-cmake.eclass | 4 +++ eclass/mysql-multilib.eclass | 5 +++ 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 49706d4..0495c21 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,6 +1,6 @@ DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 SHA512 7e7f08d52054ce6ec9f8f3e13369a7faf762f8ddd41129be935a340f51cdb3639687ad877838a8157558106cafd11102d863368610bba4f58b6d2aca415cbb92 WHIRLPOOL 9d4eb91ac9f45e34286d64a4dfcae9a1ba293eb0283c848abe1f25c93692cfb773e9cd18b52ce6bf7c02c08f93a41d047e1bf6366015a55036de68ae4d1e7499 DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4 -DIST mariadb-10.1.1.tar.gz 48093370 SHA256 0076c00679a17d35c51fc99841817500131dc8501dc8540aabbc7bcd56d6bb6e SHA512 fc33e6d868d620cc66bc77b9819f18604cc5c5bccd0229c0a0d0e40184cbda0c3304d2648581f977e9cbe759add525066189764f068974b4285da91b807ce36c WHIRLPOOL 705675e3aa035252f6c6126412dd5c637cbef77edb664bdad42fa7cd5123361af838c4501a1d84ba908b7a2effcb0bd54acf5d821c4800b54a453ec55ab76cf5 +DIST mariadb-10.1.2.tar.gz 52586559 SHA256 411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421 WHIRLPOOL 67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 diff --git a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.2_alpha.ebuild similarity index 77% rename from dev-db/mariadb/mariadb-10.1.1_alpha.ebuild rename to dev-db/mariadb/mariadb-10.1.2_alpha.ebuild index d308efa..c4d9809 100644 --- a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild +++ b/dev-db/mariadb/mariadb-10.1.2_alpha.ebuild @@ -11,10 +11,10 @@ inherit toolchain-funcs mysql-multilib 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" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='01050_all_mariadb_mysql_config_cleanup-5.5.patch 20006_all_cmake_elib-mariadb-10.0.11.patch' +EPATCH_EXCLUDE='' DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" RDEPEND="${RDEPEND}" @@ -26,12 +26,15 @@ RDEPEND="${RDEPEND}" # 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 - multilib_is_native_abi || return - # 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" @@ -53,9 +56,13 @@ multilib_src_test() { # Ensure that parallel runs don't die export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # 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 "${S}"/mysql-test/var-tests{,/log} + mkdir -p "${T}"/var-tests{,/log} # These are failing in MariaDB 10.0 for now and are believed to be # false positives: @@ -65,31 +72,30 @@ multilib_src_test() { # funcs_1.is_columns_mysql # fails due to USE=-latin1 / utf8 default # - # main.mysql_client_test, main.mysql_client_test_nonblock: + # main.mysql_client_test, main.mysql_client_test_nonblock + # main.mysql_client_test_comp: # segfaults at random under Portage only, suspect resource limits. # - # plugins.unix_socket - # fails because portage strips out the USER enviornment variable - # 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 plugins.unix_socket \ + main.mysqld--help \ 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}" || die + 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="${S}/mysql-test/var-tests" --skip-test=connect + 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 || die + popd # Cleanup is important for these testcases. pkill -9 -f "${S}/ndb" 2>/dev/null @@ -103,8 +109,6 @@ multilib_src_test() { [[ -z "$failures" ]] || die "Test failures: $failures" einfo "Tests successfully completed" - # Cleanup test data after a successful run - rm -r "${S}/mysql-test/var-tests" else einfo "Skipping server tests due to minimal build." diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml index 9069bcb..421187f 100644 --- a/dev-db/mariadb/metadata.xml +++ b/dev-db/mariadb/metadata.xml @@ -22,6 +22,7 @@ dev-db/mariadb Raise the max index per table limit from 64 to 128 Install client programs only, no server Add support for the Open Query GRAPH engine + Enable the optional PAM authentication plugin for the server Add experimental support for PBXT storage engine Add support for statement profiling (requires USE=community). Add tools needed to support the rsync SST method diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index b7f4799..05ff5ed 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -232,6 +232,10 @@ configure_cmake_standard() { mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4) $(cmake-utils_use_with innodb-lzo INNODB_LZO) ) fi + + if mysql_version_is_at_least "10.1.2" ; then + mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) ) + fi else mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) fi diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index ba5b299..387b875 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -209,6 +209,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then # MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries # Choices are bzip2, lz4, lzma, lzo. bzip2 and lzma enabled by default as they are system libraries mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo" + + # 10.1.2 introduces a cracklib password checker + mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib" fi if [[ -n "${WSREP_REVISION}" ]]; then @@ -288,6 +291,8 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) " + + mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? ( sys-libs/cracklib:0= )" fi [[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"