Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/Manifest38
-rw-r--r--dev-db/mysql/mysql-5.5.42.ebuild126
-rw-r--r--dev-db/mysql/mysql-5.6.22.ebuild153
-rw-r--r--dev-db/mysql/mysql-5.6.23.ebuild153
5 files changed, 22 insertions, 454 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 49e5b898ba52..4ed0fdc15e73 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mysql
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.737 2015/05/27 13:05:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.738 2015/05/27 16:28:53 grknight Exp $
+
+ 27 May 2015; Brian Evans <grknight@gentoo.org> -mysql-5.5.42.ebuild,
+ -mysql-5.6.22.ebuild, -mysql-5.6.23.ebuild:
+ Drop vulnerable versions for security bug 546722
27 May 2015; Agostino Sarubbo <ago@gentoo.org> mysql-5.6.24.ebuild:
Stable for arm, wrt bug #546722
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 49bcabb4176a..3bc4471cd11a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,35 +4,31 @@ Hash: SHA256
AUX my.cnf-5.1 4764 SHA256 2231b1ea3bb8cc08122c76cd0f241bfc68327081a37df401d5c24eaac8b77fd9 SHA512 289e308db78397845685463d040c0cb19ae5f631e241239cceb70ce1aabc651b47ecc5f82e834b3889234ab42d76b6147cfc36e5e8a8c23f09c5878cdcf89d35 WHIRLPOOL 30089aee86e8f0cf97d736f45fe6b40a9ea001087ed34d07c4ce7408b61120af1852889e1e6913ba25412fcbf718900353dddc12208b85b842c5b59bf5056a4c
AUX my.cnf-5.5 4839 SHA256 186c26831fe00bff8220c1edc66fdb15fe4d3feaf93090d30f596ae7bea34d38 SHA512 73cb8c11e326df4c12c000267bce518282c8209a67f8472b9c9ddf914f83a1548278c21b052e8d73e41c42d6d3dbdfa12b0e78d4e00abbccfe18b9b8549781eb WHIRLPOOL be55ef14fb8beb7645b80676b5ee38bc9b3afc64b63502ba486c198babb06514a3b94f4b396d310d5440b148e8d91c1f6b86922c3573cbfe1b5496dfa1b7b822
AUX my.cnf-5.6 4610 SHA256 e2af6129d68237a5b69f076a3bb5488c55a44724d67053a1e4e74a8a02c3ac9f SHA512 c2da2d7ba8471f0e25cde0394b5d7a09dc944ed8311de823725acfd646d3bb77dc8ca351d412820e47955a5f6a36dbf1414ea08d74321a6ff5167a7bfa34440e WHIRLPOOL e473b9dc68322692854c42c3d51c3091fa25ae7f9a3db607e802486172b32e5985cc39655fbdf788b5a05866a8fdae99bdeb5a3ad54ee9d9eb05c3d120e38d27
-DIST mysql-5.5.42.tar.gz 21795431 SHA256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a SHA512 d02ea8d5a3f0309c2bd17241c9feca81ef35acc2595bfcb134fe436cd6a3d9ddbac5daa71ac75d953518ec2dc5791f953663648f52727bb37cb378d6663f2e0a WHIRLPOOL 43accca23246c353d0ce4e8d0807c4f4f80ba00e2a1d08a97fec5e59abed1278c34c2cda010894af9f98e866aee2a33614c8bf4fe4b840d45ff1d88993a1ff9e
DIST mysql-5.5.43.tar.gz 21784417 SHA256 43d3df79e5c839a2749deb6e056a4589e49c903e09034c18653ec56e6e4774cd SHA512 b14506ac45fa4c69a6b7bbf64b2c3e59516b1fca3e0cce97e9712c09abecbf50071a60fc09f3e009d8591bf0d7352f28479cd8cb5445008ee146735897878b52 WHIRLPOOL 93e77045f4c4b188db38912ec6709bfee1ee0e0b7bf4cadfbeede8aef701d1f0cbf238e02d82013ceabe13df952e4f08c75bd3ad7504790677dc5a5ec4844fea
-DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
-DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
-EBUILD mysql-5.5.42.ebuild 4292 SHA256 95cf55c3ef4dfc4a2c0542df59f905adc3c234a8127cbedcb58fe1b1b993c611 SHA512 359c348165f9ac704a12b01a5466a6458d8cb834b9bf8f99213838de30b76b44b2687f51e4259ff47637063e0b6f56fb585cf60b3f74663f5bde519dafb23f15 WHIRLPOOL 376c86fbef28a483e3c3252ada4b374002524b8f50b568496c4973bcdde0268e54bb5ac72fc96cca3e94ac690cf0237841b4978318e3688ecfedab1d46f1556c
EBUILD mysql-5.5.43.ebuild 4283 SHA256 59e3a387495fdda43c00ebd3e89176f69f57b28aa96b0117c2c244e48ce06ac4 SHA512 75673da61632ded098e78bea7ae934669fb527b247114e3f07d7ae4a2c28c66b6d79bd1fcc617ec0414d14ebd4625540d799fbf6078ad5496432ed0e874194f5 WHIRLPOOL 1a7b2215262a9585c1eef0f2efff40e77aa5cb7e657304f5aefd361bea6e94161639d23cfa6c07b1cfa9d7fac8e5175a989b480cbe634736593a9476eb987b05
-EBUILD mysql-5.6.22.ebuild 5246 SHA256 62e35b6bae6500c03fad65adcb9ec0515d6ed451508975b2229e263847a398a5 SHA512 216d781c137e0547ee2741e8d6485c7aab43849a56a7ca4f9624bf3eed599f4634fb58fe64f4bb92e938ba29017099327e11a388810698bdd5689d170bbc417f WHIRLPOOL ec74391cc9f6aaa9efce03ed26b06a3a9767d224a81d2dd21cdbcee510820cbe55383cfc7523e2b43bbf12ff5fc6e59428eaf7a16f4fedd52c33dcf51b09bb26
-EBUILD mysql-5.6.23.ebuild 5254 SHA256 b9356860456f09d8b1a6a1a11ad426cad2858e40656efb28c3e820e3546e80fb SHA512 c42face5dd2d23bc2f3c4c4caebe0b7b52666f4c3fe48406f57dff50a0f63ba2e86cc8b4eea2448bd59c4827b51a0d59be3d7f937b739da65d7121e606a7907b WHIRLPOOL bc60e6803967a33210b3b81b2af34cabbfdb82eaf22ab2c4d94e74c0001ef0467a1a5dde2ae1069a421607348aca7f28e8595a5448760d01d605044ba77e6577
EBUILD mysql-5.6.24.ebuild 5232 SHA256 8c083b843aaba3a314cf941c8528bbdb7e379959d0a1799cd901c3db5a452a9c SHA512 07d45850ebed09ee9be14cc05de1fe9a5db6c6ebe63072be082290d3a636273093c001783672e321dd6314ede84db75fd86988f98faf225ef01b242b6157a535 WHIRLPOOL df242e53126a03cfce5fc671c1e579057e328e1a3f0acc0631965e07a1eec1afe533c71dc53c90937d11677aabe7d2ab45d8506bcc3aa47728441b7169faad1b
-MISC ChangeLog 25674 SHA256 608117979bee71e5c1855f29d694088742024dd892adecc6f7c237bf4faa80b4 SHA512 6ed071c17d0281adb51d4cc41ee6515fce53281e267f7aec1d304f89700cbb7fab25d952e25d4127c0e84607e330131dad9e283ad54b57797453ebb0de0ebfbb WHIRLPOOL 23401898439a7181f06795a3c60cde19e615768867717aac3a9f9e31c59e6473f5f7d225e2603d26274c2ce4d43d8ff3f24ed2995457fd8250b7f576aa7dba3e
+MISC ChangeLog 25848 SHA256 bc535ee22ee3f92947daa4e5b07d94a0aa7aa1817fef5af27c26e0c7a7b0a0da SHA512 096115f91c533be556ceccec7c20cc31d3ea628b781fddc9ef0f40cc26568e55e3595531f29dde6d536e0931b33604ab8a5eca3cdf1c7d03a07bf91dccb20d45 WHIRLPOOL 41c40c48ff8721c41c92ddaf02bf76c274d98a211a5dd930be61af8adbc3bc43d9af0aa64d01dd625f2f51d53a987dbd369649adefd6119dad2bca1f388da544
MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
MISC metadata.xml 1195 SHA256 de7dc626aa238322a90b982b1e2055d9f6b0b0fb4c72366a6ea79145626154c4 SHA512 236b205d90988ff622eccffec1d0811b1600115089b45dc1da457e707a3318330d2ce94d22fc92f0ce5555a806c82e95289ffe96fd440698fdf90936240373cf WHIRLPOOL f41e2b682bedbfec1d8389d60b352931339811d16012096f3856e76725a54488a36da6e8dcf108db9704a90fd9bb2b78c74d99c890c4619decf51063c7bf1fbf
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
-iQIcBAEBCAAGBQJVZcE4AAoJELp701BxlEWf0QYQALcAm+D8SaV3vRWVKgX2ubim
-qCu68lwNGnNxuW5J/q56DMaTWhdbvR/R5PZVuKpc+T2QEw9fpxY5mPfki+lHUOfg
-LinTYOdOs/WIpjbynvrZW1itx58Ey3ezAZjxkl5ibXY8eyTj4i5ctubSK59up2fS
-FIT3tqu54Y2LGNHeToT5PbuNxIKVmF1utg0zL1VJX/33jhDJQFIFsk3dXPEoUyHq
-MoaPzOfl3lSUUzzdViZW+WsIGCL/s+3DxPkzFHheS2VlkKegt4NHQLBa420ndTNd
-iOay9HhvuGuMSi52NX/ElwS+w8B365wMW6iF3cauB3TtXwrvJMly5t5ZxQltMWnE
-rcFXtYOGO6rJUDRMWONIXmTUbdUbBCvHENgif5uis9rD2OJpNm6lHFLxQIWANUip
-GvM6WUiGkwEExBdAd/5WRfKUmWPTHsHe0+WhCR88NLQ3lv5pMLZkckueVgRiMQgF
-pjxSho0p3KrHGZoSMNEt/7YUcn0sJodGo1BM/v+1CRqHGnSM207c/dRSfJXE2yXF
-tZ/EOA1Cd3kXg4nWJhljbvpgmLphLFguwyOSISVXpZd+tZSiYm1JIf5/2ps5oMXW
-i7CqEa7nWA9lZihFByl1Le//xh5We0iN2JeTMX9DRqKyJh1XGCsEeIi56Dc1SmgD
-NTMpKcegrOf7OzisukcA
-=mlKC
+iQJ8BAEBCABmBQJVZfEfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2BcEQALz/+JiPcPuyebWXmrb+mhky
+e2kOEz9Gcdl0OC2MtzAbt87imkwu0Ym/ZkY12VErEB+MnUOpDPmrXlDB+cFBwxae
+z5lPd4VKgx+p6iKZFqLXqJivPQaD8wLMgOdlIQreqd5aDgbrab1y+Lf3ZWKrXd4T
+lSCke1IyiuUoiHw4aw1/P21K/ujEBDiRoHDbUl+xXvogi8G8TTAm2nuCX3idRIYx
+m9cub5q/LhIC0Tr8GJU/8aRRFUdCv6TDwr76fIgRqeqRBizfqkHrPCCos5IgPfI7
+FkmJCkzNDRG9tOQXz9x6wSDgWabVdmQnNG4mVlZe7TE41gFIP9A4diwzYrHWETEV
+PFrTeTycFlAHVymri2tJhTlXmVWPGV1RW1BoOO6M1cwRh/uFNdn29TaCrPbeUbtH
+EPl1f+UrgdpJ7/NhDW3ztKEGHN/LrUDESxfqdvbS1hbdH55cLPHDNhy4GxAQv+aM
+T4BcmIR46YDYsp+xak0gfcFU6H21EBJShGMMseJ0v/YSDNjfRhiYDM1UNxz/Zj+2
+98UYP7qHgyGSOPd+VEnePbTGxB+Y/BxJ2SK1LR3ssfdKQZqATHo1odaAYhYz1VHk
+/lzJRgB+Ffg8TAPg0g8Vve34bopkBY4AT8MXYFM5dnEF3pNQW8B98Nqj551ijlxR
+WPgG3dF6rBxU8/2jsoRQ
+=OGGv
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.5.42.ebuild b/dev-db/mysql/mysql-5.5.42.ebuild
deleted file mode 100644
index 92e87d422b33..000000000000
--- a/dev-db/mysql/mysql-5.5.42.ebuild
+++ /dev/null
@@ -1,126 +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/mysql/mysql-5.5.42.ebuild,v 1.2 2015/04/25 16:27:12 floppym Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-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 ~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 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 \
- 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
-
- # 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/mysql/mysql-5.6.22.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild
deleted file mode 100644
index 09e8a84c121f..000000000000
--- a/dev-db/mysql/mysql-5.6.22.ebuild
+++ /dev/null
@@ -1,153 +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/mysql/mysql-5.6.22.ebuild,v 1.12 2015/02/19 21:51:43 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-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 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 mysql-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}
-
- # 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/5.6 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # funcs_1.is_triggers funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
- # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
- # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
- # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # rpl.rpl_plugin_load
- # fails due to included file not listed in expected result
- # appears to be poor planning
- #
- # 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 \
- binlog.binlog_mysqlbinlog_filter \
- binlog.binlog_statement_insert_delayed \
- funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql \
- funcs_1.is_triggers \
- main.information_schema \
- main.mysql_client_test \
- main.mysqld--help-notwin \
- perfschema.binlog_edge_mix \
- perfschema.binlog_edge_stmt \
- rpl.rpl_plugin_load \
- main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- if ! use extraengine ; then
- # bug 401673, 530766
- for t in federated.federated_plugin ; do
- mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
- done
- fi
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # Set file limits higher so tests run
- ulimit -n 3000
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
- --suite-timeout=5000
- 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/mysql/mysql-5.6.23.ebuild b/dev-db/mysql/mysql-5.6.23.ebuild
deleted file mode 100644
index f2e172e69530..000000000000
--- a/dev-db/mysql/mysql-5.6.23.ebuild
+++ /dev/null
@@ -1,153 +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/mysql/mysql-5.6.23.ebuild,v 1.1 2015/02/04 18:30:31 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-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 ~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 mysql-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}
-
- # 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/5.6 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # funcs_1.is_triggers funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
- # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
- # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
- # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # rpl.rpl_plugin_load
- # fails due to included file not listed in expected result
- # appears to be poor planning
- #
- # 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 \
- binlog.binlog_mysqlbinlog_filter \
- binlog.binlog_statement_insert_delayed \
- funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql \
- funcs_1.is_triggers \
- main.information_schema \
- main.mysql_client_test \
- main.mysqld--help-notwin \
- perfschema.binlog_edge_mix \
- perfschema.binlog_edge_stmt \
- rpl.rpl_plugin_load \
- main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- if ! use extraengine ; then
- # bug 401673, 530766
- for t in federated.federated_plugin ; do
- mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
- done
- fi
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # Set file limits higher so tests run
- ulimit -n 3000
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
- --suite-timeout=5000
- 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
-}