Security bump wrt bug 546724; drop vulnerable versions

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

4 files changed, 29 insertions, 160 deletions

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index 0ee5f1118042..b010fe9ab151 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2015/04/03 12:34:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.15 2015/05/18 20:07:51 grknight Exp $
+
+*mariadb-galera-10.0.19 (18 May 2015)
+
+  18 May 2015; Brian Evans <grknight@gentoo.org> +mariadb-galera-10.0.19.ebuild,
+  -mariadb-galera-10.0.16.ebuild, -mariadb-galera-10.0.17.ebuild:
+  Security bump wrt bug 546724; drop vulnerable versions
 
 *mariadb-galera-10.0.17 (03 Apr 2015)
 
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 7f6b3f9c9382..010847fd69c2 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -3,27 +3,27 @@ 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.16.tar.gz 55886236 SHA256 c730c6dbeee4e2985a8db9dc15a6b6e8e64db14cef1442ee5f6732d2754ed9fb SHA512 2a3fcb79bd32420b4b69118825ed4c954fcf7d1fd2358159687bc90157aef9e440d24209ffa71887029b66adca14f439f08d3edfdcee431b9d8bc49a9c7e6762 WHIRLPOOL 60c27680e8ba91f174cb9827e9def0760e8e388f4f072e9d8b71b102a57f2e141dc6cdd66604ad802512ad24855af9216ab4d87718f30c1ff599b3222b44d31c
-DIST mariadb-galera-10.0.17.tar.gz 56229230 SHA256 6ee9595630c0ddd498afe086953cbf7430aec48fe429230f8615627881897c6d SHA512 ee9e437d03b62f8416847ceb2843bb40110aa904ce4c8ae53e4fff95ae60871859128436a644e995ba1f62271c9c0f42efccda095747a9658e811367670ec2b6 WHIRLPOOL fe08438e96b87dc569d3b790147ee11c0af0394f56fdeb31230db3ed6d8dd1b58ad6e145fd636bd1574060b99b3736cf14a8a886980ef054d8f6e6a331c6c7cd
+DIST mariadb-galera-10.0.19.tar.gz 56520261 SHA256 df5c0e8ff2db0dbf2490c52f5d9b509216e2d89bf6d340920aad2b41d4d1ae75 SHA512 9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7 WHIRLPOOL 2c60ee6a82e8f6effed3b376a7647f0bc804de633d770bb215f37774bd7cd1f38b0ef173b68ec3f3eab9f59ffee77cb05668159873a5ebd863d0d96735f39edb
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
-EBUILD mariadb-galera-10.0.16.ebuild 4825 SHA256 420c9e3aebce78de7ef668fa74dcb8fa1b2d951d2294b63c2c211e85a2a47c4c SHA512 d159121fbbf3ef27713e40e0458d2716e630964a293a0d68ee611d7bddbaab0a12843c5c244aeab17089716226c018c402352a03d9e37132780f85977184f710 WHIRLPOOL 09504889d58df65ad0e20a0374648efca7467bbe114d33596883effdb342068ce8c949bbb917b00ebbdc75080ca24cea2cfb6fb44f84d22ada11596c1084eff8
-EBUILD mariadb-galera-10.0.17.ebuild 4480 SHA256 c6430330613f4ae748096f8f22d882a44c2f7fcf0a5cab66e6792d03c70abcdb SHA512 a1fb00cc67188d5ae9ebe5e3de372d35a7e0ecb0c0309984bbcddfd9d21f3f0472d57d62543927ba893710a52f587d7e90a7dae80463f741d1affd2e3ba9a76f WHIRLPOOL e1d394280309182dce80d9fa93a3b7608da95b018f230d0fd323c9dcc9237f22ed49cc610f3a342596407d86f592fd9e98eaadacdfcb6820848f174c48a1e3be
-MISC ChangeLog 2145 SHA256 0347fc56e298f2ce6e2fe573b6952d5ccb056283d90213f97bd9d893851236c2 SHA512 2431ea8443dddbf6e9f83666f8a620226c51417e9f373d2a538182770e4d0515984219de2504cd9c73d6676f3c9d1ce2cade45d1b4da0b583c04ff2ccaf93dbf WHIRLPOOL 4b02f54a314b7078237364f09624c1bb35d8d9baa155b8708e6c427a726cc653455e842a46235d7d3ea2b9cb65cbdd3b0a4fc0045428fe3cc51a1c1a9be1157f
+EBUILD mariadb-galera-10.0.19.ebuild 4511 SHA256 0635d16ee891d12dc5dbbde316d17321e23e202be17fd5e62e58f933d8bdd822 SHA512 88d65f197887471d22130d205ab7fe59ba102ba1fab6814a09aa6583dfa231feeb8627175845a6cd49cb8ed37e1fe02d1368b59761fbcb24c8af82843ddc3521 WHIRLPOOL 5b239d62bd9b7d14f9a1e71650ccdd24e75e6e69d4cc357a2f5bcde4c9023bc3e061492902df12546806a92b08bab3a3156d4ae86e09ba4b4f74f14cf5c28b0c
+MISC ChangeLog 2389 SHA256 0106115ae19d20ea34cceb0689bb243841f779b9bb56cc7bac8c27c959e71c79 SHA512 d680b37b8d7ef74219f41cba3390ab92a800e99d6d98d7974f725169392c8615f6000cac1ffa287925f7a9ed0cd3b3e597faa83f111f528ae13457cb68b6cb54 WHIRLPOOL 90beba1228269cd975faccae82decee4d4ba24584313ae91451d599cfe2d9142924d1e19b81bdbdca023997fac58177974d99267e9a8eb8d6cb64e388d3b9d40
 MISC metadata.xml 1521 SHA256 9f2d38d33ed259f180c31db48b43bed4b4d123d2d204735813ac999a708478a7 SHA512 a232dd0d0926b501f79ed4748ef9aa7f01d5513d4f10cb286f8948cc5a4cdc266f1ae122f0a3631e56f3929648a3c6a4d7c56ea3cf11d05c73f8bdf458508e60 WHIRLPOOL db1d1697a97ab0de1b34c4b8c24e65866d460c2cb430b1f44ef91a2f6ddeb8ff9cd4b3d268aed4e1e1ad76ea9fa63e33c4dc2a33ccf8f79ca67933c468675c02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVHojQAAoJENH3ge/59KO2/aEP/iuJsLzVhOHOZU5Up+TR1/NB
-OzZXqMcbG4S7IzpcUr1QALGp/bYCQSW5cVA6E2/3y3vzCnr86MOXdKD4di/DT2U2
-z9d9gunBi/kXLSMKfnnQOGOA8OC+uykgWqqhmkprtnc3z4Z8BbN8YcYgkawm3sa7
-Rwk7sBWUtP+IgPzoKecOk3mAAbnJsCoTrrYLmfpjQC4e+cl4Z4GVid2/3+TQlGw0
-EzmBQL6RbvtK1w9Rt5jKWMbgAFAw1zf+EuVzmgm6x1h+moD5SE2xVrk8cQrQi3Dc
-NMtHdD9vAB/J81irHtrK0A5ICzQpSDuXZrQgiwFzFWEWNBM9LHpSJ+ISvTZLkkfT
-WXDsVADjuWVM4FREaywRktQqeIiBR9jf4knyAKktA4yYSkIgA+oiS3MFi3E9vzye
-tu7PgZ2B7GBLIpsgOeDUm5PLaSTZlcVeWjYcqAGlQC23iSl0KOpQZ5GhoSt74mRb
-rjamA1vRxkC/05d0hXJ9GPbtCd8qbBRRcHpHXisPNiBxtYNYrQ7vjpZdYeK+/cJi
-IAfegVHDKLVgIS4N7z6W+GmffgM9xFHiOlixY9m417syBLwrdWqYCNRNgYttN796
-lQc1Owx+o2JH6+TwzHuXVk9UOcshu+iLGGqSrFB/+O/hsc7SZnFj1Rl7EqXL/wYi
-agSFDq9P8i7jUZ3nesDl
-=JvNj
+iQJ8BAEBCABmBQJVWkbkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2mAEQANxOEDPp40Y6VPMtcr4GDNSH
+jJqGHVQYa8QnAWvoFtY9W5XAvtxRrTHbAumk+bD0w8YpFXniPdNG9rPxeQODBq2F
+tLiJ2E1Z7kqxIr0PNFNY05qYmdZfHeUrK7rsI8s+WZWAX3kKzDLrKC0ZbLUusgax
+kSFzcisVVCRHGdmiJueES76pwea8KNcVKUGGypPAa0Ubw2wNg0BW5YTF1rUEdd6b
+BI9I4vXmJN/AIFbvxP4GrpUpR0YT6pSXaO6ttwGfMgw8gzQEoNEeWKSXZMxHlUNP
+8ENjwdQx7SANrXe0DFP1R2E+A2BQI5XIwtP+T6OvKhtP2KAiaPh6Ilij/m84cC/5
++nXzqYxd3Ljsx07POUxqtX376C4qzC+oNUKgY17G6T7optidc11T3joN6EB1PqZd
+BDfer7WjTKHkvD/jew4Xonud67380RVqMU78txAMGwD6JiIGrfs7c/ZydAyBWk2u
+BSVkpOCRek5E+bZnP9W6M+UKz1En9R0TzFsnC1hPqF77QyExwGoP7+Kg5M246P/b
+DR6O87TQX1xl2FYa2BU4yZ0PyrlKhofPWQ1mWeAKobtrD2Rpf/5mM5yRWj1byRW9
+awRjZlcVEbrUovOawgwEhBWsg8Ci3RSnWhTpF9pRblZ9itD8ZsARDAc+dRaGjbI9
+1lXpfCF/r7T0WRGD0tvy
+=G3wI
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild
deleted file mode 100644
index 0d6812f4faf0..000000000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.16.ebuild,v 1.1 2015/02/06 14:07:36 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-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
-
-		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" --skip-test=galera
-		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.17.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
index f5bba52d425e..3b972ef7ae82 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
@@ -1,6 +1,6 @@
 # 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.17.ebuild,v 1.1 2015/04/03 12:34:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild,v 1.1 2015/05/18 20:07:51 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -73,7 +73,7 @@ multilib_src_test() {
 		#
 		# 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
+		# funcs_1.is_columns_mysql, main.bootstrap
 		# fails due to USE=-latin1 / utf8 default
 		#
 		# main.mysql_client_test, main.mysql_client_test_nonblock
@@ -88,7 +88,7 @@ multilib_src_test() {
 		#
 
 		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			main.mysql_client_test_comp \
+			main.mysql_client_test_comp main.bootstrap \
 			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