commit: 64fc43fedc59801c72fd91b7ebe73315eb65c45f Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue May 10 19:08:33 2016 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue May 10 19:08:33 2016 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=64fc43fe
dev-db/mariadb: Version bump for 10.1.14 Package-Manager: portage-2.2.28 Manifest-Sign-Key: D1F781EFF9F4A3B6 dev-db/mariadb/ChangeLog | 6 + dev-db/mariadb/Manifest | 31 ++-- dev-db/mariadb/mariadb-10.1.10.ebuild | 200 --------------------- ...riadb-10.1.11.ebuild => mariadb-10.1.14.ebuild} | 22 ++- 4 files changed, 38 insertions(+), 221 deletions(-) diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index 444b5fb..11479a8 100644 --- a/dev-db/mariadb/ChangeLog +++ b/dev-db/mariadb/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*mariadb-10.1.14 (10 May 2016) + + 10 May 2016; Brian Evans <[email protected]> +mariadb-10.1.14.ebuild, + -mariadb-10.1.10.ebuild, -mariadb-10.1.11.ebuild: + dev-db/mariadb: Version bump for 10.1.14 + *mariadb-10.0.25 (02 May 2016) 02 May 2016; Brian Evans <[email protected]> +mariadb-10.0.25.ebuild, diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index b3d1356..ee3156d 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -2,10 +2,9 @@ Hash: SHA256 DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c -DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 -DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d +DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a 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 @@ -17,19 +16,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQJ8BAEBCABmBQJXJ54DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJXMjGtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE -MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2i8MP/06aVeYb7p2bd2ryEnKqT71/ -g8qxenMnaqgyTqtwP4dSR7+msli1dCxXyPWHtbilem57f7mtUCCE0CVX/lO1+MFW -H4T7NVfy9PmnHSrACzKTddKdND/wp5GNejt+TnCeDqW2gT6uVt8qIBNc4ShjVAOK -Sq43LZCkJlprHFdzkYO93JuoFyX6RlDqQFI88cFyBQD2JHY+wxh46V0DYduC2Xex -4Z94wrLEBMUSqeNnF6rH+pRuAgag08Hl8550n0EFegQyS4TAIJfDvNvpB/2XmJf/ -Kshuwyle/QFpY/fEaCM4BxQ97KomeaUxmbe03MesBsenGF5wP8/vvzHy6umsujo3 -QqCGft9nhHZM9SIGuSzcgcQkjqWs/vzYD8jtESu0iEGd+2xQQFy32CKXT4SHVXL6 -zrK0bD6mW1zwUWkfhTgcKfHW5oYXaCkLbg/sJg+9b96Yjby1eGN/rhnNa512J4C+ -JyUvAjCluoIz9cVh+ezGPilyd8OYqGVAqvZ7HPtuFL2qnDKz7jbSBAatf/bMM8ca -hmiJVK1c21qppbatU29KXLy69xVcA2l0y/cPVwSbtKUMTmVvzlyhtzJsklP3cPhx -BXdZsWxD24veS1z3mYt8XjpM2i1u+dYCGL7wA/C7txiJs4LUkfHPWxAl0VbqyCYE -xLf8S9tfuOptLYm8I6Wk -=gCrt +MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2+NsQANNqPpae6Ep3HHUP3GEa+oq/ +d+yfxrp+zYtbWjZJ+4Apcg+6TcrwU9AfKnIhxavHg6e194hg5HOHJgcPA126dU5V +Xu2QHMFmozezhsQsFvZYq/5z9xfOQ6RW/WYzRsWjnULXEdcUS9EaoyhUQfcG+++W +wpzzxg7sS0MG9LsrPhVN8nmv/mtRraQ1jbdgu7CLSN1RmN/A1HC+rtcgELEAKgJb +ZBbeU5mKqhJ9IaEf6Xk/RGEanaPeaxqD6ik0lkkeTg/HOX1aN3frG/H56UgQ9776 +lRRaXfcIVGeyEaFYsQvFEPG/tKyLn3RanAAVvqvcboBi6CV/AsERnOBK8Ao+vdzN +KJhvdpojJFIArNobSNlSyPMOUXlpANXlpMRrjVhOODPBGTJbZBZA+XLJk1a4dswF +7lQycmeMTuQDdyYM7qetAsqxN6RzC5Z+adeMt7mjNJ5AoG4r72I+H6DU63ljg4wl +U+lInSMZlkEil+8c8/F+4MUNALmpMB6mpbEqy2oJJbRRTFy1A7e/Mtb4tRRqjM7X +8e73rGLMfcct0kwHDrF/KHYcRkSFQVIDDExIPmv+j0TCphCUfTzxWrHniNiOuec7 +LeTQjoONp7aFiWZMIRbOEmD2hsn/tMR+72EwJUiRHcDFFYDj8fOaaRFeCLAAtkjw +Nd23VeNHkbgjzKVQm85g +=AgjA -----END PGP SIGNATURE----- diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild deleted file mode 100644 index 1390a68..0000000 --- a/dev-db/mariadb/mariadb-10.1.10.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -MY_EXTRAS_VER="20151223-1501Z" -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number -WSREP_REVISION="25" -SUBSLOT="18" -MYSQL_PV_MAJOR="5.6" - -inherit toolchain-funcs mysql-multilib-r1 - -HOMEPAGE="http://mariadb.org/"; -DESCRIPTION="An enhanced, drop-in replacement for MySQL" - -IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" -RESTRICT="!bindist? ( bindist )" - -REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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='' - -COMMON_DEPEND=" - mroonga? ( app-text/groonga-normalizer-mysql ) - systemd? ( sys-apps/systemd:= ) - !bindist? ( >=sys-libs/readline-4.1:0= ) - server? ( - cracklib? ( sys-libs/cracklib:0= ) - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - ) - innodb-lz4? ( app-arch/lz4 ) - innodb-lzo? ( dev-libs/lzo ) - innodb-snappy? ( app-arch/snappy ) - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) - pam? ( virtual/pam:0= ) - tokudb? ( app-arch/snappy ) - ) - >=dev-libs/libpcre-8.35:3= -" -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - ${COMMON_DEPEND}" -RDEPEND="${RDEPEND} ${COMMON_DEPEND} - galera? ( - sys-apps/iproute2 - =sys-cluster/galera-${WSREP_REVISION}* - sst-rsync? ( sys-process/lsof ) - sst-xtrabackup? ( net-misc/socat[ssl] ) - ) - perl? ( !dev-db/mytop - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes ) -" -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" - -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) - -src_configure(){ - # bug 508724 mariadb cannot use ld.gold - tc-ld-disable-gold - local MYSQL_CMAKE_NATIVE_DEFINES=( - -DWITH_JEMALLOC=$(usex jemalloc system) - -DWITH_PCRE=system - ) - if use server ; then - # Federated{,X} must be treated special otherwise they will not be built as plugins - if ! use extraengine ; then - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) - fi - - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) - -DPLUGIN_SPHINX=$(usex sphinx YES NO) - -DPLUGIN_TOKUDB=$(usex tokudb YES NO) - -DPLUGIN_AUTH_PAM=$(usex pam YES NO) - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) - -DPLUGIN_CASSANDRA=NO - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) - -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DWITH_WSREP=$(usex galera) - -DWITH_INNODB_LZ4=$(usex innodb-lz4) - -DWITH_INNODB_LZO=$(usex innodb-lzo) - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) - -DPLUGIN_MROONGA=$(usex mroonga YES NO) - ) - fi - mysql-multilib-r1_src_configure -} - -# Official test instructions: -# USE='embedded extraengine perl server openssl static-libs' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-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 - - if use server ; then - - # 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 [[ $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))" - # 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 run 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 main.bootstrap - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # plugins.cracklib_password_check - # Can randomly fail due to cracklib return message - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp main.bootstrap \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help plugins.cracklib_password_check \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" || die - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder - - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd || die - - # 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/mariadb-10.1.11.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild similarity index 92% rename from dev-db/mariadb/mariadb-10.1.11.ebuild rename to dev-db/mariadb/mariadb-10.1.14.ebuild index b71db06..539f3c5 100644 --- a/dev-db/mariadb/mariadb-10.1.11.ebuild +++ b/dev-db/mariadb/mariadb-10.1.14.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" MY_EXTRAS_VER="20160131-0252Z" # The wsrep API version must match between upstream WSREP and sys-cluster/galera major number WSREP_REVISION="25" @@ -22,14 +22,24 @@ REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " # REMEMBER: also update eclass/mysql*.eclass before committing! KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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='' +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" + +PATCHES=( + "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch + "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch + "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch + "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch + "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch +) COMMON_DEPEND=" mroonga? ( app-text/groonga-normalizer-mysql ) - kerberos? ( virtual/krb5 ) + kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:= ) - !bindist? ( >=sys-libs/readline-4.1:0= ) + !bindist? ( + sys-libs/binutils-libs:0= + >=sys-libs/readline-4.1:0= + ) server? ( cracklib? ( sys-libs/cracklib:0= ) extraengine? ( @@ -72,6 +82,8 @@ src_configure(){ local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_JEMALLOC=$(usex jemalloc system) -DWITH_PCRE=system + ) + local MYSQL_CMAKE_EXTRA_DEFINES=( -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) ) if use server ; then
