Version bump; includes security fixes

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 0bcae666c3f1c172e396262009a1000cca266f66..031618c01a6fdc16ce4d62ed1b72017889acc3a9 100644 (file)
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.102 2015/05/01 02:57:38 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.103 2015/05/08 03:59:23 grknight Exp $
+
+*mariadb-10.0.18 (08 May 2015)
+
+  08 May 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.0.18.ebuild:
+  Version bump; includes security fixes
 
 *mariadb-5.5.43 (01 May 2015)
 

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d21bd628be4175c90c718f45cd4c5515e4316c9e..9c568928352117a926d4401d3e05750d3e50afaa 100644 (file)
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,29 +6,31 @@ AUX my.cnf-5.5 4916 SHA256 b579073c015719b9623e2e00a985587947bb3562958f6e6f55530
 AUX my.cnf-5.6 4687 SHA256 dc94a99e91d082b47c0ceb10badbf12a44c5ab7f60710bcc2e5f136328856d05 SHA512 8e568f6002a1bef3be73e6e0811fd2479c0611fe8f55175e114d622860801429ebfafd6fcff7c9f38679185fc660b100d24fe599b0424cc73e776bf5c0aeb3a3 WHIRLPOOL b5800fb149a99582f4866079946ba744efda79abbffcea2db495566daab03e6a55f7df1adf63f11c43c240ba5c1df64fea233f60481d27430729011563afe209
 DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3 WHIRLPOOL 916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
 DIST mariadb-10.0.17.tar.gz 55989700 SHA256 9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311 SHA512 6bcba66373abeecbd50098e9047cce91a388f336bc178c8767ddff0bc7885480677d347a929507b49ba2277746440515b2b3a90465497f475c95e3cd8b15b4f8 WHIRLPOOL feaabbe75c27f054f5e184737d95047fd508133fe655e2680261ac1599b23c71e6f58b3b63a6a3df0c675a345c201db266be31e43a096af916e71cb5e82ebafc
+DIST mariadb-10.0.18.tar.gz 56238153 SHA256 686fee90aaa04a112256d1581336fee734f2d1068784be57a27683ca421a9af5 SHA512 64a093f2d0d9809d77b77cdd067132a8f54e53c5f069bc06340c0b2bcc5938c9c95fcf8e01c3d5140e31455b9c6e2dcbc06e11cc2ae43abd648f811f1ade86eb WHIRLPOOL b1677e5e65bcf8c22b83664b4491e40b31c13c788fa207734c4b3f2808737fa78ccf0d7a70edf1a2f81038dfaed96ab1d2a86912534e457f616e0dd01788b017
 DIST mariadb-5.5.43.tar.gz 45651398 SHA256 a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01 SHA512 fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db WHIRLPOOL 4d9b219263e75dd6530a24fe2d34df370cde0cfc7b13b5a820567d84cc4da22864e1fbb0d3413a23f2b9ce12c7fccd32c09aad391e690b510b2c7a788f7fa88e
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 EBUILD mariadb-10.0.16.ebuild 4219 SHA256 8d0b967ac975033b04069dfa545870364e2a7cc426e3ba22afd7fc1dc41d36e2 SHA512 954e8ba9171201a9c625314a2f8feff9475a6ef16a03ffe3a4af9025048b1aa073eab2d46a1226a59350c6e3aadfd4a3651b652598a2612908d8eaf9d6e9d2ad WHIRLPOOL 341f4c708fe3294b69b9c4e42ec560fe8c8d08e15167e17619d883b22fa496eaf9e80146b95bf08b81c89066e6172efde5c3004d592fe0ee95130b62d09bc1d0
 EBUILD mariadb-10.0.17.ebuild 3968 SHA256 485260842a4851905a2958763211f63b47e8688d3f3d70029bdb8e869febf158 SHA512 6fdacded90e501d4a4be91ced490c5a750e946431e6695c671612947f2683c98b30d95b189a9343749c32615efddd69c2265119cd85b9b4644e25eabcecef1ab WHIRLPOOL 6424d50052e15a40fb22acff22bb4b7c296fac2877b2286011977cedef4e4a1b1a616e9f7189d1e49430c6d21106b36196b07b27a712ab6f41b48ea9455cb72e
+EBUILD mariadb-10.0.18.ebuild 3989 SHA256 90bdcd3ef92ef406e793c31719f0c33fbf22b0be34247ef49fdd554d17cecb0a SHA512 76ad8426e2c902fcb2139369263f38a18fa3c19e0b12b147b21f0c795a9c3f6b5f9408307ea2794d6dea68f891b510bf5d3431f7234465d8b6c44ac6ba1a3ed2 WHIRLPOOL e397640288eb3500ba20686223ae25376b034c556699ef85d2d3cfca51bee1ae573375c92d6167ccb210f8b01d996536fda48508d80f8e78b30a438b20261885
 EBUILD mariadb-5.5.43.ebuild 4121 SHA256 fbc204d1d16e673976b725cae8639ff42f0fc6321dc7dc6da4ab7e7a55b5ec2f SHA512 70f573dd14d0a5b32710dec1388d2688ce61ad7bce9531ee076a5d9c1bb536cb63f34365d6cd05d340484bc0ca87e77435d73720b316a05acf9b485588564d5b WHIRLPOOL 699a5b94a79239f47d58a6b0432abafb616421a2fb14942c968ad76de4985ecf1a5e280cd83b0c014c29c40a3c99fc0ed8fe7a9fd8d13362e74bfa261667d279
-MISC ChangeLog 16332 SHA256 605891f23457a982f16c37d4f0f4f59cbcb37e3b23ffcc7dc5c8fd540a721620 SHA512 ab5e2c7fbf2e0432d086654c5924cffaa64736801cf3b06619b0c7db3570a3cec4e8bd153aad735f2eb140b57c7c343a8b8dfb782dea4b2143c6d73b96151f74 WHIRLPOOL f034c7b2429a300163a096e17566b42c347b84a0ed32c5b34b3fbf450fbde73c845275d5820681f9812e21521da769b6cdb6b097d19e5c9eef5b5e7562c27ab6
+MISC ChangeLog 16479 SHA256 87d7c1911a65fc28c949e93170a16ef5b997de6d664b19e2e62ebe545b00f19f SHA512 b011c01629e2f91a4a16636686e5d5c5777905b2248c710bb96f47e29ccb2ecf4d7aa2dfbd5b4bf0e1db071c03b1b6201e398ccd9c5a88e283a7d7a5c730649a WHIRLPOOL 09c6e7d3d47349f9c0596385b674eb4f0fa3725ec6d8992ecf2560d36d9df3154ed027a30bf647ea3bbf452d9f629829ebefd71d59692effa915b31af948a583
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVQuunXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVTDShXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2hbYP/2tC1ZMV8JNwB7DzZFJG8xmR
-udTdfXaCgL0uGx6vuiytbsc1xFQf066MF4CF55UHbzTI6JXVG0IwW3IISo3K1sTU
-Z/ntmMQ5GN3MVDFr10f6I0pbVnmxOj/97nIoWbr/PLSrWaOQBaD8Z1olT7OYKk1P
-7XxDGpSuiEfJEABk1JzRyXoClxnB3ZQe+BstLHpRfnH2PfhYbu9WUsK6rmnySHBc
-OEDTAywn6Zwr7Qneg3FIXtawgLDlcMEbbSRzKbOjEhgJLhhuhDXtTYFVmoC5qLLF
-Qa1EJUEYQV0sRoyc/6mbY2HXjlut1Ci9xaynLPxKpsdLSRLqGw3Qu30zs4JTnMvL
-1XXjbeAB1LnQbLaJ9rvGsvdgi4WkuWVnbQQy/opGxDjqqabHrBV/9Lb5xekPIyKe
-AVmEta+j2UgB0852kNJ78XQJcSH06pvicVMtYqi9cxf4Arm5w0S9ebeXAKVytYyF
-kwSSXbqqsZbU1p79khfM5YCYf0PyZnEVDhCOF9aRWbSVMZSt4/dwi5IvwyZCKBcj
-6hMaiYLgKd2sWaE58jMj9ozzArJeBUBjfvr3dwecGAHHB/I+mWYF0dD9a5Hbkiso
-LLov8rKI669ITLsvvuFCg1FsZmNtfcFJ6eLA19emePnnC8xi+Qm11nOf6jFk/euk
-IEKWAhUKICZGC+I6xIa8
-=lRsf
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2ax4QAKef8YI/owgjMpNZgwPz2jpm
+dNhwTKTnrMWhWggj5om3Kc3QFVYBM8aaCpL53WXZlCutoc3a2UUuuIhjoWXQPUOM
+w7U4K+wqLymfm/J8Nxe+qMG9t02aHbi/65Mp6FMD6ZDfVB0srxmW5ggQsMaS0roB
+HzA1SWvNp78xQsrqMKUmSnAwq6N/blbhufCgGPRkAqKwX1LOY4nGYQmdSUSPWsOD
+VwhzOxZJmNz8bLQ/iDw3U4iZhjIk9j2ayn+rZIGcmq07OOe/y6CnClFiImQWJ48R
+nmH0/gcThIqZmBqHuyo9ZJRMuWu2l8/+BcLp+RkDJI+URaJwmrs0KAKMop1n7lj7
+B6lHAvoDJLnDoaprS7FPIIrgP7+A+VC86MbRB0ZLXVXu1jgIOjHWl4D5Jt2y5mVl
+RxJ+kuMEwAUZncaN90LEMYia+3+9R206CoVybjlCCJYNo8aT5XE25zoqjdcG3AXt
+dNjNePiqOxKv6Z7tzUO2N1vs3htzse28eN52SOfeZjObj8KE29QjOBjBMMpsSJ0s
+oTgUp3lC+srvSMqkkKdw7KtneX95XMYR0C6+Bv3vFTVAHmmmcq017cUBi8zfsFS7
+AIxtHjxYjZwA80wJudJB39fT/xpOlZttLDS9MWY1cVVm1izpWSg3Bglnw/SwbF5s
+8OvpmTL0Ud5oa1hAaSW0
+=oTDj
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb/mariadb-10.0.18.ebuild b/dev-db/mariadb/mariadb-10.0.18.ebuild
new file mode 100644 (file)
index 0000000..4f0d6a1
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.18.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.18.ebuild,v 1.1 2015/05/08 03:59:23 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~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}"
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# 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
+
+       # 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))"
+               # 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 "${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.
+               #
+
+               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 main.bootstrap \
+                       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
+}