Version update for security bug 518718. Drop old.

Package-Manager: portage-2.2.11/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

3 files changed, 21 insertions, 10 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 113c2ea66818..00e64267ebd0 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.42 2014/08/01 08:30:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.43 2014/08/05 17:40:30 grknight Exp $
+
+*mariadb-5.5.39 (05 Aug 2014)
+
+  05 Aug 2014;  <grknight@gentoo.org> +mariadb-5.5.39.ebuild,
+  -mariadb-5.5.38-r1.ebuild:
+  Version update for security bug 518718. Drop old.
 
   01 Aug 2014; Markus Meier <maekke@gentoo.org> mariadb-10.0.12.ebuild:
   add ~arm, bug #518506
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c8bc8783c006..3f9a3345db97 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,7 +7,7 @@ DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910
 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
-DIST mariadb-5.5.38.tar.gz 45083505 SHA256 efc839e6627064b3b5c6c39854198f0d34907f48937804758d4c09c7717be8d3 SHA512 f83e501cb1c99ad17ba3e1c2fd2aa306664a16e22f71ac73013f04def6532ec1f678dade4075ab4bcbbb04ac2c4aea1cc72fd98a1fe23b17e314414ee0bc17f5 WHIRLPOOL a07f284e0a8615426f26af3698261c1d4edd4b1fcbe5190f33a0756e5d29e9ec84d38b454ca6c3f9f4edd1e009f59e06a6d3e99a2967ccdb49cbbaa02f7bb57d
+DIST mariadb-5.5.39.tar.gz 45084762 SHA256 cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14 SHA512 a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67 WHIRLPOOL d1c3efdb2ff4de1830e8d5f03709b7c7a1e037a07902fce3253473a241b62f15b3ccb54896e4ca048ecd952acc84577cfc0788632a2c4aa77694f86fe48f1089
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20140729-0112Z.tar.bz2 1494826 SHA256 a6963f853ae168ba04a2fea18bda6e44d6691c4be328496ba9f6818638f7cccf SHA512 72506cb13b8b0880b9bf8846b0f6e95f22a69760d5c4d48b6d346b2ed1b2c98c718c8833222457dbf832455846d6829e4e66f582b5c29fb3f6226df62086fad6 WHIRLPOOL 40245685a26acfddb882318813c689db28f4dc67e905c3e3b06e8e37c76d2d2aaa28a57cf5f147f1744bbc780731344e0e4c4ecc3069beb210f232eaab01f714
 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
@@ -15,13 +15,17 @@ EBUILD mariadb-10.0.12.ebuild 3844 SHA256 f17ea1151cbd685079059c83ff44ece3d44319
 EBUILD mariadb-5.1.67.ebuild 6139 SHA256 b078c8b775af3de788b876f1d0d2034bc869cbb50abd2e66f32fa97827cfc0dd SHA512 004acbbab9e6521e5636a664c690078ef439728caafb565628fbb51830fc346961b2a6a9859eefd9d413d31b843e86666277dc124e6ae56c12ecf91c8f193630 WHIRLPOOL 4e0b95f855efa3e848d950062cb6bb408a1349406961dd400a232ac70d5fe7dac7a2b60dd27366abc6d01ddc03ce8ba1dfc0c7a08b4cd7ef14233dd70a43a4c8
 EBUILD mariadb-5.2.14.ebuild 6139 SHA256 cda45549305440ebad53070326cc97145670e529e0a2442bf32313b3ae7bb87c SHA512 35461342dae9fc536c9fab694145e91e596b63e63a2530fb5e8565a81c996794ce777e21c6140d5c08e64ca1aedf4ced6b5a8be6a5d35ad94c36d307f812f799 WHIRLPOOL 813df13a7503aca2421e35152801d028c02ac541958046edfb9bec275d722e9125cd26195f6cb5de104edcd75015fce40a36a835f3d0dc84d27a294adba6f96f
 EBUILD mariadb-5.3.12.ebuild 6139 SHA256 3a100af180cf6996925b097486c68258befde65867b148701909263aabfd583b SHA512 004b15eeb91a184c75d3d48b179c5918ac56285e42364a831f265383be6be452c63830af9ceecc80c33f17c256338e4a9d16d3f272c3ff583e048390e21a7bc4 WHIRLPOOL 5fc916908aee833fc6bae68a1ca41c01d9ccec1a1401eef63cbbbca4afc334c8023c85fb7840d83ae5143084dd2fde444f4ea632314c794210d1992aa46f963e
-EBUILD mariadb-5.5.38-r1.ebuild 3923 SHA256 6d9ae471dcdc838196441a74b0b345b7d94b13981737ff3da6eae5d087a92210 SHA512 736f5066897e85ecb9e9fabaa1ce2963a9a14f3334caacffcfb1a2e5e26ffe75ebe1a1569c0eef1ad1101b732b4a3461f610ab8c3680bfc601595453b8a223b5 WHIRLPOOL 516f32f1c1e766a67aa8a91d0fbddc473235d2a39c5831846c104a3a8f8ecb8bc3e33c7a8e33bb6587cc457cd99bc2b0171041dd572c4a634786506c8265a640
-MISC ChangeLog 8817 SHA256 ec3b58a1f6e2fe695b09943c8ae269fe73db7aa6ca0b72dc87938eec0195b44b SHA512 41f75966ae1e6618df7271be9bc38fd5192de3e24013d81542225af0b80b57438432d8f85bb6671d83463ae57c6d84dbc39e439d3a02ed758cd0cd0734437b8f WHIRLPOOL 0f2ee0c69f7d390b8d6c514ebb2996759f6a208e66369b97dce27901027c7ebf4d884ac11e7987549fde39f71b6540e045f4769b7bd22afc45bccac485dfa2c7
+EBUILD mariadb-5.5.39.ebuild 3949 SHA256 89e830346434d11985b07d9b3ebe5c49235afe929aa49375a0b3f3bdd311c99c SHA512 8a6e30f0a34a7c3f30503a585cd5d344ffe4535663d5b754c5b934f408c7337a4044cd8a01e0ddb7fc93161a902d7672ab5258d26939950ea207153f6ae76ef8 WHIRLPOOL 46c2db55e3e18edc17de054d03a1b2c6d9ee6c5bbd73bdad893b107a3c7fd9a6c212e437a1c5fb2647aaa5a12d0b80b63a789f0e95003c4d147ad2ae5d653480
+MISC ChangeLog 8994 SHA256 25f185b670a30ef0e91c782a031a126d7ca186a5f52005452d65c8af35199278 SHA512 9dc342c67c475d2ec65fe628472b30de591b838b563f60e9f0f05989772d861094b143b004fbe039c9e5d751f4ac1ddc9f0801b56ef95561194ac0c190e64735 WHIRLPOOL 1035146c1ac6316aec83bfa2cd5b95883da5a29de02a8301f6cc04f0ba77aa2a2f35d0a5d446038e105cfc652ad4433025fb7591c7e6c69b3c8f983d153bd623
 MISC metadata.xml 1633 SHA256 f33ed7090c3e8917886b3efefbb24e03541e968a5833725dc066825bd0d7b6fa SHA512 c2fbbe518ac7a1f679b16cf5cb4add19369dedba343405079c044885132eae2a6e74126c4adb1d3befcef1050b8159f00f7576d259daac0c4bf81072f5647662 WHIRLPOOL 8673a8d013f14f8f965ddd50fdbfa0e89ea254b4afbd742d11fabcc500384369848801b55eba80d69e179661f41cf9b86e44eabc1e0923c5105257f0f2aee815
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPbUB8ACgkQkKaRLQcq0GK29gCeOmHbocKokhZpjKP4j9rzGprC
-s2sAn0CgrRuDbwkyys/g7ILTYVfTooGw
-=Hf6h
+iQEcBAEBCAAGBQJT4RcPAAoJEE4V4vFnx44d5mkH/j4L6CurCqMObwYa3RM26cA2
+1xJ74MtQ072AiX9H34asjJcxv7bbKEyYcINszI8UvcXvpav1F1BnZlRX4NEuQ7wH
+b/O1Sgj4p3Ogqmyf10N96MAUXBjl7j+jjxNJBuYiICl+QNym54tUdOeXWOlNqcY4
+hlcJExhm1I+XRIzNLB04HC21dWwA1SvF9K2a8FVsatrbpotU77Our1bDfG/AftMC
+1QoXxpKn2bZ/RFdxIO9HpETVT6h3c11KM7OTDX8EPPcml+gFVaZgSUw/26QNsX3m
+uHpdx/SoiV4cgySHvaFZ8kL6vZuy2SLQ6VdfuL3k+qartVO4yVTZxMeN01U6ybg=
+=9Utk
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.38-r1.ebuild b/dev-db/mariadb/mariadb-5.5.39.ebuild
index 9d8635506429..24aa609aa9ba 100644
--- a/dev-db/mariadb/mariadb-5.5.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.38-r1.ebuild,v 1.1 2014/07/29 03:28:26 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.1 2014/08/05 17:40:30 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20140729-0112Z"
@@ -64,7 +64,7 @@ src_test() {
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
-		# These are failing in MySQL 5.5 for now and are believed to be
+		# These are failing in MariaDB 5.5 for now and are believed to be
 		# false positives:
 		#
 		# main.information_schema, binlog.binlog_statement_insert_delayed,
@@ -87,7 +87,8 @@ src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"