Version bump for 5.5 series; remove vulnerable 5.5 versions wrt bug 546724

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

4 files changed, 27 insertions, 139 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 92dae5e65d68..0bcae666c3f1 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2015/03/25 18:22:33 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.102 2015/05/01 02:57:38 grknight Exp $
+
+*mariadb-5.5.43 (01 May 2015)
+
+  01 May 2015; Brian Evans <grknight@gentoo.org> +mariadb-5.5.43.ebuild,
+  -mariadb-5.5.41.ebuild, -mariadb-5.5.42.ebuild:
+  Version bump for 5.5 series; remove vulnerable 5.5 versions wrt bug 546724
 
   25 Mar 2015; Brian Evans <grknight@gentoo.org> mariadb-10.0.17.ebuild:
   Add additional ~arm64 keyword to latest version
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 073e634df422..d21bd628be41 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,29 +6,29 @@ 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-5.5.41.tar.gz 45526003 SHA256 a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332 SHA512 727ce6994966a42602ea8f735f34b1b3c342d08b9dae2667e465805bff36e68bf69b582ec0b844b25fb7024f9b25a39280160c2935f639491a1c3654d3166953 WHIRLPOOL 229b17e8acf34f7820548d5fcf43cf0af5f52977a7254a799eb2b28b0a239c0b2f2d3177751f9fdde112c6d336f4580aa93a0be663b15967ccf94a3ee7f4151c
-DIST mariadb-5.5.42.tar.gz 45586372 SHA256 3c868e768f4c24b4aa2f8f1725460d15a5485ed75e17b0755c6e604520e34439 SHA512 8fd9916e7ad225ea47936c34a14d37d0e4c9ac182b8791d46d158aa86151cbfe45e54e0b680d281223f175d492765aeadd7565e2a706d86b69696a51761e9769 WHIRLPOOL 9adaa1006ddb736fce0bdcc6d8bbc8012f083d443cced67088efe5b7107082f3c6ce1e4ee1d40558ea90501c69a7db456723ad7cb6345affece3adbdddfccd29
+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-5.5.41.ebuild 4130 SHA256 cb318bcab467cec93c0ccfcdd18cf94b00168174a6d4a9a7ee7e3ecaa3e39207 SHA512 1f4d897ff8673c278a06fcb02a145b395d9afcb34c253f8fe7ac4d19b699478dfedf0115c5bbf90d036a1c133973d5aed6e461858c8dce5415df4b7d1b7e255f WHIRLPOOL 0e35591160dd19105e3a58c42ab3f14bd8e94676ac35356431f55d3cdce2c57697345e58688fedd05afa3724558c7b45d51f7f0bcb6fdc4e5c827711b2ee9a27
-EBUILD mariadb-5.5.42.ebuild 4130 SHA256 ea14b8e345cbb20fb3bb8ae9544e6033d4e458a5254c0fb02ba6a885c34036b6 SHA512 c5c13d540570f724a559d8c77f54e6e013590099d12d9dea244df6f0e610ad0a1ba222bb3c9ce1e878b08ef1b063d6de85a93c04bab1001ad9b004acc645b163 WHIRLPOOL 0b36afabd9f2668b918d2d4875a69d634e406d4ae5fd83aa1ae60bca845a8a36cea6cfbd4ce3ab2409412287a0a946576adc5b0371291b8549f8d22e45fc4d82
-MISC ChangeLog 16100 SHA256 081e75712296f42307b323f45f99822baf07788e579dbe9286b30c7702d21e5a SHA512 16ed8c639a04da227eede6609132ecc2abb232a3bed1fb172b0ec979bf59583a92a6a76a8846e178a26e137320bd57a46971e83b5573639929f75e946e7f77c6 WHIRLPOOL bc309cf3453418ae816f385ad531283f33de45cb7aa2ef070abcbc793334b5db1e85245c8146b13dc61d88492c69c6cb6891101d7458b7f7bce8501456884404
+EBUILD mariadb-5.5.43.ebuild 4121 SHA256 fbc204d1d16e673976b725cae8639ff42f0fc6321dc7dc6da4ab7e7a55b5ec2f SHA512 70f573dd14d0a5b32710dec1388d2688ce61ad7bce9531ee076a5d9c1bb536cb63f34365d6cd05d340484bc0ca87e77435d73720b316a05acf9b485588564d5b WHIRLPOOL 699a5b94a79239f47d58a6b0432abafb616421a2fb14942c968ad76de4985ecf1a5e280cd83b0c014c29c40a3c99fc0ed8fe7a9fd8d13362e74bfa261667d279
+MISC ChangeLog 16332 SHA256 605891f23457a982f16c37d4f0f4f59cbcb37e3b23ffcc7dc5c8fd540a721620 SHA512 ab5e2c7fbf2e0432d086654c5924cffaa64736801cf3b06619b0c7db3570a3cec4e8bd153aad735f2eb140b57c7c343a8b8dfb782dea4b2143c6d73b96151f74 WHIRLPOOL f034c7b2429a300163a096e17566b42c347b84a0ed32c5b34b3fbf450fbde73c845275d5820681f9812e21521da769b6cdb6b097d19e5c9eef5b5e7562c27ab6
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVEvzuAAoJENH3ge/59KO27bMQAL9AS/TN7v1FUU+nrLA/NhTn
-d40/9sf4kMn0izs1SDtViUtjXb+fELqaXfbdtsbKWC9sjve2nUD9305rj/Yu/kN8
-nMZmrsr4UiRWk+/sygHcJub08G/5hNLKL78m63J0by3wXK1Rc+DjVGM9OQJvA04U
-GfL8Hq+joBWvhAXX66mCU4FPrQkRAdG1akEaR8gSvkXlPeu5UFWnsGqzax9KnZZD
-eC7FJF+HFAnIQWqgqqGR8mP3jH+Vdn4UaGupeO4OciifDDLAZR6SBFlZjzSyVA6i
-ZCfMSmn5EW2wi2BDJjTA3CHovr5zeIz5X31v47n7ALHIRZ7w2lvtwNPloYPDIKDt
-6qmeZ5/T0curTReORQAX5DHm0IgS9EDIPMfqKUYSyrF93gerWBiU3t2NCSNIoOJH
-WHzdyeB0vLAC9OBSlW5aeW7vwNrm5jH4nThpHhyOYyTcqiJnS9HeUdK0DpjFJ3KW
-ktH+P9oRs/vPZ5pnk0HYlUcpB1WxHeWFo5uh/mxa1g2P5QxNvVjtQcaPmc50cUcZ
-SG+aJiCGFgngtHZvSGsgtn2605XFrGgFP+iS9NlR7ytMSmd4zKoKn6AvD44+KKOh
-mq7Lkhteth4AOZloqL14+jH//fkgBA/1cErefRxjh9CE+wNmjIZeozZcwq28B94V
-CcKR7grJOCrPXKp9JZWl
-=pM3b
+iQJ8BAEBCABmBQJVQuunXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.41.ebuild b/dev-db/mariadb/mariadb-5.5.41.ebuild
deleted file mode 100644
index 853b356b888f..000000000000
--- a/dev-db/mariadb/mariadb-5.5.41.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.41.ebuild,v 1.1 2014/12/22 00:55:03 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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 ~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}"
-
-# 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-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	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}
-
-		# create symlink for the tests to find the replace util
-		ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
-
-		# These are failing in MariaDB 5.5 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:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_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" \
-			--testcase-timeout=30
-		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/mariadb-5.5.42.ebuild b/dev-db/mariadb/mariadb-5.5.43.ebuild
index 5a6f1bc09f3c..096dc2a95436 100644
--- a/dev-db/mariadb/mariadb-5.5.42.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.43.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/mariadb-5.5.42.ebuild,v 1.1 2015/02/24 17:16:10 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.43.ebuild,v 1.1 2015/05/01 02:57:38 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -26,7 +26,7 @@ RDEPEND="${RDEPEND}"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package