[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/

[Brian Evans]

commit:     7d38a24696b5618f2b2353a9bb9ef409ae6155bf
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 13:34:17 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 13:34:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d38a246

dev-db/mysql: Version bump for 5.5.58

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-db/mysql/Manifest            |   2 +
 dev-db/mysql/mysql-5.5.58.ebuild | 133 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a269145ed5f..03dc9b5fe37 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,4 +1,5 @@
 DIST mysql-5.5.57.tar.gz 21044615 SHA256 c1c2bd321e524f92e43fe73d0d6745badd538c984c7561b273ae10e9aef57384 SHA512 493e6345a2d8ec407fcfc6ed5b67599c77b6351b7cfb1d676b39f68ac9446959cf0822c0d0bcd2206cea07b8c06c85734aa8501c938d6393ffab220f3f5ee6e8 WHIRLPOOL c321bfc26c7b5a1bdaddf2be9de84c174869743034f4d5b483767c0308875bc583f6705982ccb4935794b8ce94a1234b2b8561c933cced5aba11f48e93fbfe15
+DIST mysql-5.5.58.tar.gz 21045852 SHA256 9b6912faf261555c8975db24a987f63f36aaa28052a301e85538346ace0009b9 SHA512 a57613034bb7456827d2dfa3e6d1fd006c3bd3f61e6ad4e882bb36a11beca4cf3d76b6b6d2bf0ccdb115d6896a08a7a20d0781a31e22abca2562b7b9a81614b0 WHIRLPOOL 3eb0ebafda2a43982f86c279fdeb32e03593ec8f77e1d9db6b773b14b5a7f18d282bfe5871ae9f8eafc915d909c04f05486d25247bb8de16b41850964057bafa
 DIST mysql-5.6.35.tar.gz 32167628 SHA256 dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 SHA512 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2 WHIRLPOOL e8972bba163453e54dc3859a7cfd07b4dc38125e0b5f7b41940afa6f1466820079f18e88769ea198b12645383d105340ab5ea998b32a95d083d08689658510bc
 DIST mysql-5.6.36.tar.gz 32192348 SHA256 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 SHA512 b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18 WHIRLPOOL 628e33a58532dcdca20e489c3120824604b8d51e10d609f1f9c2adb11552124a8f87f206df99766162d288d5877dac22d2cacffdba1458c73fb52b529245a1e6
 DIST mysql-5.6.37.tar.gz 32200158 SHA256 59c4ed39047279ddccd1bed9e247830d2bfad27d56dc2eb48d0b5695c94a1fbd SHA512 6935cf11490fb32832468e2a69a9d81a567b1b4ab0afaa0614896e3ddbb95a74b26406284f307637e4b2b9620ef4d96a167128ce7fcb1d338b0ebbc2cef2e597 WHIRLPOOL d5e7f6445bacfa7cb118a805f0efff5f4c22d96e77c174efa7ae2d286f3889ab7975ece8a0abe6232d278994d5991430d0d0ff89769883f278d2fa233341db25
@@ -6,3 +7,4 @@ DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e
 DIST mysql-extras-20170302-1359Z.tar.bz2 306816 SHA256 0375bffa8a7b26caab3a13be299b30231f20ad3e8dc82fba9384e5463763a105 SHA512 2c096c68e0d545c98fb5520f92b9e85f6bbc910853793f60f0e67979ee927410bbecadece3400364fdc2b5682f9105664f6a2de8fa0ee1818fb266e063e82869 WHIRLPOOL 6629f0069b77c9add86f4a40168a1dad7bcc0ae18a513f05e44619366a5fdfb82238df2e925de88c358fca2dd50f162ffefd8efea335cb544ccdcf74e73ed25f
 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 SHA256 725dc29fa4a553cfc0bd07dcc1259e5a38a6d945f757e9f49f554a9a7773abe7 SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122 WHIRLPOOL f1606df56f82847a8b4b332c1b61cb695aba2a51aef895fa9596495d89208535f829b8fa69a6e97a26d0b9171d817115b83ce447c8232197353dda258a6d38d0
 DIST mysql-extras-20170719-1630Z.tar.bz2 311320 SHA256 d21f42035850a3208a89d4271d2c544b8ccbb3b8855390b882248561451ae4cc SHA512 a2369d512b8e490b5859403c4c15cf9d8ff589000e56785f0fb02ad99535af189fe93ba9590035bf0b8cc1d0c7f3656c56d86d94d62ef97fa63cdaeade609f38 WHIRLPOOL aec2eb79350008464499f74cff002589628fc8e4e81970cbcf1d7d3ca0a7714d9ebc6408c7f25e037f452fb0b3397e7885dac83277884692eb3a88a26d6625c4
+DIST mysql-extras-20171018-1327Z.tar.bz2 312593 SHA256 644f39ec61152b94811aa4290aa61f2194c5a409bf23fe8d23bdda02de52dbda SHA512 3e6341360556de3e17e60f7f52cc6323f362f0278c8c7e01c32170e60ff8a53d82fb1189c51fd532565d52129e1812059221b27348c8f5dd4492b88363c443d9 WHIRLPOOL d7de2b03e0df5af130a49aae6edced12e99d764b78a422f9d4d39919f4b644a9b86f6846216ec85eb2ddf2870e58d85aa707cf7a6b596994986c75ded45776ef

diff --git a/dev-db/mysql/mysql-5.5.58.ebuild b/dev-db/mysql/mysql-5.5.58.ebuild
new file mode 100644
index 00000000000..7be1bdd4644
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.58.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_EXTRAS_VER="20171018-1327Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+
+# 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 ~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}"
+
+SLOT="0/18"
+
+# 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='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test main.openssl_1 \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		for t in main.mysql main.mysql_upgrade ; do
+			mysql-v2_disable_test  "$t" "Test $t broken upstream - error return value not updated"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--testcase-timeout=30 --reorder
+		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
+}