* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-04-22 17:05 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-04-22 17:05 UTC (permalink / raw
To: gentoo-commits
commit: ca8e02d96269ce5de91ee0236d09946e236de09b
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 17:05:07 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 17:05:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ca8e02d9
dev-db/mariadb: Version bump to 5.5.49
Package-Manager: portage-2.2.28
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 ++++
dev-db/mariadb/Manifest | 32 +++++++++++-----------
...mariadb-5.5.48.ebuild => mariadb-5.5.49.ebuild} | 0
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 483ef82..9027728 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-5.5.49 (22 Apr 2016)
+
+ 22 Apr 2016; Brian Evans <grknight@gentoo.org> +mariadb-5.5.49.ebuild,
+ -mariadb-5.5.48.ebuild:
+ dev-db/mariadb: Version bump to 5.5.49
+
*mariadb-10.1.13 (30 Mar 2016)
30 Mar 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.13.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3109191..0ef0590 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,27 +9,27 @@ DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac0677
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.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b
+DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
-iQJ8BAEBCABmBQJW+1UAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJXGlm/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2+RYP/153AnR7BoN/WfvbShRwnP6B
-WjUGVDpkzaVoAg2zczGTufc6y2bsnwS3bXLU3g+ag2QsOjh9Op+58wMo9x5J3rtj
-1TncEAE0CFFGrZRNFmdrX80qsjl+9ujnU/7CeIWpdjnJx9ZNSyOf0isiLthZPYXD
-ijC8hdxxQyhXPvmCwNGzdvxgmHMq95I50nxDvrb6ijaoNnJ58h9miay9Z9dTaug5
-dCpcMI2w/KjUh7HNBgXxAUpbBG54HEq5aILiKZfbDF5IUOnz6aOEPKBqsCxaF1l0
-5FYWpd9HaonkP54IE9SMbpJlbWGNzSnZMSZZfjtkLFgfvYk164j8IO8LseYq78zl
-QGM2z/ZhmTEGjnGiJ85qLrEaAUZ7kWcJmFP0OU96GUFii3x0JMT1f3wXuAAZGqcV
-JynXuuIKPKlGx/68CI/LVZrnefF53FQ+6A7d6GY84tOewhmRlaa/o0456hmt4X7N
-E+sZSErHARolgdhzTmEaCfb7OzTZBBUcWfnf2gVvLZG3x65pcFs1Cn4NRoaTsm4A
-airGS/e+1FArTRrUwA3jAOLNC5zPjgQV3knzDAfhtpndqi8X+1gsNEPrcstVT7q0
-wnnHHilF845GFmPlzLCU6yEBbW7SLYdGt1qCKOQP9AKafngkPFxxBSY0owkqqQBW
-y3nUXykFmgfhKpqS2ihk
-=LNym
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2yd8P/0Fn0x2JKmP7CZlppQ67mqc7
+X+f/XWEdLebN9Iifs/C1NHMkKxzDg2pjsn8B+Uq3ITs4lv2hQ9htNSlNKlogLIUt
+B8bc54MUHM6wRm0HTF3AzklECE6aGFGqm++LXgOs0Ohn30gFDKCR9l6BSiGekKCw
+obiAW4FRi9HADqgSoMvgc/OTIMnbgkEbn+ZybH6OOYVOaYSqT00GEz8PvYBbS9vI
+ZYssxD2ilFwgn9/48F2hKF+Un510JW8fn85vgIXj/46BFcJs3gTLglka8bCb/t/q
+Vog5kevjWAs6429G1/q3zki+jIaxDh/H66yRwxBQKJPLNvU8PVTDs2SD29auguKI
+lKVXPAFRmL0WER78Pyj19j5bdoMLKHIOyU2XPYVPEFUV56b1F6h3nO6veSoJGdR0
+0ewO6nf58t2lFnf5lNRHsf4qpDHtvox3B7d6/J5u828KNf/fan/rhCP8ZRaTQcCG
+Qst2BrPStjec1R3nBxpu0MzTBWXwBZJp5j3FcKTuBOktyCsk413KAVELvpg9nJ+n
+onai45GzEgp5L0XmtLpV+eIV45mNzc8cBdSuari+5z4LLtEkpee+zeKwQQcSNgnr
+1o/VJvEk5ZRuglepR2q2GOSfoNvdl+55rT/sSFALyqNXilnDEd1DR8OCu4a92pAp
+wKCkUb5dOum97BQszjCi
+=1upL
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.48.ebuild b/dev-db/mariadb/mariadb-5.5.49.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.48.ebuild
rename to dev-db/mariadb/mariadb-5.5.49.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-06-28 2:10 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-06-28 2:10 UTC (permalink / raw
To: gentoo-commits
commit: be9017168527cada189311f4e8e029b7297c1e47
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 00:23:40 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 00:23:40 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=be901716
dev-db/mariadb: Fix tests
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/mariadb-5.5.60-r1.ebuild | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.5.60-r1.ebuild b/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
index 2ff1dc6..16bb976 100644
--- a/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
@@ -490,18 +490,29 @@ src_test() {
pushd "${TESTDIR}" > /dev/null || die
touch "${T}/disabled.def"
- # These are failing in MariaDB 10.0 for now and are believed to be
+ # These are failing in MariaDB 5.5 for now and are believed to be
# false positives:
#
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
+ # 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.
+ #
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in parallel
+ # The tool is deprecated anyway
+ # Bug 532288
local t
for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
- rpl.rpl_semi_sync_uninstall_plugin ; do
- _disable_test "$t" "False positives in Gentoo"
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ _disable_test "$t" "False positives in Gentoo"
done
if ! use client-libs ; then
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-06-28 2:10 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-06-28 2:10 UTC (permalink / raw
To: gentoo-commits
commit: a184c40792f3f097c1e8a7875c81d930ee841c9f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 02:10:10 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 02:10:10 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a184c407
dev-db/mariadb: Affix patch version
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/Manifest | 27 ++++++++++++++-------------
dev-db/mariadb/mariadb-5.5.60-r1.ebuild | 3 +--
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7610506..ea9f04c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -12,22 +12,23 @@ DIST mariadb-5.5.60.tar.gz 45822878 SHA256 4d3d444555416028ce39d3fb4cdc9cf6a658f
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20180515-1334Z.tar.bz2 321462 SHA256 1a2c4116017ec56ec77375fa7fc85c7f0375d342505a45de16c4fd0dacd4bddf SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e WHIRLPOOL b3a5fa87ea88cd823d2c7e5449fa50789cc13d487df800836644ba568ba3f8cab34bc26f57e41901e842ef73f7665636b843b8815c996d315589fb1a34ca39a6
+DIST mysql-extras-20180628-0201Z.tar.bz2 322141 SHA256 8317028fa98cc4abd819d11191fb82026eb9c4d23490b7c1d42590731fbc834d SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a WHIRLPOOL 71a5d8d09ede40a2d7adad6d57e1b546fabb34610c92ede6e0b472c0d84ad016e39ec7fcb038c708723535542dfd9caace22f2b8dd822951ba8c0ee2778c462b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlsz2KNfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAls0Q4FfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7ZYQRAAl+rQmvo3W/zEtn7oyUEKO1F5ZGx+Xn4hdGnW+lhZvZzUaW3CD83MUGS8
-xpXyc/jOznTFyV77fzESHRh9kALxwtbzDOLrNJHdgRWXylR0DcqhEC99N0KJInlu
-zAfAmar1tjquTqXA1ZVHU7fUK1EyJEJIHy7OV3JxSp1VRaDT4LAp5t4SaS3Mq2dm
-/D+7VYi+wqYQLXshrjhduEqAtR2+545fl5B0ZZTRsbluvoADCSynXWtq4ofSURkP
-SMW7I3mn/+VAN96cY+1Lo/7kco49lU4k1xfAt0E99xXn+a7I9BZsfmv/KC5nwPp+
-lMBMDEnhVTF1sslS5dpXauCf3dcHdwuxDaoKPjty7A/5YMtReDdErFTTymqZNV1t
-w3lG3BhbhBnMwktXSGXwQacQTwD3ZTq/vruuBeBg/5etlPTZfzlw90Cnc7Fy03TQ
-K7tUyxbCCAVfWaBZYGq+QAvwm2alYqDLphEyOw2ONmKwpYl5CmPJKZeag74xQbtZ
-XhCm8RE2nsWTl5hn11NdvJA8Z6EenaDMR3YAHalk1fkUB8S/lGph9pLTC3yq61ho
-zvFbWmhZxasxK9byP7PM+lDl+myGpeoTqyYDlqzzlRRsih/u1l3h+992VKX84Dad
-N4DY6V6fzqzPAveCoLoInfyEDZJlce/xkqCH/FUBiqg5OmoL25Y=
-=Mu+g
+o7Y+TBAAr7fX+M15A+xeEuNYXAR3aUdHHcK2UzZPL0Jp7yIkjq+1UQnE7I7h55tk
+KIzafOXOtuBAO7Hc2AiVdjUeC+f5RjhFFyegBS/c36tc9xjjVEyiY/dHdN8RkQek
+3cthXUvtVfRFZWRVKdVCdGxfg5uqNSr7epo/uBvGyQ/TIfc7KAt8jmnE2Nl0ptSc
+hdwjCFEFp8F2Ps01YbgJ3cj/0h1iMh6pVZhCu0UNcBKGbKbAkHmqQEMb28JygziL
+TBtyXrFztnD3iAnpMXac2BzvARbnS2LYAJtmfiCijGP/AhpvW8Zdumi5ED+TYJ0i
+STD0jjyqxAYivm7NfxEYv9b8ADwk0MfJG4bUlYl5qAJBbqWOU6J2XzTYXFwTLtHU
+H/6rVUaBB0hYFw/J8cKOvGFkg+6PoSVRysgPwqMx3sfVhecoCB6GXKBawWwgaZvB
+6MvrTbME7zQcLlL8zuGwbDZkBXMLw+XPz5DNFnCfEysqN3Y9TylTXXOW4q3AwGkm
+gEw7T1fueVZ/88j/YCnNivMdg811ciIJfzY1p2MPgUsI4d7y2snCxr5xhuupqGDd
+oFRlttu8QrLFQc654HVWKWK4c2+wZWz1vyj1KELZiC52W+FDlGfdHhjYIgDdjiK6
+zxMpN48+r3mqYGFxkNA/GrIZtC/ijuNBplfr7Y9JVD7RMD1PFOY=
+=8aGJ
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.60-r1.ebuild b/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
index 16bb976..fa6dd41 100644
--- a/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
@@ -2,8 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-#MY_EXTRAS_VER="20180515-1334Z"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20180628-0201Z"
SUBSLOT="18"
# Keeping eutils in EAPI=6 for emktemp in pkg_config
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-06-27 18:38 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-06-27 18:38 UTC (permalink / raw
To: gentoo-commits
commit: dbf059c2eff3913444432b3bc38ead98c00ed300
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 18:37:59 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 18:37:59 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=dbf059c2
dev-db/mariadb: Fix warning on 9999
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/mariadb-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index 23309ad..0961b38 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -64,7 +64,7 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
/usr/include/mariadb/mariadb_version.h
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-06-27 18:38 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-06-27 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 9d6a8e2e80de923ec1469b21332d05157f0268a7
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 18:34:12 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 18:34:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9d6a8e2e
dev-db/mariadb: Add 5.5.60 revision with client-libs for testing
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/Manifest | 27 +-
dev-db/mariadb/mariadb-5.5.60-r1.ebuild | 817 ++++++++++++++++++++++++++++++++
2 files changed, 831 insertions(+), 13 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 57c7343..7610506 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,25 +8,26 @@ DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645a
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.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
+DIST mariadb-5.5.60.tar.gz 45822878 SHA256 4d3d444555416028ce39d3fb4cdc9cf6a658fcd4b0d2d0c45a73f9bf01d07929 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c WHIRLPOOL 09ad7e9f95fa6aa19300aca84c9fd674b3d68a5e519dba14a4e5ad9b421afa1898d8d86fc377f2a6c5f5c999bf39ec20d3e40d3a24b0b26182b80caa69afac5e
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20180515-1334Z.tar.bz2 321462 SHA256 1a2c4116017ec56ec77375fa7fc85c7f0375d342505a45de16c4fd0dacd4bddf SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e WHIRLPOOL b3a5fa87ea88cd823d2c7e5449fa50789cc13d487df800836644ba568ba3f8cab34bc26f57e41901e842ef73f7665636b843b8815c996d315589fb1a34ca39a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlsRW/lfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlsz2KNfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7ZkfBAAzMk+AZbWMUIrocloAEfIjT4GymS81B//185CiJmC0ZO6kD2AM4NmYsJo
-gIv7rwPuEpPoQG0IObGWwc5Ne7tOtn+XPmwdRocbgIh+Hj2M3610st1secuJWw+v
-QCq/A3ml2eRPuHssgNuHgCMZ87ssdkWtPJhomjTLRFSonhs275MQpt+quc9UGA8D
-YF20zH6uD1QfnEbcF87K2c8rN08i5p5XWwrfGun4Wsv1curBCcsqd2UWMoHlxIoy
-9X0FE+xrnGOFUZ1xOtpuW3t6++Xhsx7Alukx7RqbCdKCgRbvk+1DsgV5nEUKP9dx
-p1dtLz82T2IcWoALsDpReRrhiHQzCb3Ptj7XlKainAtexeAUH6XU3yyV9JTKarWE
-9FBlnisC+mb5JZ4GkqINNOP8VMKUgGt19rpm1YpWHVLdAwYuA487Qgz/yR6sXoFW
-MR+YLF7diJltOj471PoA6jkg66/U/CdJg2v2596+W0+HJvo2LgILHAHSxFOCIZnt
-on+hmT7TzrIGsifxlIykZ8LzPrzRyoF/C2krOq1PNSy5HFIVt7JQ3aXqKPXUP0d1
-za1lCI+lG3ciOuspPBqY3MiYLPnCUP0TrcV0UEBD6aqXMpnmNqa65D4BWK9DyeOX
-CLAz4eOHGL9Q7Doq35jh9vtGtRrRzR6F8ygzgMcnZeGeN5UOUZ4=
-=JLgg
+o7ZYQRAAl+rQmvo3W/zEtn7oyUEKO1F5ZGx+Xn4hdGnW+lhZvZzUaW3CD83MUGS8
+xpXyc/jOznTFyV77fzESHRh9kALxwtbzDOLrNJHdgRWXylR0DcqhEC99N0KJInlu
+zAfAmar1tjquTqXA1ZVHU7fUK1EyJEJIHy7OV3JxSp1VRaDT4LAp5t4SaS3Mq2dm
+/D+7VYi+wqYQLXshrjhduEqAtR2+545fl5B0ZZTRsbluvoADCSynXWtq4ofSURkP
+SMW7I3mn/+VAN96cY+1Lo/7kco49lU4k1xfAt0E99xXn+a7I9BZsfmv/KC5nwPp+
+lMBMDEnhVTF1sslS5dpXauCf3dcHdwuxDaoKPjty7A/5YMtReDdErFTTymqZNV1t
+w3lG3BhbhBnMwktXSGXwQacQTwD3ZTq/vruuBeBg/5etlPTZfzlw90Cnc7Fy03TQ
+K7tUyxbCCAVfWaBZYGq+QAvwm2alYqDLphEyOw2ONmKwpYl5CmPJKZeag74xQbtZ
+XhCm8RE2nsWTl5hn11NdvJA8Z6EenaDMR3YAHalk1fkUB8S/lGph9pLTC3yq61ho
+zvFbWmhZxasxK9byP7PM+lDl+myGpeoTqyYDlqzzlRRsih/u1l3h+992VKX84Dad
+N4DY6V6fzqzPAveCoLoInfyEDZJlce/xkqCH/FUBiqg5OmoL25Y=
+=Mu+g
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.60-r1.ebuild b/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
new file mode 100644
index 0000000..2ff1dc6
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.60-r1.ebuild
@@ -0,0 +1,817 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+#MY_EXTRAS_VER="20180515-1334Z"
+MY_EXTRAS_VER="live"
+SUBSLOT="18"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+ SRC_URI="${SRC_URI}
+ mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
+ oqgraph pam +perl profiling selinux +server sphinx
+ static static-libs systemtap tcmalloc
+ test tokudb yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+ EGIT_CLONE_TYPE=shallow
+else
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+ "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+ "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags.patch"
+ "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-5.5.50.patch"
+ "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+ "${MY_PATCH_DIR}/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch"
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ !yassl? (
+ !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ >=sys-libs/zlib-1.2.3:0=
+ sys-libs/ncurses:0=
+ !bindist? (
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ )
+ !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+ static? ( sys-libs/ncurses[static-libs] )
+ || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+ client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+ ${COMMON_DEPEND}
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ local GCC_MAJOR_SET=$(gcc-major-version)
+ local GCC_MINOR_SET=$(gcc-minor-version)
+ if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
+ # non x86{,_64} arches
+ if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ fi
+ if has test ${FEATURES} && \
+ use server && ! has userpriv ${FEATURES} ; then
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+
+ # This should come after all of the die statements
+ enewgroup mysql 60 || die "problem adding 'mysql' group"
+ enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ # Grab the patches
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+ mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+ _disable_engine() {
+ echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ _disable_plugin() {
+ echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+ }
+
+ if use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S%/}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' "${S%/}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/ft-index/portability/CMakeLists.txt" || die
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback qc_info server_audit semisync sql_errlog )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ # Collides with mariadb-connector-c bug 655980
+ _disable_plugin auth_dialog
+
+ # Don't build example
+ _disable_engine example
+
+ if ! use oqgraph ; then # avoids extra library checks
+ _disable_engine oqgraph
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_ZLIB=system
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DWITHOUT_CLIENTLIBS=YES
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ if use server ; then
+
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+ -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -D$(usex sphinx WITH WITHOUT)_SPHINX_STORAGE_ENGINE=1
+ -D$(usex tokudb WITH WITHOUT)_TOKUDB_STORAGE_ENGINE=1
+ -D$(usex oqgraph WITH WITHOUT)_AUTH_PAM=1
+ -DINSTALL_SQLBENCHDIR=share/mariadb
+ )
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DENABLED_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED%/}/usr/data" ]] ; then
+ rm -Rf "${ED%/}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+ local mycnf_src="my.cnf-5.5"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR%/}/${mycnf_src}" \
+ > "${TMPDIR%/}/my.cnf.ok" || die
+ use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR%/}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR%/}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+ if use server ; then
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S%/}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S%/}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ fi
+
+ #Remove mytop if perl is not selected
+ [[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ _disable_test() {
+ local rawtestname reason
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+ echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # 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 run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ # Run mysql tests
+ pushd "${TESTDIR}" > /dev/null || die
+
+ touch "${T}/disabled.def"
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
+ rpl.rpl_semi_sync_uninstall_plugin ; do
+ _disable_test "$t" "False positives in Gentoo"
+ done
+
+ if ! use client-libs ; then
+ _disable_test main.plugin_auth "Needs client libraries built"
+ fi
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd > /dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_config() {
+ _getoptval() {
+ local mypd="${EROOT}"/usr/bin/my_print_defaults
+ local section="$1"
+ local flag="--${2}="
+ local extra_options="${3}"
+ "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ }
+ local old_MY_DATADIR="${MY_DATADIR}"
+ local old_HOME="${HOME}"
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ export HOME=${EPREFIX}/root
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+ die "Minimal builds do NOT include the MySQL server"
+ fi
+
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+ MY_DATADIR_s="${MY_DATADIR_s%%/}"
+ local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+ old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+ if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
+ local pwd1="a"
+ local pwd2="b"
+ local maxtry=15
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+ # These are dir+prefix
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+ if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+ einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+ fi
+ if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+ einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+ fi
+ if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+ einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+ fi
+
+ if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+ ewarn "You have already a MySQL database in place."
+ ewarn "(${ROOT}/${MY_DATADIR}/*)"
+ ewarn "Please rename or delete it if you wish to replace it."
+ die "MySQL database already exists!"
+ fi
+
+ # 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+ einfo "Please provide a password for the mysql 'root' user now"
+ einfo "or through the ${HOME}/.my.cnf file."
+ ewarn "Avoid [\"'\\_%] characters in the password"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x$pwd1" != "x$pwd2" ]] ; then
+ die "Passwords are not the same"
+ fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
+
+ local options
+ local sqltmp="$(emktemp)"
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+
+ einfo "Creating the mysql database and setting proper permissions on it ..."
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+ PID_DIR="${EROOT}/var/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]]; then
+ install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]]; then
+ install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+ fi
+
+ pushd "${TMPDIR}" &>/dev/null || die
+
+ # Filling timezones, see
+ # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+ local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+ [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+ einfo "Command: ${cmd[*]}"
+ su -s /bin/sh -c "${cmd[*]}" mysql \
+ >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
+ popd &>/dev/null || die
+ [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+ || die "MySQL databases not installed"
+
+ use prefix || options="${options} --user=mysql"
+
+ local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+ local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+ local mysqld="${EROOT}/usr/sbin/mysqld \
+ ${options} \
+ --log-warnings=0 \
+ --basedir=${EROOT}/usr \
+ --datadir=${ROOT}/${MY_DATADIR} \
+ --max_allowed_packet=8M \
+ --net_buffer_length=16K \
+ --socket=${socket} \
+ --pid-file=${pidfile}
+ --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
+ einfo "Command ${mysqld}"
+ ${mysqld} &
+ rc=$?
+ while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -e "${sql}"
+ eend $?
+
+ if [[ -n "${sqltmp}" ]] ; then
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -uroot \
+ --password="${MYSQL_ROOT_PASSWORD}" \
+ mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ fi
+
+ # Stop the server and cleanup
+ einfo "Stopping the server ..."
+ kill $(< "${pidfile}" )
+ rm -f "${sqltmp}"
+ wait %1
+ einfo "Done"
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-06-07 2:44 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-06-07 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 4155598ba04040af0c622d0f5a2fa1e798bba7ea
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 7 02:43:45 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 7 02:43:45 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4155598b
dev-db/mariadb: Fix systemd build ops for 10.1.33-r1
TODO - Adjust patch so tests run
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/mariadb-10.1.33-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.33-r1.ebuild b/dev-db/mariadb/mariadb-10.1.33-r1.ebuild
index 73f3563..0a3a791 100644
--- a/dev-db/mariadb/mariadb-10.1.33-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.33-r1.ebuild
@@ -9,7 +9,7 @@ JAVA_PKG_OPT_USE="jdbc"
# Keeping eutils in EAPI=6 for emktemp in pkg_config
-inherit eutils flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user cmake-utils multilib-build
+inherit eutils systemd flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user cmake-utils multilib-build
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
@@ -358,7 +358,7 @@ src_configure(){
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-DWITH_MARIABACKUP=$(usex backup ON OFF)
-DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DWITH_SYSTEMD=$(usex systemd YES NO)
+ -DWITH_SYSTEMD=$(usex systemd yes no)
-DWITH_NUMA=$(usex numa ON OFF)
-DINSTALL_SQLBENCHDIR=''
)
@@ -419,7 +419,7 @@ src_configure(){
-DWITH_EMBEDDED_SERVER=OFF
-DEXTRA_CHARSETS=none
-DINSTALL_SQLBENCHDIR=
- -DWITH_SYSTEMD=NO
+ -DWITH_SYSTEMD=no
)
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-06-01 14:45 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-06-01 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 721beb40041eb9330261aa77dbace57fd598b81d
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 1 14:45:20 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jun 1 14:45:20 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=721beb40
dev-db/mariadb: Add refactored ebuilds for testing
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/Manifest | 34 +-
dev-db/mariadb/mariadb-10.0.35-r1.ebuild | 844 ++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-10.1.33-r1.ebuild | 879 +++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-10.2.15-r1.ebuild | 919 +++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-10.2.6.ebuild | 398 -------------
dev-db/mariadb/mariadb-10.2.7.ebuild | 401 --------------
dev-db/mariadb/metadata.xml | 3 +
7 files changed, 2662 insertions(+), 816 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b1fc702..57c7343 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,32 +1,32 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
-DIST mariadb-10.2.7.tar.gz 67669554 SHA256 225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc SHA512 fa595acc0f5c9c62077db000f1721af79628994c08e82b2eb95d265e3c556e80942c487fc1b91299c382becd71f21a0a117ca93d7428752f436ed83683a4f4cd WHIRLPOOL d76d584924dac41fd787c1a02f79de90ae5334b217b66deb59756490a8c42b801fddac425542e371d68b04fa462a3f438626896749a1c12be70e9d22d857771e
+DIST mariadb-10.0.35.tar.gz 66551252 SHA256 1b8368e9653570ccb555a07db3de3a8b7277e7587a916d176d2ec70d3c05c00e SHA512 01fc8d48be3f3847bb222835436ab938c6c5b5ac8ba6cc87b3b6d2a2201b7ab4b152dc1f7d9749c89de90097d50052714ac08aafbbb117fffac32bfb47e74779 WHIRLPOOL 2b70e7d79196c3ce2df503a0a7d1d8eea075b98c9ab09e5ee72b3af567cccaa9d5e00d1dfb0320d36e6d6fc2217fe8ceb0321f93f24377060a0ba8df88feabc7
+DIST mariadb-10.1.33.tar.gz 65292094 SHA256 94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e WHIRLPOOL 95cd15f8eb63db01af4d2164c51e4026e31ddbc44a657eac0643a9b43279679d287d6a4424a38d1e957580d3f851efebf9ec530fdd6aa1fb7acf4ff1e0a1a0f8
+DIST mariadb-10.2.15.tar.gz 73329750 SHA256 33de205158fc22fd8eb4e5770cc5ffa1cb4029f9c398dfd8c554ccb3e636ba11 SHA512 7702af8787973b15784dc8a89f9d56765725a420e2e68f1924b67c88c134c7d83d3249dddd16707fa9e5f05ed747f813f16feefbb477e999a6698b1dcfb5a88f WHIRLPOOL 9155656363232c2fd0a5f90d6883320fc41618a73a58c8b54512d3f7a81ef56b9ee2566bf0f4c19094cd25dd9fa9cf7f0623f90a4345e2192e87dc5f98014cdb
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.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
-DIST mysql-extras-20170719-0024Z.tar.bz2 310450 SHA256 220d4a62c737164a22554bc34c4a1b557441dda12f85ab94936158d540bf2f45 SHA512 658f70b617129b80c69e897e60b4aacc414ce4fc31b3814be6ef7b0002a8f81d6a41af2a88a0a4cd82b7665b1d6682ef6140bebd3c41d08b8ad6b4e083669139 WHIRLPOOL 2463673e700cf3eacc1d02e973f486afdc6120b4cdd194751644770145d5fd018d9a1674d119749224cefca6dd6fc13037c490aec0c34a02c01975141b5e38f1
-DIST mysql-extras-20170719-0113Z.tar.bz2 311116 SHA256 30b7e5f981a110ec8e1582939c59ea037559fa1519771d487d591f022b6a148d SHA512 5e470562e629bd1d104cd1d85e2b57f82b56c8f1f8236d666aca564ed577be50a5818312d8cb2a6a5f18a9c6c6792932fb15f56fd0baac6fadee4411b278f3ce WHIRLPOOL a5764ea0b9ba33d4a4982b24eeefddbaea4367d9e58b866fa9145e65d53369820762a27d36271c522ea3ad214637d28c3d0db3477d47e68647afada7a3dbbd75
+DIST mysql-extras-20180515-1334Z.tar.bz2 321462 SHA256 1a2c4116017ec56ec77375fa7fc85c7f0375d342505a45de16c4fd0dacd4bddf SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e WHIRLPOOL b3a5fa87ea88cd823d2c7e5449fa50789cc13d487df800836644ba568ba3f8cab34bc26f57e41901e842ef73f7665636b843b8815c996d315589fb1a34ca39a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAllutcFfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlsRW/lfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7YxxA/+JY9n8PNTpQD71BqeOy7gyeCVZrjFXfzULDId3gC7NUry1bmt7lb3/SLc
-BPxYsQrZcWlxKvFXJYpfcTWa2+aMFgG1YiouuLqCsbsQPbaK5J+eD3lc0rixLufi
-QEmBjN58sIGWFw0Ft6HFuVsUle7JRZmi7TwqXxR8G4Qwk56I1H9lR0vcJCbMrvQf
-/eom0Ceq6S6efBD/WdUoB5EPXSMrdETn8P3p5aW012bXKy0FHWnj+10CHA3EHKmk
-fKeuTPER9qqusd2tE9sBOQuMUuKOqrK7z9jme37U+H/1/1V61eZugmLFp0/aSK6h
-1vUrwt5a6KGCY9ksVFoRbfvk4LECXzE1t7oYy+k/SOcS0FV+45gjhCnknQbE/CME
-oR05Dnd8f+5FJ7C9JMVeyJF0IRayNi18I0Kg/8Z0fU7SzvxJWuFLC5V92ZxTUvil
-s2t8LH0m7UMskm9bgbScpM7DcvrJ0BRhKfOEjGUzWZ2s6exHL9uKkhoZegkcsQDX
-FAaCc9WnkYEso8iUCgbR+Z7/QgdU2kbMEXTT9/cidUAjmQthsJTUAF0uqJy0xQ7n
-gfjYcyPTwW+PK02VTQ7h2EQq4Ac4wn6nzwX//kNWVZoFYhc1fMHMb/Wr7YOMorbI
-WFMYVKdxF4i/4FBEtQlt/oS7GTdejpYdAYNiHHyMKcsKRSvEW6I=
-=NBDb
+o7ZkfBAAzMk+AZbWMUIrocloAEfIjT4GymS81B//185CiJmC0ZO6kD2AM4NmYsJo
+gIv7rwPuEpPoQG0IObGWwc5Ne7tOtn+XPmwdRocbgIh+Hj2M3610st1secuJWw+v
+QCq/A3ml2eRPuHssgNuHgCMZ87ssdkWtPJhomjTLRFSonhs275MQpt+quc9UGA8D
+YF20zH6uD1QfnEbcF87K2c8rN08i5p5XWwrfGun4Wsv1curBCcsqd2UWMoHlxIoy
+9X0FE+xrnGOFUZ1xOtpuW3t6++Xhsx7Alukx7RqbCdKCgRbvk+1DsgV5nEUKP9dx
+p1dtLz82T2IcWoALsDpReRrhiHQzCb3Ptj7XlKainAtexeAUH6XU3yyV9JTKarWE
+9FBlnisC+mb5JZ4GkqINNOP8VMKUgGt19rpm1YpWHVLdAwYuA487Qgz/yR6sXoFW
+MR+YLF7diJltOj471PoA6jkg66/U/CdJg2v2596+W0+HJvo2LgILHAHSxFOCIZnt
+on+hmT7TzrIGsifxlIykZ8LzPrzRyoF/C2krOq1PNSy5HFIVt7JQ3aXqKPXUP0d1
+za1lCI+lG3ciOuspPBqY3MiYLPnCUP0TrcV0UEBD6aqXMpnmNqa65D4BWK9DyeOX
+CLAz4eOHGL9Q7Doq35jh9vtGtRrRzR6F8ygzgMcnZeGeN5UOUZ4=
+=JLgg
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.35-r1.ebuild b/dev-db/mariadb/mariadb-10.0.35-r1.ebuild
new file mode 100644
index 0000000..a524cb6
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.35-r1.ebuild
@@ -0,0 +1,844 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180515-1334Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user cmake-utils multilib-build
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+ SRC_URI="${SRC_URI}
+ mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jdbc jemalloc latin1 libressl
+ numa odbc oqgraph pam +perl profiling selinux +server sphinx
+ static static-libs systemtap tcmalloc
+ test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ server? ( tokudb? ( jemalloc !tcmalloc ) )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+ EGIT_CLONE_TYPE=shallow
+else
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+ "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+ "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch"
+ "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+ "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ !yassl? (
+ !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ >=sys-libs/zlib-1.2.3:0=
+ sys-libs/ncurses:0=
+ !bindist? (
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ numa? ( sys-process/numactl )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.41-r1:3=
+"
+DEPEND="virtual/yacc
+ static? ( sys-libs/ncurses[static-libs] )
+ || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+ client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+ ${COMMON_DEPEND}
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+ !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ local GCC_MAJOR_SET=$(gcc-major-version)
+ local GCC_MINOR_SET=$(gcc-minor-version)
+ if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
+ # non x86{,_64} arches
+ if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ fi
+ java-pkg-opt-2_pkg_setup
+ if has test ${FEATURES} && \
+ use server && ! has userpriv ${FEATURES} ; then
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+
+ # This should come after all of the die statements
+ enewgroup mysql 60 || die "problem adding 'mysql' group"
+ enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ # Grab the patches
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+ mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+ _disable_engine() {
+ echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ _disable_plugin() {
+ echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+ }
+
+ java-pkg-opt-2_src_prepare
+ if use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S%/}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit semisync sql_errlog )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ # Collides with mariadb-connector-c bug 655980
+ _disable_plugin auth_dialog
+
+ # Don't build Mroonga or example
+ _disable_engine mroonga
+ _disable_engine example
+
+ if ! use oqgraph ; then # avoids extra library checks
+ _disable_engine oqgraph
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
+ -DINSTALL_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_ZLIB=system
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DWITHOUT_CLIENTLIBS=YES
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ if use server ; then
+
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+ -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ -D$(usex sphinx WITH WITHOUT)_SPHINX_STORAGE_ENGINE=1
+ -D$(usex tokudb WITH WITHOUT)_TOKUDB_STORAGE_ENGINE=1
+ -D$(usex oqgraph WITH WITHOUT)_AUTH_PAM=1
+ -D$(usex extraengine WITH WITHOUT)_SEQUENCE_STORAGE_ENGINE=1
+ -D$(usex extraengine WITH WITHOUT)_SPIDER_STORAGE_ENGINE=1
+ -D$(usex extraengine WITH WITHOUT)_CONNECT_STORAGE_ENGINE=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DINSTALL_SQLBENCHDIR=share/mariadb
+ )
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DENABLED_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED%/}/usr/data" ]] ; then
+ rm -Rf "${ED%/}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+ local mycnf_src="my.cnf-5.6"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR%/}/${mycnf_src}" \
+ > "${TMPDIR%/}/my.cnf.ok" || die
+ use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR%/}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR%/}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+ if use server ; then
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S%/}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S%/}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ fi
+
+ #Remove mytop if perl is not selected
+ [[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ _disable_test() {
+ local rawtestname reason
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+ echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # 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 run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ # Run mysql tests
+ pushd "${TESTDIR}" > /dev/null || die
+
+ touch "${T}/disabled.def"
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
+ rpl.rpl_semi_sync_uninstall_plugin ; do
+ _disable_test "$t" "False positives in Gentoo"
+ done
+
+ if ! use client-libs ; then
+ _disable_test main.plugin_auth "Needs client libraries built"
+ fi
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd > /dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_config() {
+ _getoptval() {
+ local mypd="${EROOT}"/usr/bin/my_print_defaults
+ local section="$1"
+ local flag="--${2}="
+ local extra_options="${3}"
+ "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ }
+ local old_MY_DATADIR="${MY_DATADIR}"
+ local old_HOME="${HOME}"
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ export HOME=${EPREFIX}/root
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+ die "Minimal builds do NOT include the MySQL server"
+ fi
+
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+ MY_DATADIR_s="${MY_DATADIR_s%%/}"
+ local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+ old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+ if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
+ local pwd1="a"
+ local pwd2="b"
+ local maxtry=15
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+ # These are dir+prefix
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+ if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+ einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+ fi
+ if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+ einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+ fi
+ if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+ einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+ fi
+
+ if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+ ewarn "You have already a MySQL database in place."
+ ewarn "(${ROOT}/${MY_DATADIR}/*)"
+ ewarn "Please rename or delete it if you wish to replace it."
+ die "MySQL database already exists!"
+ fi
+
+ # 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+ einfo "Please provide a password for the mysql 'root' user now"
+ einfo "or through the ${HOME}/.my.cnf file."
+ ewarn "Avoid [\"'\\_%] characters in the password"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x$pwd1" != "x$pwd2" ]] ; then
+ die "Passwords are not the same"
+ fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
+
+ local options
+ local sqltmp="$(emktemp)"
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+
+ einfo "Creating the mysql database and setting proper permissions on it ..."
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+ PID_DIR="${EROOT}/var/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]]; then
+ install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]]; then
+ install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+ fi
+
+ pushd "${TMPDIR}" &>/dev/null || die
+
+ # Filling timezones, see
+ # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+ local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+ [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+ einfo "Command: ${cmd[*]}"
+ su -s /bin/sh -c "${cmd[*]}" mysql \
+ >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
+ popd &>/dev/null || die
+ [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+ || die "MySQL databases not installed"
+
+ use prefix || options="${options} --user=mysql"
+
+ local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+ local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+ local mysqld="${EROOT}/usr/sbin/mysqld \
+ ${options} \
+ --log-warnings=0 \
+ --basedir=${EROOT}/usr \
+ --datadir=${ROOT}/${MY_DATADIR} \
+ --max_allowed_packet=8M \
+ --net_buffer_length=16K \
+ --socket=${socket} \
+ --pid-file=${pidfile}
+ --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
+ einfo "Command ${mysqld}"
+ ${mysqld} &
+ rc=$?
+ while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -e "${sql}"
+ eend $?
+
+ if [[ -n "${sqltmp}" ]] ; then
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -uroot \
+ --password="${MYSQL_ROOT_PASSWORD}" \
+ mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ fi
+
+ # Stop the server and cleanup
+ einfo "Stopping the server ..."
+ kill $(< "${pidfile}" )
+ rm -f "${sqltmp}"
+ wait %1
+ einfo "Done"
+}
diff --git a/dev-db/mariadb/mariadb-10.1.33-r1.ebuild b/dev-db/mariadb/mariadb-10.1.33-r1.ebuild
new file mode 100644
index 0000000..73f3563
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.33-r1.ebuild
@@ -0,0 +1,879 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180515-1334Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user cmake-utils multilib-build
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+ SRC_URI="${SRC_URI}
+ mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos
+ innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam
+ +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup
+ systemd systemtap static static-libs tcmalloc test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ server? ( tokudb? ( jemalloc !tcmalloc ) )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+ EGIT_CLONE_TYPE=shallow
+else
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+ "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
+ "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch
+ "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ !yassl? (
+ !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ >=sys-libs/zlib-1.2.3:0=
+ sys-libs/ncurses:0=
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ backup? ( app-arch/libarchive:0= )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ sys-libs/zlib[minizip]
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ kerberos? ( virtual/krb5 )
+ mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+ numa? ( sys-process/numactl )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ systemd? ( sys-apps/systemd:= )
+ tokudb? ( app-arch/snappy )
+ )
+ !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) )
+ >=dev-libs/libpcre-8.41-r1:3=
+"
+DEPEND="virtual/yacc
+ static? ( sys-libs/ncurses[static-libs] )
+ || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+ client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+ ${COMMON_DEPEND}
+ server? ( galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-25*
+ sst-rsync? ( sys-process/lsof )
+ sst-mariabackup? ( net-misc/socat[ssl] )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ ) )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+ !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+ server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ local GCC_MAJOR_SET=$(gcc-major-version)
+ local GCC_MINOR_SET=$(gcc-minor-version)
+ if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
+ # non x86{,_64} arches
+ if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ fi
+ java-pkg-opt-2_pkg_setup
+ if has test ${FEATURES} && \
+ use server && ! has userpriv ${FEATURES} ; then
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+
+ # This should come after all of the die statements
+ enewgroup mysql 60 || die "problem adding 'mysql' group"
+ enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ # Grab the patches
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+ mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die
+}
+
+src_prepare() {
+ _disable_engine() {
+ echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ _disable_plugin() {
+ echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+ }
+
+ java-pkg-opt-2_src_prepare
+ if use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S%/}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit semisync sql_errlog )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ # Collides with mariadb-connector-c bug 655980
+ _disable_plugin auth_dialog
+
+ # Avoid useless library checks
+ use mroonga || _disable_engine mroonga
+ use oqgraph || _disable_engine oqgraph
+ _disable_engine example
+
+ cmake-utils_src_prepare
+}
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
+ -DINSTALL_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_ZLIB=system
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DWITHOUT_CLIENTLIBS=YES
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ -DWITH_SSL=$(usex yassl bundled system)
+ )
+
+ if use server ; then
+
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DWITH_SYSTEMD=$(usex systemd YES NO)
+ -DWITH_NUMA=$(usex numa ON OFF)
+ -DINSTALL_SQLBENCHDIR=''
+ )
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DENABLED_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=NO
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ local mycnf_src="my.cnf-5.6"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok"
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+ if use server ; then
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ fi
+
+ #Remove mytop if perl is not selected
+ [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ _disable_test() {
+ local rawtestname reason
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+ echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # 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 run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ # Run mysql tests
+ pushd "${TESTDIR}" > /dev/null || die
+
+ touch "${T}/disabled.def"
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+ _disable_test "$t" "False positive due to varying policies"
+ done
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
+ _disable_test "$t" "False positives in Gentoo"
+ done
+
+ if ! use client-libs ; then
+ _disable_test main.plugin_auth "Needs client libraries built"
+ fi
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd > /dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_config() {
+ _getoptval() {
+ local mypd="${EROOT}"/usr/bin/my_print_defaults
+ local section="$1"
+ local flag="--${2}="
+ local extra_options="${3}"
+ "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ }
+ local old_MY_DATADIR="${MY_DATADIR}"
+ local old_HOME="${HOME}"
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ export HOME=${EPREFIX}/root
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+ die "Minimal builds do NOT include the MySQL server"
+ fi
+
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+ MY_DATADIR_s="${MY_DATADIR_s%%/}"
+ local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+ old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+ if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
+ local pwd1="a"
+ local pwd2="b"
+ local maxtry=15
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+ # These are dir+prefix
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+ if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+ einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+ fi
+ if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+ einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+ fi
+ if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+ einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+ fi
+
+ if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+ ewarn "You have already a MySQL database in place."
+ ewarn "(${ROOT}/${MY_DATADIR}/*)"
+ ewarn "Please rename or delete it if you wish to replace it."
+ die "MySQL database already exists!"
+ fi
+
+ # 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+ einfo "Please provide a password for the mysql 'root' user now"
+ einfo "or through the ${HOME}/.my.cnf file."
+ ewarn "Avoid [\"'\\_%] characters in the password"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x$pwd1" != "x$pwd2" ]] ; then
+ die "Passwords are not the same"
+ fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
+
+ local options
+ local sqltmp="$(emktemp)"
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+
+ einfo "Creating the mysql database and setting proper permissions on it ..."
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+ PID_DIR="${EROOT}/var/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]]; then
+ install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]]; then
+ install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+ fi
+
+ pushd "${TMPDIR}" &>/dev/null || die
+
+ # Filling timezones, see
+ # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+ local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+ [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+ einfo "Command: ${cmd[*]}"
+ su -s /bin/sh -c "${cmd[*]}" mysql \
+ >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
+ popd &>/dev/null || die
+ [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+ || die "MySQL databases not installed"
+
+ use prefix || options="${options} --user=mysql"
+
+ local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+ local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+ local mysqld="${EROOT}/usr/sbin/mysqld \
+ ${options} \
+ --log-warnings=0 \
+ --basedir=${EROOT}/usr \
+ --datadir=${ROOT}/${MY_DATADIR} \
+ --max_allowed_packet=8M \
+ --net_buffer_length=16K \
+ --socket=${socket} \
+ --pid-file=${pidfile}
+ --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
+ einfo "Command ${mysqld}"
+ ${mysqld} &
+ rc=$?
+ while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -e "${sql}"
+ eend $?
+
+ if [[ -n "${sqltmp}" ]] ; then
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -uroot \
+ --password="${MYSQL_ROOT_PASSWORD}" \
+ mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ fi
+
+ # Stop the server and cleanup
+ einfo "Stopping the server ..."
+ kill $(< "${pidfile}" )
+ rm -f "${sqltmp}"
+ wait %1
+ einfo "Done"
+}
diff --git a/dev-db/mariadb/mariadb-10.2.15-r1.ebuild b/dev-db/mariadb/mariadb-10.2.15-r1.ebuild
new file mode 100644
index 0000000..57c64fa
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.15-r1.ebuild
@@ -0,0 +1,919 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180515-1334Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+ java-pkg-opt-2 user cmake-utils multilib-build
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+ SRC_URI="${SRC_URI}
+ mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+ https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+ innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+ numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+ sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc
+ test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ server? ( tokudb? ( jemalloc !tcmalloc ) )
+ !server? ( !extraengine )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+ EGIT_CLONE_TYPE=shallow
+else
+ MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
+ "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
+ "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
+ "${MY_PATCH_DIR}"/20035_all_mariadb-10.2-atomic-detection.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+COMMON_DEPEND="
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ >=sys-libs/zlib-1.2.3:0=
+ kerberos? ( virtual/krb5 )
+ yassl? ( net-libs/gnutls:0= )
+ !yassl? (
+ !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ sys-libs/ncurses:0=
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ backup? ( app-arch/libarchive:0= )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+ numa? ( sys-process/numactl )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ systemd? ( sys-apps/systemd:= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.41-r1:3=
+"
+DEPEND="virtual/yacc
+ static? ( sys-libs/ncurses[static-libs] )
+ || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+ ${COMMON_DEPEND}
+ server? ( galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-25*
+ sst-rsync? ( sys-process/lsof )
+ sst-mariabackup? ( net-misc/socat[ssl] )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ ) )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+ dev-db/mariadb-connector-c[${MULTILIB_USEDEP},static-libs] dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs]
+ server? ( ~virtual/mysql-5.6[static=]
+ galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ local GCC_MAJOR_SET=$(gcc-major-version)
+ local GCC_MINOR_SET=$(gcc-minor-version)
+ if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
+ # non x86{,_64} arches
+ if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+ fi
+ java-pkg-opt-2_pkg_setup
+ if has test ${FEATURES} && \
+ use server && ! has userpriv ${FEATURES} ; then
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+
+ # This should come after all of the die statements
+ enewgroup mysql 60 || die "problem adding 'mysql' group"
+ enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ if use galera ; then
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ fi
+ fi
+
+ # Note about configuration change
+ einfo
+ elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+ elog "to several files in /etc/mysql/${PN}.d."
+ elog "Please backup any changes you made to /etc/mysql/my.cnf"
+ elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+ elog "You may have as many files as needed and they are read alphabetically."
+ elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
+ einfo
+}
+
+src_unpack() {
+ unpack ${A}
+ # Grab the patches
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+ mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+ _disable_engine() {
+ echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ _disable_plugin() {
+ echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+ }
+ java-pkg-opt-2_src_prepare
+ if use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit sql_errlog )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ # Collides with mariadb-connector-c bug 655980
+ _disable_plugin auth_dialog
+
+ # Avoid useless library checks
+ use mroonga || _disable_engine mroonga
+ use oqgraph || _disable_engine oqgraph
+ _disable_engine example
+
+ cmake-utils_src_prepare
+}
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_LIBEDIT=0
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ -DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DWITH_UNITTEST=OFF
+ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
+ -DWITH_SSL=$(usex yassl bundled system)
+ -DWITHOUT_CLIENTLIBS=YES
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+
+ if use server ; then
+
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=''
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ # systemd is only linked to for server notification
+ -DWITH_SYSTEMD=$(usex systemd yes no)
+ -DWITH_NUMA=$(usex numa ON OFF)
+ )
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DWITH_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=no
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ fi
+
+ #Remove mytop if perl is not selected
+ [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ _disable_test() {
+ local rawtestname reason
+ rawtestname="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}'"
+ echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # 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 run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ # Run mysql tests
+ pushd "${TESTDIR}" > /dev/null || die
+
+ touch "${T}/disabled.def"
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+ _disable_test "$t" "False positive due to varying policies"
+ done
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
+ _disable_test "$t" "False positives in Gentoo"
+ done
+
+ if ! use client-libs ; then
+ _disable_test main.plugin_auth "Needs client libraries built"
+ fi
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd > /dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1`
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_config() {
+ _getoptval() {
+ local mypd="${EROOT}"/usr/bin/my_print_defaults
+ local section="$1"
+ local flag="--${2}="
+ local extra_options="${3}"
+ "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ }
+ local old_MY_DATADIR="${MY_DATADIR}"
+ local old_HOME="${HOME}"
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ export HOME=${EPREFIX}/root
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+ if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+ die "Minimal builds do NOT include the MySQL server"
+ fi
+
+ if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+ local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+ MY_DATADIR_s="${MY_DATADIR_s%%/}"
+ local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+ old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+ if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+ ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+ else
+ elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+ mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+ || die "Moving MY_DATADIR failed"
+ fi
+ else
+ ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+ if [[ -d "${MY_DATADIR_s}" ]]; then
+ ewarn "Attempting to use ${MY_DATADIR_s}"
+ else
+ eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+ fi
+ fi
+ fi
+
+ local pwd1="a"
+ local pwd2="b"
+ local maxtry=15
+
+ if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+ # These are dir+prefix
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+ if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+ einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+ fi
+ if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+ einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+ fi
+ if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+ einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+ install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+ fi
+
+ if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+ ewarn "You have already a MySQL database in place."
+ ewarn "(${ROOT}/${MY_DATADIR}/*)"
+ ewarn "Please rename or delete it if you wish to replace it."
+ die "MySQL database already exists!"
+ fi
+
+ # 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+ einfo "Please provide a password for the mysql 'root' user now"
+ einfo "or through the ${HOME}/.my.cnf file."
+ ewarn "Avoid [\"'\\_%] characters in the password"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x$pwd1" != "x$pwd2" ]] ; then
+ die "Passwords are not the same"
+ fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+ fi
+
+ local options
+ local sqltmp="$(emktemp)"
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+ for opt in grant-tables host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ done
+
+ einfo "Creating the mysql database and setting proper permissions on it ..."
+
+ # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+ PID_DIR="${EROOT}/var/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]]; then
+ install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]]; then
+ install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+ fi
+
+ pushd "${TMPDIR}" &>/dev/null || die
+
+ # Filling timezones, see
+ # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+ local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+ [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+ einfo "Command: ${cmd[*]}"
+ su -s /bin/sh -c "${cmd[*]}" mysql \
+ >"${TMPDIR}"/mysql_install_db.log 2>&1
+ if [ $? -ne 0 ]; then
+ grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ fi
+ popd &>/dev/null || die
+ [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+ || die "MySQL databases not installed"
+
+ use prefix || options="${options} --user=mysql"
+
+ local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+ local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+ local mysqld="${EROOT}/usr/sbin/mysqld \
+ ${options} \
+ --log-warnings=0 \
+ --basedir=${EROOT}/usr \
+ --datadir=${ROOT}/${MY_DATADIR} \
+ --max_allowed_packet=8M \
+ --net_buffer_length=16K \
+ --socket=${socket} \
+ --pid-file=${pidfile}
+ --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+ #einfo "About to start mysqld: ${mysqld}"
+ ebegin "Starting mysqld"
+ einfo "Command ${mysqld}"
+ ${mysqld} &
+ rc=$?
+ while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ eend $rc
+
+ if ! [[ -S "${socket}" ]]; then
+ die "Completely failed to start up mysqld with: ${mysqld}"
+ fi
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -e "${sql}"
+ eend $?
+
+ if [[ -n "${sqltmp}" ]] ; then
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+ "${EROOT}/usr/bin/mysql" \
+ "--socket=${socket}" \
+ -hlocalhost \
+ -uroot \
+ --password="${MYSQL_ROOT_PASSWORD}" \
+ mysql < "${sqltmp}"
+ rc=$?
+ eend $?
+ [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ fi
+
+ # Stop the server and cleanup
+ einfo "Stopping the server ..."
+ kill $(< "${pidfile}" )
+ rm -f "${sqltmp}"
+ wait %1
+ einfo "Done"
+}
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
deleted file mode 100644
index bcb6b90..0000000
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170719-0024Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 prefix toolchain-funcs \
- multilib-minimal mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam rocksdb sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
- MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
- MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- backup? ( app-arch/libarchive:0= )
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- systemd? ( sys-apps/systemd:= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
- sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- server? ( galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- ) )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mariadb/mariadb_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-
- # Here we need to see if the implementation switched client libraries
- # We check if this is a new instance of the package and a client library already exists
- local SHOW_ABI_MESSAGE libpath
- if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
- libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
- elog "Due to ABI changes when switching between different client libraries,"
- elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
- elog "Please run: revdep-rebuild --library ${libpath}"
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
- fi
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- if use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
- fi
-
- # Don't build bundled xz-utils for tokudb
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-
- # Remove the bundled groonga
- # There is no CMake flag, it simply checks for existance
- rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-
- eapply "${PATCHES[@]}"
- eapply_user
-}
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)"
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- -DWITH_UNITTEST=OFF
- )
-
- if use test ; then
- MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- fi
-
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DCONNECT_WITH_JDBC=$(usex jdbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
- -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DWITH_MARIABACKUP=$(usex backup ON OFF)
- -DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DINSTALL_SQLBENCHDIR=share/mariadb
- -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
- )
- if use test ; then
- # This is needed for the new client lib which tests a real, open server
- MYSQL_CMAKE_NATIVE_DEFINES+=( -DSKIP_TESTS=ON )
- fi
- fi
- mysql-multilib-r1_src_configure
-}
-
-src_install() {
- # wrap the config scripts
- local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
- multilib-minimal_src_install
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
- cmake-utils_src_install
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
- if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
- rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
- fi
-
- if ! multilib_is_native_abi && use server ; then
- insinto /usr/include/mysql/private
- doins "${S}"/sql/*.h
- fi
-}
-
-multilib_src_install_all() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- eprefixify "${TMPDIR}/my.cnf.ok"
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
- einfo "Creating initial directories"
- # Empty directories ...
- diropts "-m0750"
- if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
- dodir "${MY_DATADIR#${EPREFIX}}"
- keepdir "${MY_DATADIR#${EPREFIX}}"
- chown -R mysql:mysql "${D}/${MY_DATADIR}"
- fi
-
- diropts "-m0755"
- local folder
- for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
- dodir "${folder}"
- keepdir "${folder}"
- chown -R mysql:mysql "${ED}/${folder}"
- done
-
- einfo "Including support files and sample configurations"
- docinto "support-files"
- local script
- for script in \
- "${S}"/support-files/magic
- do
- [[ -f "$script" ]] && dodoc "${script}"
- done
-
- docinto "scripts"
- for script in "${S}"/scripts/mysql* ; do
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
- done
- fi
-
- #Remove mytop if perl is not selected
- [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
- # Install compatible symlinks to libmysqlclient
- use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
- einfo "Skipping server tests due to minimal build."
- return 0
- fi
-
- # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # 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 run out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
-
- local t
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do
- mysql-multilib-r1_disable_test "$t" "False positive due to varying policies"
- done
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
- retstatus_tests=$?
-
- popd || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || eerror "Test failures: $failures"
- einfo "Tests successfully completed"
-}
diff --git a/dev-db/mariadb/mariadb-10.2.7.ebuild b/dev-db/mariadb/mariadb-10.2.7.ebuild
deleted file mode 100644
index 6886518..0000000
--- a/dev-db/mariadb/mariadb-10.2.7.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170719-0113Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 prefix toolchain-funcs \
- multilib-minimal mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam rocksdb sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
- MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
- MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- backup? ( app-arch/libarchive:0= )
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- systemd? ( sys-apps/systemd:= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
- sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- server? ( galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- ) )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mariadb/mariadb_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-
- # Here we need to see if the implementation switched client libraries
- # We check if this is a new instance of the package and a client library already exists
- local SHOW_ABI_MESSAGE libpath
- if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
- libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
- elog "Due to ABI changes when switching between different client libraries,"
- elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
- elog "Please run: revdep-rebuild --library ${libpath}"
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
- fi
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- if use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
- fi
-
- # Don't build bundled xz-utils for tokudb
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-
- # Remove the bundled groonga
- # There is no CMake flag, it simply checks for existance
- rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-
- eapply "${PATCHES[@]}"
- eapply_user
-}
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)"
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- -DWITH_UNITTEST=OFF
- )
-
- if use test ; then
- MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- fi
-
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DCONNECT_WITH_JDBC=$(usex jdbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
- -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DWITH_MARIABACKUP=$(usex backup ON OFF)
- -DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DINSTALL_SQLBENCHDIR=share/mariadb
- -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
- )
- if use test ; then
- # This is needed for the new client lib which tests a real, open server
- MYSQL_CMAKE_NATIVE_DEFINES+=( -DSKIP_TESTS=ON )
- fi
- fi
- mysql-multilib-r1_src_configure
-}
-
-src_install() {
- # wrap the config scripts
- local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
- multilib-minimal_src_install
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
- cmake-utils_src_install
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
- if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
- rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
- fi
-
- if ! multilib_is_native_abi && use server ; then
- insinto /usr/include/mysql/private
- doins "${S}"/sql/*.h
- fi
-
- # Install compatible symlinks to libmysqlclient
- use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-
- # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
- find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-multilib_src_install_all() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- eprefixify "${TMPDIR}/my.cnf.ok"
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
- einfo "Creating initial directories"
- # Empty directories ...
- diropts "-m0750"
- if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
- dodir "${MY_DATADIR#${EPREFIX}}"
- keepdir "${MY_DATADIR#${EPREFIX}}"
- chown -R mysql:mysql "${D}/${MY_DATADIR}"
- fi
-
- diropts "-m0755"
- local folder
- for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
- dodir "${folder}"
- keepdir "${folder}"
- chown -R mysql:mysql "${ED}/${folder}"
- done
-
- einfo "Including support files and sample configurations"
- docinto "support-files"
- local script
- for script in \
- "${S}"/support-files/magic
- do
- [[ -f "$script" ]] && dodoc "${script}"
- done
-
- docinto "scripts"
- for script in "${S}"/scripts/mysql* ; do
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
- done
- fi
-
- #Remove mytop if perl is not selected
- [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
- einfo "Skipping server tests due to minimal build."
- return 0
- fi
-
- # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # 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 run out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
-
- local t
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do
- mysql-multilib-r1_disable_test "$t" "False positive due to varying policies"
- done
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
- retstatus_tests=$?
-
- popd || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || eerror "Test failures: $failures"
- einfo "Tests successfully completed"
-}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 69cc5da..d9c8a04 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -12,6 +12,7 @@
<use>
<flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag>
<flag name="big-tables">Make tables contain up to 1.844E+19 rows</flag>
+ <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages</flag>
<flag name="cluster">Add support for NDB clustering (deprecated)</flag>
<flag name="community">Enables the community features from upstream.</flag>
<flag name="embedded">Build embedded server (libmysqld)</flag>
@@ -28,6 +29,7 @@
<flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
<flag name="minimal">Install client programs only, no server</flag>
<flag name="mroonga">Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
+ <flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag>
<flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
<flag name="oqgraph">Add support for the Open Query GRAPH engine</flag>
<flag name="pam">Enable the optional PAM authentication plugin for the server</flag>
@@ -37,6 +39,7 @@
<flag name="server">Build the server program</flag>
<flag name="sphinx">Add suport for the sphinx full-text search engine</flag>
<flag name="sst-rsync">Add tools needed to support the rsync SST method</flag>
+ <flag name="sst-mariabackup">Add tools needed to support the mariabackup SST method</flag>
<flag name="sst-xtrabackup">Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
<flag name="test">Install upstream testsuites for end use.</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2018-03-12 13:48 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2018-03-12 13:48 UTC (permalink / raw
To: gentoo-commits
commit: ae78a09bfa97833e6b091e67d45e2b1987a6411d
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 13:32:18 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 13:32:18 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ae78a09b
dev-db/mariadb: Remove sparc-fbsd
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/mariadb-10.2.6.ebuild | 4 ++--
dev-db/mariadb/mariadb-10.2.7.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.1.67.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.2.14.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.3.12.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.49.ebuild | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index e805996..bcb6b90 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -23,7 +23,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
MY_PATCH_DIR="${WORKDIR}/mysql-extras"
diff --git a/dev-db/mariadb/mariadb-10.2.7.ebuild b/dev-db/mariadb/mariadb-10.2.7.ebuild
index 2c2b865..6886518 100644
--- a/dev-db/mariadb/mariadb-10.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -23,7 +23,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
MY_PATCH_DIR="${WORKDIR}/mysql-extras"
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
index a3ef7aa..a09e192 100644
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -12,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=''
diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
index a3ef7aa..a09e192 100644
--- a/dev-db/mariadb/mariadb-5.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -12,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=''
diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
index a3ef7aa..a09e192 100644
--- a/dev-db/mariadb/mariadb-5.3.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -12,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.49.ebuild b/dev-db/mariadb/mariadb-5.5.49.ebuild
index 669f672..0f48548 100644
--- a/dev-db/mariadb/mariadb-5.5.49.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ inherit toolchain-funcs mysql-v2
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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=''
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-07-19 2:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-07-19 2:37 UTC (permalink / raw
To: gentoo-commits
commit: 037d7629abe09d14a5c01f69c7e2ca2c8e15b29b
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 02:37:00 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 02:37:00 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=037d7629
dev-db/mariadb: Fix multilib symlinks
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/mariadb-10.2.7.ebuild | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.2.7.ebuild b/dev-db/mariadb/mariadb-10.2.7.ebuild
index ff19ca8..2c2b865 100644
--- a/dev-db/mariadb/mariadb-10.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.7.ebuild
@@ -220,6 +220,14 @@ multilib_src_install() {
insinto /usr/include/mysql/private
doins "${S}"/sql/*.h
fi
+
+ # Install compatible symlinks to libmysqlclient
+ use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+
+ # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+ find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
}
multilib_src_install_all() {
@@ -306,11 +314,6 @@ multilib_src_install_all() {
#Remove mytop if perl is not selected
[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
- # Install compatible symlinks to libmysqlclient
- use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
- dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
}
# Official test instructions:
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-07-19 1:28 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-07-19 1:28 UTC (permalink / raw
To: gentoo-commits
commit: eb506cf02fd57b42cce30d21a6689cd9694f5261
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 00:34:44 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 00:34:44 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=eb506cf0
dev-db/mariadb: Affix patch version
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/Manifest | 27 ++++++++++++++-------------
dev-db/mariadb/mariadb-10.2.6.ebuild | 4 +---
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b6ce426..3c29014 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,22 +8,23 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
+DIST mysql-extras-20170719-0024Z.tar.bz2 310450 SHA256 220d4a62c737164a22554bc34c4a1b557441dda12f85ab94936158d540bf2f45 SHA512 658f70b617129b80c69e897e60b4aacc414ce4fc31b3814be6ef7b0002a8f81d6a41af2a88a0a4cd82b7665b1d6682ef6140bebd3c41d08b8ad6b4e083669139 WHIRLPOOL 2463673e700cf3eacc1d02e973f486afdc6120b4cdd194751644770145d5fd018d9a1674d119749224cefca6dd6fc13037c490aec0c34a02c01975141b5e38f1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrglVfFIAAAAAALgAo
+iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlluqSBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7b/Iw/+PZ0Z9mNDUqFmiSY0Q6pRelLhukElKXlPFYKySrfEZa6r3mKXGcDzDfKa
-lZB9heHCFqLReGEQ/NOFJRYQ3K759OW31UpQYvzux8vOsxNkkL1eZUl5uqWFPLRa
-uNgy+9nI9pRuhhKosRQ+kD2xF4mwwDv2/iEzxG1mDXhr52rZXZbjdFkqzD9lUmt/
-eTyWrYGcjIKkNauh8x1sp84ejDHzxv3Q2aMJflcpl+v0oDFyTD18xZ3A3y0aJLUM
-96eCY3KEI22TSvomZkURyMvNuCrDGpaVWDZwRhD1GVm5e3WdzdIOffABU8ezjMKs
-Tm+ioYW679rRmug2t51fOT6439SW5iKD9jMXM7kk8/ZFymM1G46ErLgrM00gOEF0
-tPiNeamCcM7QkaHSDUPHC9Rekj3wXX9PoDtIYckDC1DrEnmk50Phi1ji5PjQlgh+
-CV76WwB+TKCPP62eob0eWUPtT9387W+AufZgQBOaf+I8P0Pfdwi3fEvpdyrlc5Qe
-hHWC5JLe6scGuC8BG4IITP/oZzVRUBnmRWXlWVuWSKEXigjXqw5A45ZSsek40C8U
-+tR3bhuh6YBObkWj2KmHcfAyzLOJxxyf+SkGjezRQe6FgWzl5wua7x+XAvFv7rJ2
-pQJSdeDaWoZejclpiUmhz6C5zyJFFsTjIcArtiLaiB6nFq8Cj08=
-=flkk
+o7Zoug/2Ndk6gK7uDEymWFai1ZJLtQyskFbTbtuwS6tAwtqjlNgGb5QnhM/ksKoP
+iRHtPbY6I1nayiIlnDnuqP9eSOQutbKNzxDWZLX4DY0RJkB2FLJlx9Z4mKpSKHFe
+3s5rEjp46FAqW7P3DK45SBwOAt04nqodKPGEq/jhovJgaCw+lA4laH6kGPklYyGx
+Fg4dBK2EUfEdqGaaWwpO4j4wWWQzKuDuOLxDyoI6sPyUTVo9y5paENXuTcpzYj5H
+QSxB4BImaVIS46ew88F3q5ZfZsSmskK2v+S8boc1J1IzYCxlYI5k+uIgEWOIVfyx
+QEEUs3cuTSlpMs7cYiIDyL8pAimrpRtz+Iex3KPZpBLTOwh+PvNhV+7qDqSd2AEC
+I37vT1+8Uivlqyu6OT+kqk4aYrZETmA4njoVEK+0f6iNmS9gUzxlJ8rONs2qK2IR
+60Np4RnjSP567m8U1bIqN6Kx6Nqx7fBIxK0gkxe29H1jZWuRQr+XZ+9MG0KxpEwI
+mEmQ7E2IyVcTdatxBTAQyGRjFnRk3E4uRkgw+Eet8eJFj7vMLgBcQpQlz8y8/yIA
+znwp/a7v8SwC4yKzo7enM59dmjrnufD4I8rJrCyW0cxzDjmJBgiWVFqmL+RcMgyD
+JEIWaB57X32/OhI4A57JPiv0QnzXsIogvYT3xNoNTslLNJBuzg==
+=RiQd
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index f1a4230..e805996 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20170719-0024Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
SUBSLOT="18"
@@ -31,8 +31,6 @@ else
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
fi
-# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
-# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
PATCHES=(
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-07-19 1:28 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-07-19 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 6c9eeaa67562d2919a0b327a519c1f297ffa0e49
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 01:28:36 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 01:28:36 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6c9eeaa6
dev-db/mariadb: Version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/Manifest | 28 +--
dev-db/mariadb/mariadb-10.2.7.ebuild | 398 +++++++++++++++++++++++++++++++++++
2 files changed, 413 insertions(+), 13 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3c29014..b1fc702 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -2,6 +2,7 @@
Hash: SHA256
DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
+DIST mariadb-10.2.7.tar.gz 67669554 SHA256 225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc SHA512 fa595acc0f5c9c62077db000f1721af79628994c08e82b2eb95d265e3c556e80942c487fc1b91299c382becd71f21a0a117ca93d7428752f436ed83683a4f4cd WHIRLPOOL d76d584924dac41fd787c1a02f79de90ae5334b217b66deb59756490a8c42b801fddac425542e371d68b04fa462a3f438626896749a1c12be70e9d22d857771e
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
@@ -9,22 +10,23 @@ DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c9
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20170719-0024Z.tar.bz2 310450 SHA256 220d4a62c737164a22554bc34c4a1b557441dda12f85ab94936158d540bf2f45 SHA512 658f70b617129b80c69e897e60b4aacc414ce4fc31b3814be6ef7b0002a8f81d6a41af2a88a0a4cd82b7665b1d6682ef6140bebd3c41d08b8ad6b4e083669139 WHIRLPOOL 2463673e700cf3eacc1d02e973f486afdc6120b4cdd194751644770145d5fd018d9a1674d119749224cefca6dd6fc13037c490aec0c34a02c01975141b5e38f1
+DIST mysql-extras-20170719-0113Z.tar.bz2 311116 SHA256 30b7e5f981a110ec8e1582939c59ea037559fa1519771d487d591f022b6a148d SHA512 5e470562e629bd1d104cd1d85e2b57f82b56c8f1f8236d666aca564ed577be50a5818312d8cb2a6a5f18a9c6c6792932fb15f56fd0baac6fadee4411b278f3ce WHIRLPOOL a5764ea0b9ba33d4a4982b24eeefddbaea4367d9e58b866fa9145e65d53369820762a27d36271c522ea3ad214637d28c3d0db3477d47e68647afada7a3dbbd75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlluqSBfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAllutcFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7Zoug/2Ndk6gK7uDEymWFai1ZJLtQyskFbTbtuwS6tAwtqjlNgGb5QnhM/ksKoP
-iRHtPbY6I1nayiIlnDnuqP9eSOQutbKNzxDWZLX4DY0RJkB2FLJlx9Z4mKpSKHFe
-3s5rEjp46FAqW7P3DK45SBwOAt04nqodKPGEq/jhovJgaCw+lA4laH6kGPklYyGx
-Fg4dBK2EUfEdqGaaWwpO4j4wWWQzKuDuOLxDyoI6sPyUTVo9y5paENXuTcpzYj5H
-QSxB4BImaVIS46ew88F3q5ZfZsSmskK2v+S8boc1J1IzYCxlYI5k+uIgEWOIVfyx
-QEEUs3cuTSlpMs7cYiIDyL8pAimrpRtz+Iex3KPZpBLTOwh+PvNhV+7qDqSd2AEC
-I37vT1+8Uivlqyu6OT+kqk4aYrZETmA4njoVEK+0f6iNmS9gUzxlJ8rONs2qK2IR
-60Np4RnjSP567m8U1bIqN6Kx6Nqx7fBIxK0gkxe29H1jZWuRQr+XZ+9MG0KxpEwI
-mEmQ7E2IyVcTdatxBTAQyGRjFnRk3E4uRkgw+Eet8eJFj7vMLgBcQpQlz8y8/yIA
-znwp/a7v8SwC4yKzo7enM59dmjrnufD4I8rJrCyW0cxzDjmJBgiWVFqmL+RcMgyD
-JEIWaB57X32/OhI4A57JPiv0QnzXsIogvYT3xNoNTslLNJBuzg==
-=RiQd
+o7YxxA/+JY9n8PNTpQD71BqeOy7gyeCVZrjFXfzULDId3gC7NUry1bmt7lb3/SLc
+BPxYsQrZcWlxKvFXJYpfcTWa2+aMFgG1YiouuLqCsbsQPbaK5J+eD3lc0rixLufi
+QEmBjN58sIGWFw0Ft6HFuVsUle7JRZmi7TwqXxR8G4Qwk56I1H9lR0vcJCbMrvQf
+/eom0Ceq6S6efBD/WdUoB5EPXSMrdETn8P3p5aW012bXKy0FHWnj+10CHA3EHKmk
+fKeuTPER9qqusd2tE9sBOQuMUuKOqrK7z9jme37U+H/1/1V61eZugmLFp0/aSK6h
+1vUrwt5a6KGCY9ksVFoRbfvk4LECXzE1t7oYy+k/SOcS0FV+45gjhCnknQbE/CME
+oR05Dnd8f+5FJ7C9JMVeyJF0IRayNi18I0Kg/8Z0fU7SzvxJWuFLC5V92ZxTUvil
+s2t8LH0m7UMskm9bgbScpM7DcvrJ0BRhKfOEjGUzWZ2s6exHL9uKkhoZegkcsQDX
+FAaCc9WnkYEso8iUCgbR+Z7/QgdU2kbMEXTT9/cidUAjmQthsJTUAF0uqJy0xQ7n
+gfjYcyPTwW+PK02VTQ7h2EQq4Ac4wn6nzwX//kNWVZoFYhc1fMHMb/Wr7YOMorbI
+WFMYVKdxF4i/4FBEtQlt/oS7GTdejpYdAYNiHHyMKcsKRSvEW6I=
+=NBDb
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.2.7.ebuild b/dev-db/mariadb/mariadb-10.2.7.ebuild
new file mode 100644
index 0000000..ff19ca8
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.7.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20170719-0113Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 prefix toolchain-funcs \
+ multilib-minimal mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam rocksdb sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+ MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+else
+ MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch
+ "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
+ "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
+)
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ backup? ( app-arch/libarchive:0= )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ systemd? ( sys-apps/systemd:= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.35:3=
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ server? ( galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ ) )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+
+ # Here we need to see if the implementation switched client libraries
+ # We check if this is a new instance of the package and a client library already exists
+ local SHOW_ABI_MESSAGE libpath
+ if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+ libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+ elog "Due to ABI changes when switching between different client libraries,"
+ elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+ elog "Please run: revdep-rebuild --library ${libpath}"
+ ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+ fi
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+ if use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+
+ eapply "${PATCHES[@]}"
+ eapply_user
+}
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)"
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_UNITTEST=OFF
+ )
+
+ if use test ; then
+ MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ fi
+
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=share/mariadb
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ )
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ MYSQL_CMAKE_NATIVE_DEFINES+=( -DSKIP_TESTS=ON )
+ fi
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+src_install() {
+ # wrap the config scripts
+ local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
+ multilib-minimal_src_install
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+ cmake-utils_src_install
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
+ rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
+ fi
+
+ if ! multilib_is_native_abi && use server ; then
+ insinto /usr/include/mysql/private
+ doins "${S}"/sql/*.h
+ fi
+}
+
+multilib_src_install_all() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+ einfo "Creating initial directories"
+ # Empty directories ...
+ diropts "-m0750"
+ if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+ dodir "${MY_DATADIR#${EPREFIX}}"
+ keepdir "${MY_DATADIR#${EPREFIX}}"
+ chown -R mysql:mysql "${D}/${MY_DATADIR}"
+ fi
+
+ diropts "-m0755"
+ local folder
+ for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+ dodir "${folder}"
+ keepdir "${folder}"
+ chown -R mysql:mysql "${ED}/${folder}"
+ done
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ fi
+
+ #Remove mytop if perl is not selected
+ [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+
+ # Install compatible symlinks to libmysqlclient
+ use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # 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 run out of order
+ mkdir -p "${T}"/var-tests{,/log}
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+ mysql-multilib-r1_disable_test "$t" "False positive due to varying policies"
+ done
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+ retstatus_tests=$?
+
+ popd || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || eerror "Test failures: $failures"
+ einfo "Tests successfully completed"
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-07-19 0:14 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-07-19 0:14 UTC (permalink / raw
To: gentoo-commits
commit: d40f253843338b67ba1ac5151311d3f45543e4d6
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 00:13:52 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 00:13:52 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=d40f2538
dev-db/mariadb: Syntax errors in last commit
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/mariadb-10.2.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 323622c..f1a4230 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -254,9 +254,9 @@ multilib_src_install_all() {
eprefixify "${TMPDIR}/my.cnf"
doins "${TMPDIR}/my.cnf"
insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
- cp "${FILESDIR}/my.cnf-distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
eprefixify "${TMPDIR}/50-distro-client.cnf"
- newins "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
if use server ; then
mycnf_src="my.cnf.distro-server"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-07-17 19:24 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-07-17 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 29c11366ddc185f4d0e2c834cbed46f4c826b385
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 19:21:42 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 19:23:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=29c11366
dev-db/mariadb: Bring live ebuild into line and update all for GLEP73
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/mariadb-10.2.6.ebuild | 2 +-
dev-db/mariadb/mariadb-9999.ebuild | 46 ++++++++++++++++++++++++++++--------
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 65e0f2c..300717f 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1+"
IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index 71781c1..23309ad 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -9,15 +9,16 @@ EGIT_REPO_URI="https://github.com/MariaDB/server.git"
WSREP_REVISION="25"
SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
+JAVA_PKG_OPT_USE="jdbc"
-inherit toolchain-funcs mysql-multilib-r1 git-r3
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 git-r3
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
KEYWORDS=""
@@ -30,6 +31,7 @@ COMMON_DEPEND="
>=sys-libs/readline-4.1:0=
)
server? (
+ backup? ( app-arch/libarchive:0= )
cracklib? ( sys-libs/cracklib:0= )
extraengine? (
odbc? ( dev-db/unixODBC:0= )
@@ -45,24 +47,40 @@ COMMON_DEPEND="
>=dev-libs/libpcre-8.35:3=
"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
${COMMON_DEPEND}"
RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
+ server? ( galera? (
sys-apps/iproute2
=sys-cluster/galera-${WSREP_REVISION}*
sst-rsync? ( sys-process/lsof )
sst-xtrabackup? ( net-misc/socat[ssl] )
- )
+ ) )
perl? ( !dev-db/mytop
virtual/perl-Getopt-Long
dev-perl/TermReadKey
virtual/perl-Term-ANSIColor
virtual/perl-Time-HiRes )
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+ mysql-multilib-r1_pkg_preinst
+}
# This is a special unpack for the VCS version
src_unpack() {
@@ -71,6 +89,11 @@ src_unpack() {
mv -f "${WORKDIR}/${P}" "${S}"
}
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+ mysql-multilib-r1_src_prepare
+}
+
src_configure(){
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
@@ -103,12 +126,15 @@ src_configure(){
-DCONNECT_WITH_MYSQL=1
-DCONNECT_WITH_LIBXML2=$(usex xml)
-DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
-DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-DPLUGIN_MROONGA=$(usex mroonga YES NO)
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
)
fi
mysql-multilib-r1_src_configure
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-07-09 20:50 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-07-09 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 82b53b69b9295c48be124cd67f24673e6e7fa520
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 20:50:42 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 20:50:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=82b53b69
dev-db/mariadb: fix GSSAPI compiles
dev-db/mariadb/mariadb-10.2.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index e09b344..65e0f2c 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -114,7 +114,7 @@ src_configure(){
-DWITH_PCRE=system
)
local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos ON OFF)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)"
-DCONC_WITH_EXTERNAL_ZLIB=YES
-DWITH_EXTERNAL_ZLIB=YES
@@ -162,7 +162,7 @@ src_configure(){
-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-DWITH_MARIABACKUP=$(usex backup ON OFF)
-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-DINSTALL_SQLBENCHDIR=share/mariadb
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-06-28 20:38 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-06-28 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 611087170306cebf36dc64df52cd5d628472e75c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 20:38:13 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 20:38:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=61108717
dev-db/mariadb: Improve building on ABI_X86_32
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-10.2.6.ebuild | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index c50dd01..ff4783b 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 28 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild:
+ dev-db/mariadb: Improve building on ABI_X86_32
+
13 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-9999.ebuild:
dev-db/mariadb: Fix subslot of 9999
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 54a50f1..d719edc 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -32,10 +32,11 @@ fi
# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
PATCHES=(
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
+ "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
)
COMMON_DEPEND="
@@ -113,8 +114,8 @@ src_configure(){
-DWITH_PCRE=system
)
local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos ON OFF)
+ -DAUTH_GSSAPI_PLUGIN_TYPE="$(usex kerberos DYNAMIC OFF)"
-DCONC_WITH_EXTERNAL_ZLIB=YES
-DWITH_EXTERNAL_ZLIB=YES
-DSUFFIX_INSTALL_DIR=""
@@ -127,6 +128,7 @@ src_configure(){
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_UNITTEST=OFF
)
if use test ; then
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-06-13 1:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-06-13 1:37 UTC (permalink / raw
To: gentoo-commits
commit: 0f8660f0f673e32220d296bcef9029862c54540d
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 01:36:20 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 01:36:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=0f8660f0
dev-db/mariadb: Restore jdbc and test functionality as it exists in 10.1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 4 +
dev-db/mariadb/mariadb-10.2.6.ebuild | 178 ++++++++++++++++++-----------------
dev-db/mariadb/metadata.xml | 1 +
3 files changed, 97 insertions(+), 86 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index f626c3d..31cbda1 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 13 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild,
+ metadata.xml:
+ dev-db/mariadb: Restore jdbc and test functionality as it exists in 10.1
+
09 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild,
metadata.xml:
dev-db/mariadb: Adjust subslot back to 18 which is correct according to
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index ed617c5..54a50f1 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -8,19 +8,21 @@ WSREP_REVISION="25"
SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
-inherit toolchain-funcs mysql-multilib-r1
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
MY_PATCH_DIR="${WORKDIR}/mysql-extras"
@@ -45,6 +47,7 @@ COMMON_DEPEND="
>=sys-libs/readline-4.1:0=
)
server? (
+ backup? ( app-arch/libarchive:0= )
cracklib? ( sys-libs/cracklib:0= )
extraengine? (
odbc? ( dev-db/unixODBC:0= )
@@ -61,6 +64,7 @@ COMMON_DEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}]
"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
${COMMON_DEPEND}"
RDEPEND="${RDEPEND} ${COMMON_DEPEND}
server? ( galera? (
@@ -74,6 +78,7 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
dev-perl/TermReadKey
virtual/perl-Term-ANSIColor
virtual/perl-Time-HiRes )
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
@@ -84,6 +89,21 @@ MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
/usr/include/mysql/private/probes_mysql_dtrace.h )
MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+ mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+ mysql-multilib-r1_src_prepare
+}
+
src_configure(){
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
@@ -134,12 +154,15 @@ src_configure(){
-DCONNECT_WITH_MYSQL=1
-DCONNECT_WITH_LIBXML2=$(usex xml)
-DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
-DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-DPLUGIN_MROONGA=$(usex mroonga YES NO)
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
-DINSTALL_SQLBENCHDIR=share/mariadb
)
if use test ; then
@@ -177,86 +200,69 @@ multilib_src_test() {
local retstatus_tests
if use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
- # 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"
+ # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
- #
- # plugins.two_password_validations
- # Varying policies make it unsuitable for automated testing
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- plugins.two_password_validations \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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."
+ 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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+
+ # 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 run out of order
+ mkdir -p "${T}"/var-tests{,/log}
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # These are failing in MariaDB 10.0 for now and are believed to be
+ # false positives:
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+
+ local t
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+ mysql-multilib-r1_disable_test "$t" "False positive due to varying policies"
+ done
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+ retstatus_tests=$?
+
+ popd || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "$failures" ]] || eerror "Test failures: $failures"
+ einfo "Tests successfully completed"
}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 1a80c3a..b4e973b 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -20,6 +20,7 @@
<flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag>
<flag name="innodb-lzo">Enables lzo compression methods for InnoDB/XtraDB</flag>
<flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
+ <flag name="jdbc">Enable the CONNECT engine to access foreign databases via JDBC</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
<flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
<flag name="libevent">Use libevent for connection handling</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-06-13 1:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-06-13 1:37 UTC (permalink / raw
To: gentoo-commits
commit: 0b01fc2bd8558affe2fbc6ea34120022f1477eac
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 01:37:01 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 01:37:01 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=0b01fc2b
dev-db/mariadb: Fix subslot of 9999
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 31cbda1..c50dd01 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 13 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-9999.ebuild:
+ dev-db/mariadb: Fix subslot of 9999
+
13 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild,
metadata.xml:
dev-db/mariadb: Restore jdbc and test functionality as it exists in 10.1
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index ffc5fbf..71781c1 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -7,7 +7,7 @@ SERVER_URI=" "
EGIT_REPO_URI="https://github.com/MariaDB/server.git"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="19"
+SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
inherit toolchain-funcs mysql-multilib-r1 git-r3
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-06-09 13:24 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-06-09 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 4985157e02c1aab8565d66adaa2670ef46a84308
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 13:20:46 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 13:20:46 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4985157e
dev-db/mariadb: Adjust subslot back to 18 which is correct according to upstream
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +++++
dev-db/mariadb/mariadb-10.2.6.ebuild | 6 +++---
dev-db/mariadb/metadata.xml | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 061dbd4..f626c3d 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 09 Jun 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild,
+ metadata.xml:
+ dev-db/mariadb: Adjust subslot back to 18 which is correct according to
+ upstream
+
31 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild:
dev-db/mariadb: Update 10.2.6
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 47ab4c3..ed617c5 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
MY_EXTRAS_VER="live"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="19"
+SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
inherit toolchain-funcs mysql-multilib-r1
@@ -14,7 +14,7 @@ HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
@@ -58,7 +58,6 @@ COMMON_DEPEND="
tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=
- net-misc/curl[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
@@ -156,6 +155,7 @@ src_install() {
install_compat_symlink() {
use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
}
multilib_foreach_abi install_compat_symlink
}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index c3a2d1f..1a80c3a 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -10,6 +10,7 @@
<description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else</description>
</maintainer>
<use>
+ <flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag>
<flag name="big-tables">Make tables contain up to 1.844E+19 rows</flag>
<flag name="cluster">Add support for NDB clustering (deprecated)</flag>
<flag name="community">Enables the community features from upstream.</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-05-31 2:39 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-05-31 2:39 UTC (permalink / raw
To: gentoo-commits
commit: a7739a1ed0b8b28c2c82b3f4c0898fcade0c7d9e
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 02:39:30 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed May 31 02:39:30 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a7739a1e
dev-db/mariadb: Update 10.2.6
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-10.2.6.ebuild | 21 ++++++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 036558a..061dbd4 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 31 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild:
+ dev-db/mariadb: Update 10.2.6
+
29 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild:
dev-db/mariadb: Update with critical API patch
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index 81b323e..47ab4c3 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -58,6 +58,8 @@ COMMON_DEPEND="
tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=
+ net-misc/curl[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
${COMMON_DEPEND}"
@@ -141,10 +143,23 @@ src_configure(){
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
-DINSTALL_SQLBENCHDIR=share/mariadb
)
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ MYSQL_CMAKE_NATIVE_DEFINES+=( -DSKIP_TESTS=ON )
+ fi
fi
mysql-multilib-r1_src_configure
}
+src_install() {
+ mysql-multilib-r1_src_install
+ install_compat_symlink() {
+ use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
+ dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+ }
+ multilib_foreach_abi install_compat_symlink
+}
+
# Official test instructions:
# USE='embedded extraengine perl server openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
@@ -176,9 +191,9 @@ multilib_src_test() {
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"
+ 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))"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-05-29 2:07 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-05-29 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 417cf069c9f9ad82a262da17d263751b70db7874
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 02:07:17 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon May 29 02:07:17 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=417cf069
dev-db/mariadb: Update with critical API patch
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/Manifest | 27 +++++++++++++--------------
dev-db/mariadb/mariadb-10.2.6.ebuild | 17 +++++++++++------
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index de24545..036558a 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 29 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.6.ebuild:
+ dev-db/mariadb: Update with critical API patch
+
28 May 2017; Brian Evans <grknight@gentoo.org> -mariadb-10.0.25.ebuild,
-mariadb-10.1.12.ebuild, -mariadb-10.1.13.ebuild, -mariadb-10.1.14.ebuild,
-mariadb-10.2.1.ebuild, -mariadb-10.2.2.ebuild, -mariadb-10.2.4.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 45774f7..b6ce426 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,23 +8,22 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
-DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrX9RfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrglVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7bzVQ/+Lk0CFEadZsjrmRIJfrpRyfG9dkb5uJjf75UC3EzXF8S3gJXr8pBIG23I
-73e73A7X4FXfsG8wV358yh2M2O8btlXCKlDkQH6hU0CUemh8J6tet7bTDh9JtJP1
-wfA5Himi2ANoVGjOHPxkqpIspfAdNXkU1zdD6iyps+fUeYLLwi9lZTu7qW1AbPag
-75HwwtTvYedbXyGZsosrk+yNekwxL7MuVdfo7ddtXV2vFEmWVAC9npK0CW6v/le9
-AEioRn78cQRapfgLA9soBN8Ky8JKYbqzT5/aDB837dJX6cFO/ADV01lkFy2SlQ1F
-TB3Vv68v+/jpevFbR6/2iTqTKiwfMHbnHIdJBGXnR8Op6xRMQFdQGEK+sZwZvjva
-Vhg1m3JqdBMr7biosVrcx0Aifp9gyBF8STNxVxXPnD+Z+GITigFl6lKFpLOkRIDC
-9wtK/0oJMm0YBczls5FbfmjQgWpli7dq/AdRCD5TxrZ3PM7xckiA0KLQfebq+TR8
-/o9CtVGrFDVd7FbcIXxwPtEqoy2BXyQ3JO3pgqrc3Uhdo4gAtEXXgJuFWx6FNaIc
-3fMlQgo09lqyjD5P/p1lVzFcELFfyeEOELatP6vFZ8m5zSX3amDvL1EV/HK2pb0k
-LM0qW6zaTbKzvZ5zpCXKcOQHxRK0XeBM2piHv/u7Yk2kVJQKPRc=
-=eNDx
+o7b/Iw/+PZ0Z9mNDUqFmiSY0Q6pRelLhukElKXlPFYKySrfEZa6r3mKXGcDzDfKa
+lZB9heHCFqLReGEQ/NOFJRYQ3K759OW31UpQYvzux8vOsxNkkL1eZUl5uqWFPLRa
+uNgy+9nI9pRuhhKosRQ+kD2xF4mwwDv2/iEzxG1mDXhr52rZXZbjdFkqzD9lUmt/
+eTyWrYGcjIKkNauh8x1sp84ejDHzxv3Q2aMJflcpl+v0oDFyTD18xZ3A3y0aJLUM
+96eCY3KEI22TSvomZkURyMvNuCrDGpaVWDZwRhD1GVm5e3WdzdIOffABU8ezjMKs
+Tm+ioYW679rRmug2t51fOT6439SW5iKD9jMXM7kk8/ZFymM1G46ErLgrM00gOEF0
+tPiNeamCcM7QkaHSDUPHC9Rekj3wXX9PoDtIYckDC1DrEnmk50Phi1ji5PjQlgh+
+CV76WwB+TKCPP62eob0eWUPtT9387W+AufZgQBOaf+I8P0Pfdwi3fEvpdyrlc5Qe
+hHWC5JLe6scGuC8BG4IITP/oZzVRUBnmRWXlWVuWSKEXigjXqw5A45ZSsek40C8U
++tR3bhuh6YBObkWj2KmHcfAyzLOJxxyf+SkGjezRQe6FgWzl5wua7x+XAvFv7rJ2
+pQJSdeDaWoZejclpiUmhz6C5zyJFFsTjIcArtiLaiB6nFq8Cj08=
+=flkk
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index d19c155..81b323e 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
+MY_EXTRAS_VER="live"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
SUBSLOT="19"
@@ -22,13 +22,18 @@ REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+ MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+else
+ MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+fi
# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
PATCHES=(
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
)
COMMON_DEPEND="
@@ -92,7 +97,7 @@ src_configure(){
-DCONC_WITH_EXTERNAL_ZLIB=YES
-DWITH_EXTERNAL_ZLIB=YES
-DSUFFIX_INSTALL_DIR=""
- -DINSTALL_INCLUDEDIR=include/mariadb
+ -DINSTALL_INCLUDEDIR=include/mysql
-DINSTALL_INFODIR=share/info
-DINSTALL_LIBDIR=$(get_libdir)
-DINSTALL_ELIBDIR=$(get_libdir)/mariadb
@@ -171,9 +176,9 @@ multilib_src_test() {
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"
+# 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))"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-05-28 23:40 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-05-28 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 26ade4403754c1075490afb98a515fcb7159ad02
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 23:40:07 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun May 28 23:40:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=26ade440
dev-db/mariadb: Drop old versions
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 +
dev-db/mariadb/Manifest | 35 ++---
dev-db/mariadb/mariadb-10.0.25.ebuild | 185 --------------------------
dev-db/mariadb/mariadb-10.1.12.ebuild | 212 -----------------------------
dev-db/mariadb/mariadb-10.1.13.ebuild | 212 -----------------------------
dev-db/mariadb/mariadb-10.1.14.ebuild | 217 ------------------------------
dev-db/mariadb/mariadb-10.2.1.ebuild | 216 ------------------------------
dev-db/mariadb/mariadb-10.2.2.ebuild | 223 -------------------------------
dev-db/mariadb/mariadb-10.2.4.ebuild | 242 ----------------------------------
dev-db/mariadb/mariadb-10.2.5.ebuild | 242 ----------------------------------
10 files changed, 19 insertions(+), 1771 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index ffea8ea..de24545 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 28 May 2017; Brian Evans <grknight@gentoo.org> -mariadb-10.0.25.ebuild,
+ -mariadb-10.1.12.ebuild, -mariadb-10.1.13.ebuild, -mariadb-10.1.14.ebuild,
+ -mariadb-10.2.1.ebuild, -mariadb-10.2.2.ebuild, -mariadb-10.2.4.ebuild,
+ -mariadb-10.2.5.ebuild:
+ dev-db/mariadb: Drop old versions
+
*mariadb-10.2.6 (28 May 2017)
28 May 2017; Brian Evans <grknight@gentoo.org> +mariadb-10.2.6.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 293ae9c..45774f7 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,14 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c
-DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
-DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d
-DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a
-DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
-DIST mariadb-10.2.2.tar.gz 62683612 SHA256 55cf9e357ae4511fc1330e7cb8a15746d99b3a7875b6da9bcf1acfb1aa6f893a SHA512 f1d0671e31db2f3aef86c26d9dd8765732e609e7d5ea9c1a452fb0f42cf449bfd17c80a4d11f8bf64074b6536070602e11cedb16b0f36acf1c9e889f0c106e4e WHIRLPOOL b9117275adff53c44fa81b255324d806c9f4dcbfd4f40c3b0cd2fd50d898207617e35543e3aab32104a5151ec290ed79ecd25793271b860f5bb05abd29064db7
-DIST mariadb-10.2.4.tar.gz 63235247 SHA256 b73e353c29a0171d1057f14191c83d1f17e6f58ca09a79dda4b12c0e12b7f975 SHA512 bb6b35b6abd834d4ce2e27f4e06abbf790769e3d56b89d25d06126c21abb1bcce3d8f19c49e2c2052bf89e5ebc3c67c5092dfb25577870f8f561ce87777367ae WHIRLPOOL e2ba3b38e80b47dcca02e741ecc91ec8a1f96d72836422fb890be6d4ffa9cfebcd85c09bf11b1a492ad1edd9923299ff516b0428564c33ac0482c0443229a5f9
-DIST mariadb-10.2.5.tar.gz 67183039 SHA256 6629bd2392ccba2fb30ce3a27efddba1f695ac739538007ad1d15caeed19ff50 SHA512 1a1911266110e86ef93aad73521d9ddde154357613a6ea7198cc1409aa4532998ddda69d64abcde2a6cf6b8c38c29bf730a6605253fb0f43d5bd4e1db48ed50e WHIRLPOOL d544341ade0705980fc72acdf97428100d5439ed6f2ca747d0fe291d85f597b7bd54e8c162a4771e042e3f31eb6c1ded473f31b5f233e84dec1095d16547ddb7
DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
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
@@ -16,24 +8,23 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
-DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrXLpfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrX9RfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7aHRw/3bnUIu2LKwPhI/RguY9izGM7lcaysGe/cMJfYNqSupJhBJTlfEmdQt6Ct
-9rRQbsaQQvFA+3RkdhUxqHojHLw4Zf9DYLNldhlvQbSWETTne8K1xwz1vHZ46B3q
-md1QObh/RWj70/0fwF+7rDMfAFdMJuV+4rHVV6hSgc56EDCjz4LNUpCQ/vSByYcc
-gjfOiwZFDfElNpaFXXZwv/XX9ioti/dcan8m4XjolrFWTFE0lRRVNviXgBzJODPO
-QyvPsrrtN9Zcx58kpW9rGlSTxr+LLRCKWxwicw53bdiwGxe1ibt03mEqOgGIIDuO
-TQvYNg2bHMknqIjYag6NEHMqszm0ThEYJNV/aKj/fRzrap3BDZ76CkiVWL2REmcx
-MYb7ItNnyfR8yLiHXfayUTZ8R6kWGbkcJVBDC+nwyNDO9RromrKWl5fKQRX53KAY
-9QDRdJ10epfNzUajdQ+EkX9yFr6IQEqYNsxIfSCzxUqDa38UarNgWGMSLt2DVKb0
-HZMr5CyRRTdmwLhy/SJdlwhgvuErsABWaVBA37wXLFewbCHp2fShcz573vlmjlKw
-HEuDJIynxgUxyPpjA3eB4fFP7HpB+lREqCSe3+JJPyIZJ3glUHVWO4EYTe9lDHhF
-VxAGnPSL/fYxZDE4NrUgrwkpLRP1gWIeqvZJVWL9bxM0/AGA8Q==
-=zvn5
+o7bzVQ/+Lk0CFEadZsjrmRIJfrpRyfG9dkb5uJjf75UC3EzXF8S3gJXr8pBIG23I
+73e73A7X4FXfsG8wV358yh2M2O8btlXCKlDkQH6hU0CUemh8J6tet7bTDh9JtJP1
+wfA5Himi2ANoVGjOHPxkqpIspfAdNXkU1zdD6iyps+fUeYLLwi9lZTu7qW1AbPag
+75HwwtTvYedbXyGZsosrk+yNekwxL7MuVdfo7ddtXV2vFEmWVAC9npK0CW6v/le9
+AEioRn78cQRapfgLA9soBN8Ky8JKYbqzT5/aDB837dJX6cFO/ADV01lkFy2SlQ1F
+TB3Vv68v+/jpevFbR6/2iTqTKiwfMHbnHIdJBGXnR8Op6xRMQFdQGEK+sZwZvjva
+Vhg1m3JqdBMr7biosVrcx0Aifp9gyBF8STNxVxXPnD+Z+GITigFl6lKFpLOkRIDC
+9wtK/0oJMm0YBczls5FbfmjQgWpli7dq/AdRCD5TxrZ3PM7xckiA0KLQfebq+TR8
+/o9CtVGrFDVd7FbcIXxwPtEqoy2BXyQ3JO3pgqrc3Uhdo4gAtEXXgJuFWx6FNaIc
+3fMlQgo09lqyjD5P/p1lVzFcELFfyeEOELatP6vFZ8m5zSX3amDvL1EV/HK2pb0k
+LM0qW6zaTbKzvZ5zpCXKcOQHxRK0XeBM2piHv/u7Yk2kVJQKPRc=
+=eNDx
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild
deleted file mode 100644
index 791bdcd..0000000
--- a/dev-db/mariadb/mariadb-10.0.25.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20151223-1501Z"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist odbc oqgraph pam sphinx tokudb xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-PATCHES=(
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
- "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch"
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.15.patch"
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
- "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
-)
-COMMON_DEPEND="
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DWITHOUT_FEDERATED=1
- -DWITHOUT_FEDERATEDX=1 )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- $(mysql-cmake_use_plugin oqgraph OQGRAPH)
- $(mysql-cmake_use_plugin sphinx SPHINX)
- $(mysql-cmake_use_plugin tokudb TOKUDB)
- $(mysql-cmake_use_plugin pam AUTH_PAM)
- -DWITHOUT_CASSANDRA=0
- $(mysql-cmake_use_plugin extraengine SEQUENCE)
- $(mysql-cmake_use_plugin extraengine SPIDER)
- $(mysql-cmake_use_plugin extraengine CONNECT)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITHOUT_MROONGA=1
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # archive.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.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.bootstrap \
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
deleted file mode 100644
index 613209b..0000000
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild
deleted file mode 100644
index 613209b..0000000
--- a/dev-db/mariadb/mariadb-10.1.13.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
deleted file mode 100644
index 7774cbb..0000000
--- a/dev-db/mariadb/mariadb-10.1.14.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.2.1.ebuild b/dev-db/mariadb/mariadb-10.2.1.ebuild
deleted file mode 100644
index 6981240..0000000
--- a/dev-db/mariadb/mariadb-10.2.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
-PATCHES=(
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.2.2.ebuild b/dev-db/mariadb/mariadb-10.2.2.ebuild
deleted file mode 100644
index 8e9d409..0000000
--- a/dev-db/mariadb/mariadb-10.2.2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="19"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
-# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
-PATCHES=(
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mariadb/mariadb_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.2.4.ebuild b/dev-db/mariadb/mariadb-10.2.4.ebuild
deleted file mode 100644
index d19c155..0000000
--- a/dev-db/mariadb/mariadb-10.2.4.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="19"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
-# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
-PATCHES=(
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- server? ( galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- ) )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mariadb/mariadb_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DINSTALL_INCLUDEDIR=include/mariadb
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- )
-
- if use test ; then
- MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- fi
-
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- -DINSTALL_SQLBENCHDIR=share/mariadb
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
- #
- # plugins.two_password_validations
- # Varying policies make it unsuitable for automated testing
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- plugins.two_password_validations \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.2.5.ebuild b/dev-db/mariadb/mariadb-10.2.5.ebuild
deleted file mode 100644
index d19c155..0000000
--- a/dev-db/mariadb/mariadb-10.2.5.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160131-0252Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="19"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
-# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
-PATCHES=(
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-)
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- server? ( galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- ) )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
- /usr/include/mariadb/mariadb_version.h
- /usr/include/mysql/private/probes_mysql_nodtrace.h
- /usr/include/mysql/private/probes_mysql_dtrace.h )
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
-
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DINSTALL_INCLUDEDIR=include/mariadb
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- )
-
- if use test ; then
- MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- fi
-
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
- -DINSTALL_SQLBENCHDIR=share/mariadb
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
- #
- # plugins.two_password_validations
- # Varying policies make it unsuitable for automated testing
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- plugins.two_password_validations \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-05-28 23:27 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-05-28 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 899bac7f1cba22db87f7786f0b6409385af3e091
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 23:26:53 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun May 28 23:26:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=899bac7f
dev-db/mariadb: Version bump to 10.2.6 GA
Needs refinement and lots of testing
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 +
dev-db/mariadb/Manifest | 27 ++--
dev-db/mariadb/mariadb-10.2.6.ebuild | 242 +++++++++++++++++++++++++++++++++++
3 files changed, 262 insertions(+), 13 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index d366a03..ffea8ea 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.2.6 (28 May 2017)
+
+ 28 May 2017; Brian Evans <grknight@gentoo.org> +mariadb-10.2.6.ebuild:
+ dev-db/mariadb: Version bump to 10.2.6 GA Needs refinement and lots of
+ testing
+
02 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.2.ebuild,
mariadb-10.2.4.ebuild, mariadb-10.2.5.ebuild:
dev-db/mariadb: Remove failed MYSLOT experiment
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3c9b43a..293ae9c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,6 +9,7 @@ DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8
DIST mariadb-10.2.2.tar.gz 62683612 SHA256 55cf9e357ae4511fc1330e7cb8a15746d99b3a7875b6da9bcf1acfb1aa6f893a SHA512 f1d0671e31db2f3aef86c26d9dd8765732e609e7d5ea9c1a452fb0f42cf449bfd17c80a4d11f8bf64074b6536070602e11cedb16b0f36acf1c9e889f0c106e4e WHIRLPOOL b9117275adff53c44fa81b255324d806c9f4dcbfd4f40c3b0cd2fd50d898207617e35543e3aab32104a5151ec290ed79ecd25793271b860f5bb05abd29064db7
DIST mariadb-10.2.4.tar.gz 63235247 SHA256 b73e353c29a0171d1057f14191c83d1f17e6f58ca09a79dda4b12c0e12b7f975 SHA512 bb6b35b6abd834d4ce2e27f4e06abbf790769e3d56b89d25d06126c21abb1bcce3d8f19c49e2c2052bf89e5ebc3c67c5092dfb25577870f8f561ce87777367ae WHIRLPOOL e2ba3b38e80b47dcca02e741ecc91ec8a1f96d72836422fb890be6d4ffa9cfebcd85c09bf11b1a492ad1edd9923299ff516b0428564c33ac0482c0443229a5f9
DIST mariadb-10.2.5.tar.gz 67183039 SHA256 6629bd2392ccba2fb30ce3a27efddba1f695ac739538007ad1d15caeed19ff50 SHA512 1a1911266110e86ef93aad73521d9ddde154357613a6ea7198cc1409aa4532998ddda69d64abcde2a6cf6b8c38c29bf730a6605253fb0f43d5bd4e1db48ed50e WHIRLPOOL d544341ade0705980fc72acdf97428100d5439ed6f2ca747d0fe291d85f597b7bd54e8c162a4771e042e3f31eb6c1ded473f31b5f233e84dec1095d16547ddb7
+DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
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
@@ -20,19 +21,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkH6BJfFIAAAAAALgAo
+iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrXLpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7bgORAA1EXfSPk8v+zk8aM4ARnDhhT499Y0TQTgmpDC5lvc09j8nZa1CQrYoNcc
-dBGB02LvlELfoCu9oGQHSc2wSyx3B66nfFLEhBFPtDu5ib2LnigubO46zcAB0CLB
-FUWZHEN7m3kkpBV1m6NIJoqx1QIc6H+62mRxO/ofMcP9McFFQ2bKi+XJps8857xJ
-WFFvaVi+OaFjyrvIbUJa638+OMfNVJKGvvEQRHNgimp8vrV7vdlGbBLSzsvbf6e9
-AqslDTXQ08+1KBIxHdz1aJaltwS66U+qQKoef77vhCWP6l9HP4KhcHB4AUtcBacp
-RbGe9X9E+49D3XpkB1j5vAqFDHCrlTt0C64DNJ5cw7fmXr+gtT/Qn2PPyMp1le9g
-9MZmtlfp/d4vrZ1t3qaqeAlY0yl1uLpVR97RjwCLxva9LFdMzK0M+houPVmaLZEL
-/AIWjUhPZa77DfYaLoRmUbLSaqAL24u8Myk6JIiGmcELuhC1glio2PKwsmFxk57/
-NerjvVzsZziVSFhVSIwA4JD0VBocJo+Dm2iQM3wqZ7DN1pVHm/qRsSquPnXKHvcw
-OQ+05ZvdI5g+3q/VS7tbr/mjM/9aADTadrQigyksiLVLfHm2QvrVVrlXNAqO9MGD
-uOjjfxmbrFHpk1VGa7t3Q4iQskPFbFnhDfXESNqskatC/lu7/zM=
-=zLXQ
+o7aHRw/3bnUIu2LKwPhI/RguY9izGM7lcaysGe/cMJfYNqSupJhBJTlfEmdQt6Ct
+9rRQbsaQQvFA+3RkdhUxqHojHLw4Zf9DYLNldhlvQbSWETTne8K1xwz1vHZ46B3q
+md1QObh/RWj70/0fwF+7rDMfAFdMJuV+4rHVV6hSgc56EDCjz4LNUpCQ/vSByYcc
+gjfOiwZFDfElNpaFXXZwv/XX9ioti/dcan8m4XjolrFWTFE0lRRVNviXgBzJODPO
+QyvPsrrtN9Zcx58kpW9rGlSTxr+LLRCKWxwicw53bdiwGxe1ibt03mEqOgGIIDuO
+TQvYNg2bHMknqIjYag6NEHMqszm0ThEYJNV/aKj/fRzrap3BDZ76CkiVWL2REmcx
+MYb7ItNnyfR8yLiHXfayUTZ8R6kWGbkcJVBDC+nwyNDO9RromrKWl5fKQRX53KAY
+9QDRdJ10epfNzUajdQ+EkX9yFr6IQEqYNsxIfSCzxUqDa38UarNgWGMSLt2DVKb0
+HZMr5CyRRTdmwLhy/SJdlwhgvuErsABWaVBA37wXLFewbCHp2fShcz573vlmjlKw
+HEuDJIynxgUxyPpjA3eB4fFP7HpB+lREqCSe3+JJPyIZJ3glUHVWO4EYTe9lDHhF
+VxAGnPSL/fYxZDE4NrUgrwkpLRP1gWIeqvZJVWL9bxM0/AGA8Q==
+=zvn5
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
new file mode 100644
index 0000000..d19c155
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20160131-0252Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="19"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
+PATCHES=(
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+)
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ server? ( galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ ) )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DINSTALL_INCLUDEDIR=include/mariadb
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ )
+
+ if use test ; then
+ MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ fi
+
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ -DINSTALL_SQLBENCHDIR=share/mariadb
+ )
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+ #
+ # plugins.two_password_validations
+ # Varying policies make it unsuitable for automated testing
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ plugins.two_password_validations \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-05-02 12:31 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-05-02 12:31 UTC (permalink / raw
To: gentoo-commits
commit: c19c3329c0c4086c0d9c8dcaea868791a05fcebb
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 12:31:04 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue May 2 12:31:04 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c19c3329
dev-db/mariadb: Remove failed MYSLOT experiment
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 4 ++++
dev-db/mariadb/mariadb-10.2.2.ebuild | 2 --
dev-db/mariadb/mariadb-10.2.4.ebuild | 2 --
dev-db/mariadb/mariadb-10.2.5.ebuild | 2 --
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 19a0e89..d366a03 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 02 May 2017; Brian Evans <grknight@gentoo.org> mariadb-10.2.2.ebuild,
+ mariadb-10.2.4.ebuild, mariadb-10.2.5.ebuild:
+ dev-db/mariadb: Remove failed MYSLOT experiment
+
*mariadb-10.2.1 (02 May 2017)
*mariadb-10.2.2 (02 May 2017)
*mariadb-10.2.4 (02 May 2017)
diff --git a/dev-db/mariadb/mariadb-10.2.2.ebuild b/dev-db/mariadb/mariadb-10.2.2.ebuild
index d73daac..8e9d409 100644
--- a/dev-db/mariadb/mariadb-10.2.2.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.2.ebuild
@@ -8,8 +8,6 @@ WSREP_REVISION="25"
SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
-MYSLOT="${PN}/${SUBSLOT}"
-
inherit toolchain-funcs mysql-multilib-r1
HOMEPAGE="http://mariadb.org/"
diff --git a/dev-db/mariadb/mariadb-10.2.4.ebuild b/dev-db/mariadb/mariadb-10.2.4.ebuild
index 6137d7b..d19c155 100644
--- a/dev-db/mariadb/mariadb-10.2.4.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.4.ebuild
@@ -8,8 +8,6 @@ WSREP_REVISION="25"
SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
-MYSLOT="${PN}/${SUBSLOT}"
-
inherit toolchain-funcs mysql-multilib-r1
HOMEPAGE="http://mariadb.org/"
diff --git a/dev-db/mariadb/mariadb-10.2.5.ebuild b/dev-db/mariadb/mariadb-10.2.5.ebuild
index 6137d7b..d19c155 100644
--- a/dev-db/mariadb/mariadb-10.2.5.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.5.ebuild
@@ -8,8 +8,6 @@ WSREP_REVISION="25"
SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
-MYSLOT="${PN}/${SUBSLOT}"
-
inherit toolchain-funcs mysql-multilib-r1
HOMEPAGE="http://mariadb.org/"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-05-02 2:11 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-05-02 2:11 UTC (permalink / raw
To: gentoo-commits
commit: ed5bb3fbdfd8b02dd9cedd02c809f93b7d6f5e24
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 01:59:50 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue May 2 01:59:50 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ed5bb3fb
dev-db/mariadb: Version bumps to test
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 12 ++-
dev-db/mariadb/Manifest | 36 ++++---
.../{mariadb-9999.ebuild => mariadb-10.2.1.ebuild} | 77 +++++++-------
.../{mariadb-9999.ebuild => mariadb-10.2.2.ebuild} | 92 ++++++++++-------
.../{mariadb-9999.ebuild => mariadb-10.2.4.ebuild} | 113 ++++++++++++++-------
.../{mariadb-9999.ebuild => mariadb-10.2.5.ebuild} | 113 ++++++++++++++-------
dev-db/mariadb/mariadb-9999.ebuild | 2 +-
7 files changed, 280 insertions(+), 165 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 21c3941..19a0e89 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,17 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.2.1 (02 May 2017)
+*mariadb-10.2.2 (02 May 2017)
+*mariadb-10.2.4 (02 May 2017)
+*mariadb-10.2.5 (02 May 2017)
+
+ 02 May 2017; Brian Evans <grknight@gentoo.org> +mariadb-10.2.1.ebuild,
+ +mariadb-10.2.2.ebuild, +mariadb-10.2.4.ebuild, +mariadb-10.2.5.ebuild,
+ mariadb-9999.ebuild:
+ dev-db/mariadb: Version bumps to test
+
12 May 2016; Brian Evans <grknight@gentoo.org> mariadb-9999.ebuild:
dev-db/mariadb: Bring live version up-to-date
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ee3156d..3c9b43a 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,6 +5,10 @@ DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d
DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a
+DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
+DIST mariadb-10.2.2.tar.gz 62683612 SHA256 55cf9e357ae4511fc1330e7cb8a15746d99b3a7875b6da9bcf1acfb1aa6f893a SHA512 f1d0671e31db2f3aef86c26d9dd8765732e609e7d5ea9c1a452fb0f42cf449bfd17c80a4d11f8bf64074b6536070602e11cedb16b0f36acf1c9e889f0c106e4e WHIRLPOOL b9117275adff53c44fa81b255324d806c9f4dcbfd4f40c3b0cd2fd50d898207617e35543e3aab32104a5151ec290ed79ecd25793271b860f5bb05abd29064db7
+DIST mariadb-10.2.4.tar.gz 63235247 SHA256 b73e353c29a0171d1057f14191c83d1f17e6f58ca09a79dda4b12c0e12b7f975 SHA512 bb6b35b6abd834d4ce2e27f4e06abbf790769e3d56b89d25d06126c21abb1bcce3d8f19c49e2c2052bf89e5ebc3c67c5092dfb25577870f8f561ce87777367ae WHIRLPOOL e2ba3b38e80b47dcca02e741ecc91ec8a1f96d72836422fb890be6d4ffa9cfebcd85c09bf11b1a492ad1edd9923299ff516b0428564c33ac0482c0443229a5f9
+DIST mariadb-10.2.5.tar.gz 67183039 SHA256 6629bd2392ccba2fb30ce3a27efddba1f695ac739538007ad1d15caeed19ff50 SHA512 1a1911266110e86ef93aad73521d9ddde154357613a6ea7198cc1409aa4532998ddda69d64abcde2a6cf6b8c38c29bf730a6605253fb0f43d5bd4e1db48ed50e WHIRLPOOL d544341ade0705980fc72acdf97428100d5439ed6f2ca747d0fe291d85f597b7bd54e8c162a4771e042e3f31eb6c1ded473f31b5f233e84dec1095d16547ddb7
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
@@ -14,21 +18,21 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
-iQJ8BAEBCABmBQJXMjGtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2+NsQANNqPpae6Ep3HHUP3GEa+oq/
-d+yfxrp+zYtbWjZJ+4Apcg+6TcrwU9AfKnIhxavHg6e194hg5HOHJgcPA126dU5V
-Xu2QHMFmozezhsQsFvZYq/5z9xfOQ6RW/WYzRsWjnULXEdcUS9EaoyhUQfcG+++W
-wpzzxg7sS0MG9LsrPhVN8nmv/mtRraQ1jbdgu7CLSN1RmN/A1HC+rtcgELEAKgJb
-ZBbeU5mKqhJ9IaEf6Xk/RGEanaPeaxqD6ik0lkkeTg/HOX1aN3frG/H56UgQ9776
-lRRaXfcIVGeyEaFYsQvFEPG/tKyLn3RanAAVvqvcboBi6CV/AsERnOBK8Ao+vdzN
-KJhvdpojJFIArNobSNlSyPMOUXlpANXlpMRrjVhOODPBGTJbZBZA+XLJk1a4dswF
-7lQycmeMTuQDdyYM7qetAsqxN6RzC5Z+adeMt7mjNJ5AoG4r72I+H6DU63ljg4wl
-U+lInSMZlkEil+8c8/F+4MUNALmpMB6mpbEqy2oJJbRRTFy1A7e/Mtb4tRRqjM7X
-8e73rGLMfcct0kwHDrF/KHYcRkSFQVIDDExIPmv+j0TCphCUfTzxWrHniNiOuec7
-LeTQjoONp7aFiWZMIRbOEmD2hsn/tMR+72EwJUiRHcDFFYDj8fOaaRFeCLAAtkjw
-Nd23VeNHkbgjzKVQm85g
-=AgjA
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkH6BJfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
+QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
+o7bgORAA1EXfSPk8v+zk8aM4ARnDhhT499Y0TQTgmpDC5lvc09j8nZa1CQrYoNcc
+dBGB02LvlELfoCu9oGQHSc2wSyx3B66nfFLEhBFPtDu5ib2LnigubO46zcAB0CLB
+FUWZHEN7m3kkpBV1m6NIJoqx1QIc6H+62mRxO/ofMcP9McFFQ2bKi+XJps8857xJ
+WFFvaVi+OaFjyrvIbUJa638+OMfNVJKGvvEQRHNgimp8vrV7vdlGbBLSzsvbf6e9
+AqslDTXQ08+1KBIxHdz1aJaltwS66U+qQKoef77vhCWP6l9HP4KhcHB4AUtcBacp
+RbGe9X9E+49D3XpkB1j5vAqFDHCrlTt0C64DNJ5cw7fmXr+gtT/Qn2PPyMp1le9g
+9MZmtlfp/d4vrZ1t3qaqeAlY0yl1uLpVR97RjwCLxva9LFdMzK0M+houPVmaLZEL
+/AIWjUhPZa77DfYaLoRmUbLSaqAL24u8Myk6JIiGmcELuhC1glio2PKwsmFxk57/
+NerjvVzsZziVSFhVSIwA4JD0VBocJo+Dm2iQM3wqZ7DN1pVHm/qRsSquPnXKHvcw
+OQ+05ZvdI5g+3q/VS7tbr/mjM/9aADTadrQigyksiLVLfHm2QvrVVrlXNAqO9MGD
+uOjjfxmbrFHpk1VGa7t3Q4iQskPFbFnhDfXESNqskatC/lu7/zM=
+=zLXQ
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-10.2.1.ebuild
similarity index 72%
copy from dev-db/mariadb/mariadb-9999.ebuild
copy to dev-db/mariadb/mariadb-10.2.1.ebuild
index 71781c1..6981240 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.1.ebuild
@@ -2,15 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="none"
-SERVER_URI=" "
-EGIT_REPO_URI="https://github.com/MariaDB/server.git"
+MY_EXTRAS_VER="20160131-0252Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
-inherit toolchain-funcs mysql-multilib-r1 git-r3
+inherit toolchain-funcs mysql-multilib-r1
+
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
@@ -19,7 +18,17 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-KEYWORDS=""
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+PATCHES=(
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
+)
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
@@ -62,14 +71,9 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-# This is a special unpack for the VCS version
-src_unpack() {
- git-r3_src_unpack
-
- mv -f "${WORKDIR}/${P}" "${S}"
-}
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
@@ -115,23 +119,26 @@ src_configure(){
}
# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl server openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-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
- multilib_is_native_abi || return
-
- # 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 server ; then
- if ! use "minimal" ; then
+ # 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 [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
@@ -148,38 +155,43 @@ multilib_src_test() {
# 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 "${S}"/mysql-test/var-tests{,/log}
+ # create directories because mysqladmin might run 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
+ # funcs_1.is_columns_mysql main.bootstrap
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
+ main.mysqld--help plugins.cracklib_password_check \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}" || die
# run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
@@ -198,10 +210,7 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
- # Cleanup test data after a successful run
- rm -r "${S}/mysql-test/var-tests"
else
-
einfo "Skipping server tests due to minimal build."
fi
}
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-10.2.2.ebuild
similarity index 67%
copy from dev-db/mariadb/mariadb-9999.ebuild
copy to dev-db/mariadb/mariadb-10.2.2.ebuild
index 71781c1..d73daac 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.2.ebuild
@@ -2,24 +2,36 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="none"
-SERVER_URI=" "
-EGIT_REPO_URI="https://github.com/MariaDB/server.git"
+MY_EXTRAS_VER="20160131-0252Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="18"
+SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
-inherit toolchain-funcs mysql-multilib-r1 git-r3
+MYSLOT="${PN}/${SUBSLOT}"
+
+inherit toolchain-funcs mysql-multilib-r1
+
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-KEYWORDS=""
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
+PATCHES=(
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+)
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
@@ -60,16 +72,13 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
"
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-# This is a special unpack for the VCS version
-src_unpack() {
- git-r3_src_unpack
-
- mv -f "${WORKDIR}/${P}" "${S}"
-}
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
@@ -80,7 +89,11 @@ src_configure(){
-DWITH_PCRE=system
)
local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
)
if use server ; then
# Federated{,X} must be treated special otherwise they will not be built as plugins
@@ -115,23 +128,26 @@ src_configure(){
}
# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl server openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-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
- multilib_is_native_abi || return
-
- # 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 server ; then
- if ! use "minimal" ; then
+ # 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 [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
@@ -148,38 +164,43 @@ multilib_src_test() {
# 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 "${S}"/mysql-test/var-tests{,/log}
+ # create directories because mysqladmin might run 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
+ # funcs_1.is_columns_mysql main.bootstrap
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
+ main.mysqld--help plugins.cracklib_password_check \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}" || die
# run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
@@ -198,10 +219,7 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
- # Cleanup test data after a successful run
- rm -r "${S}/mysql-test/var-tests"
else
-
einfo "Skipping server tests due to minimal build."
fi
}
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-10.2.4.ebuild
similarity index 61%
copy from dev-db/mariadb/mariadb-9999.ebuild
copy to dev-db/mariadb/mariadb-10.2.4.ebuild
index 71781c1..6137d7b 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.4.ebuild
@@ -2,24 +2,36 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="none"
-SERVER_URI=" "
-EGIT_REPO_URI="https://github.com/MariaDB/server.git"
+MY_EXTRAS_VER="20160131-0252Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="18"
+SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
-inherit toolchain-funcs mysql-multilib-r1 git-r3
+MYSLOT="${PN}/${SUBSLOT}"
+
+inherit toolchain-funcs mysql-multilib-r1
+
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-KEYWORDS=""
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
+PATCHES=(
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+)
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
@@ -47,12 +59,12 @@ COMMON_DEPEND="
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
${COMMON_DEPEND}"
RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
+ server? ( galera? (
sys-apps/iproute2
=sys-cluster/galera-${WSREP_REVISION}*
sst-rsync? ( sys-process/lsof )
sst-xtrabackup? ( net-misc/socat[ssl] )
- )
+ ) )
perl? ( !dev-db/mytop
virtual/perl-Getopt-Long
dev-perl/TermReadKey
@@ -60,16 +72,13 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
"
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-# This is a special unpack for the VCS version
-src_unpack() {
- git-r3_src_unpack
-
- mv -f "${WORKDIR}/${P}" "${S}"
-}
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
@@ -80,8 +89,26 @@ src_configure(){
-DWITH_PCRE=system
)
local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DINSTALL_INCLUDEDIR=include/mariadb
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
)
+
+ if use test ; then
+ MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ fi
+
if use server ; then
# Federated{,X} must be treated special otherwise they will not be built as plugins
if ! use extraengine ; then
@@ -109,29 +136,33 @@ src_configure(){
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
-DPLUGIN_MROONGA=$(usex mroonga YES NO)
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ -DINSTALL_SQLBENCHDIR=share/mariadb
)
fi
mysql-multilib-r1_src_configure
}
# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl server openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-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
- multilib_is_native_abi || return
-
- # 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 server ; then
- if ! use "minimal" ; then
+ # 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 [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
@@ -148,38 +179,47 @@ multilib_src_test() {
# 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 "${S}"/mysql-test/var-tests{,/log}
+ # create directories because mysqladmin might run 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
+ # funcs_1.is_columns_mysql main.bootstrap
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
#
+ # plugins.two_password_validations
+ # Varying policies make it unsuitable for automated testing
for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
+ main.mysqld--help plugins.cracklib_password_check \
+ plugins.two_password_validations \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}" || die
# run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
@@ -198,10 +238,7 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
- # Cleanup test data after a successful run
- rm -r "${S}/mysql-test/var-tests"
else
-
einfo "Skipping server tests due to minimal build."
fi
}
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-10.2.5.ebuild
similarity index 61%
copy from dev-db/mariadb/mariadb-9999.ebuild
copy to dev-db/mariadb/mariadb-10.2.5.ebuild
index 71781c1..6137d7b 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.5.ebuild
@@ -2,24 +2,36 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="none"
-SERVER_URI=" "
-EGIT_REPO_URI="https://github.com/MariaDB/server.git"
+MY_EXTRAS_VER="20160131-0252Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="18"
+SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
-inherit toolchain-funcs mysql-multilib-r1 git-r3
+MYSLOT="${PN}/${SUBSLOT}"
+
+inherit toolchain-funcs mysql-multilib-r1
+
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-KEYWORDS=""
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
+PATCHES=(
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+)
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
@@ -47,12 +59,12 @@ COMMON_DEPEND="
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
${COMMON_DEPEND}"
RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
+ server? ( galera? (
sys-apps/iproute2
=sys-cluster/galera-${WSREP_REVISION}*
sst-rsync? ( sys-process/lsof )
sst-xtrabackup? ( net-misc/socat[ssl] )
- )
+ ) )
perl? ( !dev-db/mytop
virtual/perl-Getopt-Long
dev-perl/TermReadKey
@@ -60,16 +72,13 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
"
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-# This is a special unpack for the VCS version
-src_unpack() {
- git-r3_src_unpack
-
- mv -f "${WORKDIR}/${P}" "${S}"
-}
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mariadb/mariadb_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
@@ -80,8 +89,26 @@ src_configure(){
-DWITH_PCRE=system
)
local MYSQL_CMAKE_EXTRA_DEFINES=(
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DINSTALL_INCLUDEDIR=include/mariadb
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
)
+
+ if use test ; then
+ MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ fi
+
if use server ; then
# Federated{,X} must be treated special otherwise they will not be built as plugins
if ! use extraengine ; then
@@ -109,29 +136,33 @@ src_configure(){
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
-DPLUGIN_MROONGA=$(usex mroonga YES NO)
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ -DINSTALL_SQLBENCHDIR=share/mariadb
)
fi
mysql-multilib-r1_src_configure
}
# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl server openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-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
- multilib_is_native_abi || return
-
- # 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 server ; then
- if ! use "minimal" ; then
+ # 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 [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
@@ -148,38 +179,47 @@ multilib_src_test() {
# 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 "${S}"/mysql-test/var-tests{,/log}
+ # create directories because mysqladmin might run 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
+ # funcs_1.is_columns_mysql main.bootstrap
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
#
+ # plugins.two_password_validations
+ # Varying policies make it unsuitable for automated testing
for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
+ main.mysqld--help plugins.cracklib_password_check \
+ plugins.two_password_validations \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}" || die
# run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
@@ -198,10 +238,7 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
- # Cleanup test data after a successful run
- rm -r "${S}/mysql-test/var-tests"
else
-
einfo "Skipping server tests due to minimal build."
fi
}
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index 71781c1..ffc5fbf 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -7,7 +7,7 @@ SERVER_URI=" "
EGIT_REPO_URI="https://github.com/MariaDB/server.git"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
-SUBSLOT="18"
+SUBSLOT="19"
MYSQL_PV_MAJOR="5.6"
inherit toolchain-funcs mysql-multilib-r1 git-r3
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2017-03-02 14:30 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2017-03-02 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 39ab769f6d87723262d1f55a96ff9e1af73e67a3
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 14:21:09 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 14:21:09 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=39ab769f
dev-db/mariadb: Drop $Id$ header and x86-freebsd
dev-db/mariadb/mariadb-10.0.25.ebuild | 5 ++---
dev-db/mariadb/mariadb-10.1.12.ebuild | 5 ++---
dev-db/mariadb/mariadb-10.1.13.ebuild | 5 ++---
dev-db/mariadb/mariadb-10.1.14.ebuild | 9 +++++----
dev-db/mariadb/mariadb-5.1.67.ebuild | 5 ++---
dev-db/mariadb/mariadb-5.2.14.ebuild | 5 ++---
dev-db/mariadb/mariadb-5.3.12.ebuild | 5 ++---
dev-db/mariadb/mariadb-5.5.49.ebuild | 5 ++---
dev-db/mariadb/mariadb-9999.ebuild | 3 +--
9 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild
index 22b5004..791bdcd 100644
--- a/dev-db/mariadb/mariadb-10.0.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.25.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20151223-1501Z"
@@ -18,7 +17,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
index 198a9b2..613209b 100644
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
@@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild
index 198a9b2..613209b 100644
--- a/dev-db/mariadb/mariadb-10.1.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.13.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
@@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
index 539f3c5..7774cbb 100644
--- a/dev-db/mariadb/mariadb-10.1.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.14.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
@@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
@@ -73,7 +72,9 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
index bb24fc9..a3ef7aa 100644
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
index bb24fc9..a3ef7aa 100644
--- a/dev-db/mariadb/mariadb-5.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
index bb24fc9..a3ef7aa 100644
--- a/dev-db/mariadb/mariadb-5.3.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.49.ebuild b/dev-db/mariadb/mariadb-5.5.49.ebuild
index d3fb539..669f672 100644
--- a/dev-db/mariadb/mariadb-5.5.49.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.49.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
MY_EXTRAS_VER="20150509-1847Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
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"
+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=''
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index 6237b3d..71781c1 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="none"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-05-12 14:09 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-05-12 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 1da0661305d247f83a4a8d064531c196c26cc4b9
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 14:09:42 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu May 12 14:09:42 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1da06613
dev-db/mariadb: Bring live version up-to-date
Package-Manager: portage-2.2.28
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +
dev-db/mariadb/mariadb-9999.ebuild | 110 +++++++++++++++++++++++++++++++++----
2 files changed, 103 insertions(+), 10 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 11479a8..21c3941 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 12 May 2016; Brian Evans <grknight@gentoo.org> mariadb-9999.ebuild:
+ dev-db/mariadb: Bring live version up-to-date
+
*mariadb-10.1.14 (10 May 2016)
10 May 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.14.ebuild,
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index a0528a5..6237b3d 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -1,22 +1,69 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
MY_EXTRAS_VER="none"
SERVER_URI=" "
EGIT_REPO_URI="https://github.com/MariaDB/server.git"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
-inherit toolchain-funcs mysql-multilib git-r3
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-KEYWORDS=""
+inherit toolchain-funcs mysql-multilib-r1 git-r3
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
+KEYWORDS=""
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
# This is a special unpack for the VCS version
src_unpack() {
@@ -25,6 +72,49 @@ src_unpack() {
mv -f "${WORKDIR}/${P}" "${S}"
}
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ )
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ )
+ fi
+ mysql-multilib-r1_src_configure
+}
+
# Official test instructions:
# USE='-cluster embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-05-10 19:08 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-05-10 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 64fc43fedc59801c72fd91b7ebe73315eb65c45f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 19:08:33 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue May 10 19:08:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=64fc43fe
dev-db/mariadb: Version bump for 10.1.14
Package-Manager: portage-2.2.28
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 +
dev-db/mariadb/Manifest | 31 ++--
dev-db/mariadb/mariadb-10.1.10.ebuild | 200 ---------------------
...riadb-10.1.11.ebuild => mariadb-10.1.14.ebuild} | 22 ++-
4 files changed, 38 insertions(+), 221 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 444b5fb..11479a8 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.1.14 (10 May 2016)
+
+ 10 May 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.14.ebuild,
+ -mariadb-10.1.10.ebuild, -mariadb-10.1.11.ebuild:
+ dev-db/mariadb: Version bump for 10.1.14
+
*mariadb-10.0.25 (02 May 2016)
02 May 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.0.25.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b3d1356..ee3156d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -2,10 +2,9 @@
Hash: SHA256
DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c
-DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
-DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d
+DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a
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
@@ -17,19 +16,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJXJ54DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJXMjGtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2i8MP/06aVeYb7p2bd2ryEnKqT71/
-g8qxenMnaqgyTqtwP4dSR7+msli1dCxXyPWHtbilem57f7mtUCCE0CVX/lO1+MFW
-H4T7NVfy9PmnHSrACzKTddKdND/wp5GNejt+TnCeDqW2gT6uVt8qIBNc4ShjVAOK
-Sq43LZCkJlprHFdzkYO93JuoFyX6RlDqQFI88cFyBQD2JHY+wxh46V0DYduC2Xex
-4Z94wrLEBMUSqeNnF6rH+pRuAgag08Hl8550n0EFegQyS4TAIJfDvNvpB/2XmJf/
-Kshuwyle/QFpY/fEaCM4BxQ97KomeaUxmbe03MesBsenGF5wP8/vvzHy6umsujo3
-QqCGft9nhHZM9SIGuSzcgcQkjqWs/vzYD8jtESu0iEGd+2xQQFy32CKXT4SHVXL6
-zrK0bD6mW1zwUWkfhTgcKfHW5oYXaCkLbg/sJg+9b96Yjby1eGN/rhnNa512J4C+
-JyUvAjCluoIz9cVh+ezGPilyd8OYqGVAqvZ7HPtuFL2qnDKz7jbSBAatf/bMM8ca
-hmiJVK1c21qppbatU29KXLy69xVcA2l0y/cPVwSbtKUMTmVvzlyhtzJsklP3cPhx
-BXdZsWxD24veS1z3mYt8XjpM2i1u+dYCGL7wA/C7txiJs4LUkfHPWxAl0VbqyCYE
-xLf8S9tfuOptLYm8I6Wk
-=gCrt
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2+NsQANNqPpae6Ep3HHUP3GEa+oq/
+d+yfxrp+zYtbWjZJ+4Apcg+6TcrwU9AfKnIhxavHg6e194hg5HOHJgcPA126dU5V
+Xu2QHMFmozezhsQsFvZYq/5z9xfOQ6RW/WYzRsWjnULXEdcUS9EaoyhUQfcG+++W
+wpzzxg7sS0MG9LsrPhVN8nmv/mtRraQ1jbdgu7CLSN1RmN/A1HC+rtcgELEAKgJb
+ZBbeU5mKqhJ9IaEf6Xk/RGEanaPeaxqD6ik0lkkeTg/HOX1aN3frG/H56UgQ9776
+lRRaXfcIVGeyEaFYsQvFEPG/tKyLn3RanAAVvqvcboBi6CV/AsERnOBK8Ao+vdzN
+KJhvdpojJFIArNobSNlSyPMOUXlpANXlpMRrjVhOODPBGTJbZBZA+XLJk1a4dswF
+7lQycmeMTuQDdyYM7qetAsqxN6RzC5Z+adeMt7mjNJ5AoG4r72I+H6DU63ljg4wl
+U+lInSMZlkEil+8c8/F+4MUNALmpMB6mpbEqy2oJJbRRTFy1A7e/Mtb4tRRqjM7X
+8e73rGLMfcct0kwHDrF/KHYcRkSFQVIDDExIPmv+j0TCphCUfTzxWrHniNiOuec7
+LeTQjoONp7aFiWZMIRbOEmD2hsn/tMR+72EwJUiRHcDFFYDj8fOaaRFeCLAAtkjw
+Nd23VeNHkbgjzKVQm85g
+=AgjA
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild
deleted file mode 100644
index 1390a68..0000000
--- a/dev-db/mariadb/mariadb-10.1.10.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20151223-1501Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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=''
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- systemd? ( sys-apps/systemd:= )
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- -DPLUGIN_MROONGA=$(usex mroonga YES NO)
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.1.11.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
similarity index 92%
rename from dev-db/mariadb/mariadb-10.1.11.ebuild
rename to dev-db/mariadb/mariadb-10.1.14.ebuild
index b71db06..539f3c5 100644
--- a/dev-db/mariadb/mariadb-10.1.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.14.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
@@ -22,14 +22,24 @@ REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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=''
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
+)
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5 )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:= )
- !bindist? ( >=sys-libs/readline-4.1:0= )
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
server? (
cracklib? ( sys-libs/cracklib:0= )
extraengine? (
@@ -72,6 +82,8 @@ src_configure(){
local MYSQL_CMAKE_NATIVE_DEFINES=(
-DWITH_JEMALLOC=$(usex jemalloc system)
-DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
)
if use server ; then
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-05-02 18:36 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-05-02 18:36 UTC (permalink / raw
To: gentoo-commits
commit: eed1436473f24f4cf2b30a345a3c0fe4b11e017c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 18:35:51 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon May 2 18:35:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=eed14364
dev-db/mariadb: Version bump for 10.0.25
Package-Manager: portage-2.2.28
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 +++++
dev-db/mariadb/Manifest | 30 +++++++++++-----------
...riadb-10.0.24.ebuild => mariadb-10.0.25.ebuild} | 17 +++++++-----
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 9027728..444b5fb 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.0.25 (02 May 2016)
+
+ 02 May 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.0.25.ebuild,
+ -mariadb-10.0.24.ebuild:
+ dev-db/mariadb: Version bump for 10.0.25
+
*mariadb-5.5.49 (22 Apr 2016)
22 Apr 2016; Brian Evans <grknight@gentoo.org> +mariadb-5.5.49.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0ef0590..b3d1356 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
+DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
@@ -17,19 +17,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJXGlm/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJXJ54DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2yd8P/0Fn0x2JKmP7CZlppQ67mqc7
-X+f/XWEdLebN9Iifs/C1NHMkKxzDg2pjsn8B+Uq3ITs4lv2hQ9htNSlNKlogLIUt
-B8bc54MUHM6wRm0HTF3AzklECE6aGFGqm++LXgOs0Ohn30gFDKCR9l6BSiGekKCw
-obiAW4FRi9HADqgSoMvgc/OTIMnbgkEbn+ZybH6OOYVOaYSqT00GEz8PvYBbS9vI
-ZYssxD2ilFwgn9/48F2hKF+Un510JW8fn85vgIXj/46BFcJs3gTLglka8bCb/t/q
-Vog5kevjWAs6429G1/q3zki+jIaxDh/H66yRwxBQKJPLNvU8PVTDs2SD29auguKI
-lKVXPAFRmL0WER78Pyj19j5bdoMLKHIOyU2XPYVPEFUV56b1F6h3nO6veSoJGdR0
-0ewO6nf58t2lFnf5lNRHsf4qpDHtvox3B7d6/J5u828KNf/fan/rhCP8ZRaTQcCG
-Qst2BrPStjec1R3nBxpu0MzTBWXwBZJp5j3FcKTuBOktyCsk413KAVELvpg9nJ+n
-onai45GzEgp5L0XmtLpV+eIV45mNzc8cBdSuari+5z4LLtEkpee+zeKwQQcSNgnr
-1o/VJvEk5ZRuglepR2q2GOSfoNvdl+55rT/sSFALyqNXilnDEd1DR8OCu4a92pAp
-wKCkUb5dOum97BQszjCi
-=1upL
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2i8MP/06aVeYb7p2bd2ryEnKqT71/
+g8qxenMnaqgyTqtwP4dSR7+msli1dCxXyPWHtbilem57f7mtUCCE0CVX/lO1+MFW
+H4T7NVfy9PmnHSrACzKTddKdND/wp5GNejt+TnCeDqW2gT6uVt8qIBNc4ShjVAOK
+Sq43LZCkJlprHFdzkYO93JuoFyX6RlDqQFI88cFyBQD2JHY+wxh46V0DYduC2Xex
+4Z94wrLEBMUSqeNnF6rH+pRuAgag08Hl8550n0EFegQyS4TAIJfDvNvpB/2XmJf/
+Kshuwyle/QFpY/fEaCM4BxQ97KomeaUxmbe03MesBsenGF5wP8/vvzHy6umsujo3
+QqCGft9nhHZM9SIGuSzcgcQkjqWs/vzYD8jtESu0iEGd+2xQQFy32CKXT4SHVXL6
+zrK0bD6mW1zwUWkfhTgcKfHW5oYXaCkLbg/sJg+9b96Yjby1eGN/rhnNa512J4C+
+JyUvAjCluoIz9cVh+ezGPilyd8OYqGVAqvZ7HPtuFL2qnDKz7jbSBAatf/bMM8ca
+hmiJVK1c21qppbatU29KXLy69xVcA2l0y/cPVwSbtKUMTmVvzlyhtzJsklP3cPhx
+BXdZsWxD24veS1z3mYt8XjpM2i1u+dYCGL7wA/C7txiJs4LUkfHPWxAl0VbqyCYE
+xLf8S9tfuOptLYm8I6Wk
+=gCrt
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.24.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild
similarity index 92%
rename from dev-db/mariadb/mariadb-10.0.24.ebuild
rename to dev-db/mariadb/mariadb-10.0.25.ebuild
index 7ee3980..22b5004 100644
--- a/dev-db/mariadb/mariadb-10.0.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.25.ebuild
@@ -2,10 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI="6"
MY_EXTRAS_VER="20151223-1501Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
SUBSLOT="18"
MYSQL_PV_MAJOR="5.6"
@@ -17,14 +15,19 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="bindist odbc oqgraph pam sphinx tokudb xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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=''
-
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+PATCHES=(
+ "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+ "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch"
+ "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.15.patch"
+ "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+ "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
+)
COMMON_DEPEND="
!bindist? ( >=sys-libs/readline-4.1:0= )
server? (
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-03-30 4:24 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-03-30 4:24 UTC (permalink / raw
To: gentoo-commits
commit: 4069266cb51fea8336ca7b6bdcc5247798f12571
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 04:24:32 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 04:24:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4069266c
dev-db/mariadb: Version bump to 10.1.13
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 25 ++--
dev-db/mariadb/mariadb-10.1.13.ebuild | 213 ++++++++++++++++++++++++++++++++++
3 files changed, 234 insertions(+), 9 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 2d51626..483ef82 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.1.13 (30 Mar 2016)
+
+ 30 Mar 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.13.ebuild:
+ dev-db/mariadb: Version bump to 10.1.13
+
07 Mar 2016; Brian Evans <grknight@gentoo.org> mariadb-10.1.12.ebuild:
dev-db/mariadb: Copy multilib kerberos fixes from portage tree
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index a37c638..3109191 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,6 +5,7 @@ DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38f
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
+DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d
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
@@ -16,13 +17,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQF8BAEBCABmBQJW0RfUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d9/wH/1eKMOkl1uXzmxIM4cno3Dlk
-jlBzF3Y5nTcEdGDNdJzqg9mxBo9nyKIk3u2MYSA15f3ZPUGRkZP9c1b46IQaKUWm
-zwByawY1zbMFWJoPM0CWzvBu524EEhgIPm5qA3IApuN/wj+YkSd8A2Kh9BxM4boI
-i3TbCogpxS6QHRIcaA9eyxyFYYm0g1ZG2gBSgT5qyOfTaADGlu6xG69yPswvXXPE
-8zDlvCgf+8oiSIRQL32ppBg/ebFbcSfFU1wI5y65fK/TIKWsHG8zczRPIDjuQqFT
-TVMYAENVjw1Z2ZXdxJUutg5O08xDsEAaV89GmdSzdcDudb0latHp+xWrnVq9bII=
-=kz8S
+iQJ8BAEBCABmBQJW+1UAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2+RYP/153AnR7BoN/WfvbShRwnP6B
+WjUGVDpkzaVoAg2zczGTufc6y2bsnwS3bXLU3g+ag2QsOjh9Op+58wMo9x5J3rtj
+1TncEAE0CFFGrZRNFmdrX80qsjl+9ujnU/7CeIWpdjnJx9ZNSyOf0isiLthZPYXD
+ijC8hdxxQyhXPvmCwNGzdvxgmHMq95I50nxDvrb6ijaoNnJ58h9miay9Z9dTaug5
+dCpcMI2w/KjUh7HNBgXxAUpbBG54HEq5aILiKZfbDF5IUOnz6aOEPKBqsCxaF1l0
+5FYWpd9HaonkP54IE9SMbpJlbWGNzSnZMSZZfjtkLFgfvYk164j8IO8LseYq78zl
+QGM2z/ZhmTEGjnGiJ85qLrEaAUZ7kWcJmFP0OU96GUFii3x0JMT1f3wXuAAZGqcV
+JynXuuIKPKlGx/68CI/LVZrnefF53FQ+6A7d6GY84tOewhmRlaa/o0456hmt4X7N
+E+sZSErHARolgdhzTmEaCfb7OzTZBBUcWfnf2gVvLZG3x65pcFs1Cn4NRoaTsm4A
+airGS/e+1FArTRrUwA3jAOLNC5zPjgQV3knzDAfhtpndqi8X+1gsNEPrcstVT7q0
+wnnHHilF845GFmPlzLCU6yEBbW7SLYdGt1qCKOQP9AKafngkPFxxBSY0owkqqQBW
+y3nUXykFmgfhKpqS2ihk
+=LNym
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild
new file mode 100644
index 0000000..198a9b2
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.13.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+MY_EXTRAS_VER="20160131-0252Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
+)
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+ !bindist? ( >=sys-libs/readline-4.1:0= )
+ server? (
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ )
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ )
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-03-09 20:22 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-03-09 20:22 UTC (permalink / raw
To: gentoo-commits
commit: dbbf77d2d983012bffbe8ae5d542a5fbe9f6b114
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 18:25:19 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 18:25:19 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=dbbf77d2
dev-db/mariadb: Copy multilib kerberos fixes from portage tree
Package-Manager: portage-2.2.27
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-10.1.12.ebuild | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index f76ec81..2d51626 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 07 Mar 2016; Brian Evans <grknight@gentoo.org> mariadb-10.1.12.ebuild:
+ dev-db/mariadb: Copy multilib kerberos fixes from portage tree
+
*mariadb-10.1.12 (27 Feb 2016)
27 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.12.ebuild:
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
index d911253..198a9b2 100644
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
@@ -34,7 +34,7 @@ PATCHES=(
COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
- kerberos? ( virtual/krb5 )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd:= )
!bindist? ( >=sys-libs/readline-4.1:0= )
server? (
@@ -79,6 +79,8 @@ src_configure(){
local MYSQL_CMAKE_NATIVE_DEFINES=(
-DWITH_JEMALLOC=$(usex jemalloc system)
-DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
)
if use server ; then
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-02-27 3:28 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-02-27 3:28 UTC (permalink / raw
To: gentoo-commits
commit: d86aa2d3812795731168fdbe4a17341af44cc0f3
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 03:28:20 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 03:28:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=d86aa2d3
dev-db/mariadb: Version bump 10.1.12; first to use new EAPI6
Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 27 ++---
dev-db/mariadb/mariadb-10.1.12.ebuild | 211 ++++++++++++++++++++++++++++++++++
3 files changed, 227 insertions(+), 16 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 002c959..f76ec81 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.1.12 (27 Feb 2016)
+
+ 27 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.12.ebuild:
+ dev-db/mariadb: Version bump 10.1.12; first to use new EAPI6
+
*mariadb-10.0.24 (19 Feb 2016)
19 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.0.24.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0baf41d..a37c638 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
+DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
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
@@ -13,21 +14,15 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
-iQJ8BAEBCABmBQJWx48cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RvoP/2r6LoBvP6Ezpw5q5VM2kjXO
-KgaDXPRiBK1niwSAF9+mEIcHao+0z6y1wKInYqp+h7vgOgdpc5DBHIjI9VZH1XDP
-7WoTa+iaH0WXFGpzwhdLJmt9bXj7AeQNoy4nMf5FppiEoKnlsSG4kGR6AsLJdrb5
-wzZiIgr85d6SYv15G/XqK8e8+wBbOorR23wYIOy306HrHR/v1F8Eg6urbQ9x7MFu
-fpYedQCdXQvSMrb9BxUk47Ns6XEVoxpASwUzFMoOaeFHxbxrUeyAeGc6Iy90Y7wp
-HztTsn2+WYRJz1hHHvRWSo3M0yQVOAlUwuJIdNS3FT7T/nQ7chPqxm2K1fluVLFg
-lPTzZJ5q3Z60iLURReYpM+2YIdPWLzmVrjTGoJeuqITtIfAUwLFMVx3fIsRtn/7l
-ADFN9177ZEOswz6+YzedSsWNqWtzP+zxFgEK9RF/tGyAxmNDKRtH/29eXQ0crqtd
-y5Rp1Kaqjs5C5oXCq51hrrIZ72Ana85qzhz8vuCC9q7lHId1E420AP+AVjOA7le5
-aLqG4RiQyTxO+KZG3zoNoK6Pv8EL6ZE8DEh0y23wGGKRqhL6lJ/P6Fmt+vfoHa9L
-q3OeCZbcVG4g9wAyiLr58TweLVxQDK7kNJ+Mrd74hkqOk6HbmvhxI1ZkUIt9Qqhs
-sl716n0CU4rvKHYO9UoT
-=r/dt
+iQF8BAEBCABmBQJW0RfUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
+RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d9/wH/1eKMOkl1uXzmxIM4cno3Dlk
+jlBzF3Y5nTcEdGDNdJzqg9mxBo9nyKIk3u2MYSA15f3ZPUGRkZP9c1b46IQaKUWm
+zwByawY1zbMFWJoPM0CWzvBu524EEhgIPm5qA3IApuN/wj+YkSd8A2Kh9BxM4boI
+i3TbCogpxS6QHRIcaA9eyxyFYYm0g1ZG2gBSgT5qyOfTaADGlu6xG69yPswvXXPE
+8zDlvCgf+8oiSIRQL32ppBg/ebFbcSfFU1wI5y65fK/TIKWsHG8zczRPIDjuQqFT
+TVMYAENVjw1Z2ZXdxJUutg5O08xDsEAaV89GmdSzdcDudb0latHp+xWrnVq9bII=
+=kz8S
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
new file mode 100644
index 0000000..d911253
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+MY_EXTRAS_VER="20160131-0252Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+ "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
+)
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ kerberos? ( virtual/krb5 )
+ systemd? ( sys-apps/systemd:= )
+ !bindist? ( >=sys-libs/readline-4.1:0= )
+ server? (
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ )
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ )
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-02-19 21:54 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-02-19 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 2ec19257e8de43e65d68ea29a6bac4bd5fa8176f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 21:54:40 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 21:54:40 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=2ec19257
dev-db/mariadb: Version bump for 10.0.24
Package-Manager: portage-2.2.27
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 +++++
dev-db/mariadb/Manifest | 28 +++++++++++++---------
...riadb-10.0.23.ebuild => mariadb-10.0.24.ebuild} | 4 ++--
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 377a382..002c959 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.0.24 (19 Feb 2016)
+
+ 19 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.0.24.ebuild,
+ -mariadb-10.0.23.ebuild:
+ dev-db/mariadb: Version bump for 10.0.24
+
12 Feb 2016; Brian Evans <grknight@gentoo.org> -mariadb-5.5.47.ebuild:
dev-db/mariadb: Drop old
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c8e36eb..0baf41d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
+DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
@@ -13,15 +13,21 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
-iQF8BAEBCABmBQJWvVG+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44dRSIH/1sGUVvTm14e6L07Vk9jCIT0
-SUSV9lP1GNJ2lvHWyc4Mpw5KjTRKb08N1wdm0ee942QfgXwkL65Ajw4NFbEB7p5n
-reVusZoIWImrL/l8g8KnBevx6hReBb98tF47Q0B8aFLAS40e2xbMznDsPyhp9huM
-euuPMR9tOyP9ho/966+lED0E00/5NBIELVEtPVuHftx9u50nCw6UhB/sw9afiCCD
-gJ0PtaKZo8IuTdqNuIE1R4IHP4MS9EE8a1PSSJgZ8WsJ9YILViu825XWpw3R1u+w
-nQfmNO9hazjvm3PrWUKZsHzA6b9FRJFMoMLPimMn7+mK5w7xcPHXnceJXpvoQR0=
-=wR4n
+iQJ8BAEBCABmBQJWx48cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RvoP/2r6LoBvP6Ezpw5q5VM2kjXO
+KgaDXPRiBK1niwSAF9+mEIcHao+0z6y1wKInYqp+h7vgOgdpc5DBHIjI9VZH1XDP
+7WoTa+iaH0WXFGpzwhdLJmt9bXj7AeQNoy4nMf5FppiEoKnlsSG4kGR6AsLJdrb5
+wzZiIgr85d6SYv15G/XqK8e8+wBbOorR23wYIOy306HrHR/v1F8Eg6urbQ9x7MFu
+fpYedQCdXQvSMrb9BxUk47Ns6XEVoxpASwUzFMoOaeFHxbxrUeyAeGc6Iy90Y7wp
+HztTsn2+WYRJz1hHHvRWSo3M0yQVOAlUwuJIdNS3FT7T/nQ7chPqxm2K1fluVLFg
+lPTzZJ5q3Z60iLURReYpM+2YIdPWLzmVrjTGoJeuqITtIfAUwLFMVx3fIsRtn/7l
+ADFN9177ZEOswz6+YzedSsWNqWtzP+zxFgEK9RF/tGyAxmNDKRtH/29eXQ0crqtd
+y5Rp1Kaqjs5C5oXCq51hrrIZ72Ana85qzhz8vuCC9q7lHId1E420AP+AVjOA7le5
+aLqG4RiQyTxO+KZG3zoNoK6Pv8EL6ZE8DEh0y23wGGKRqhL6lJ/P6Fmt+vfoHa9L
+q3OeCZbcVG4g9wAyiLr58TweLVxQDK7kNJ+Mrd74hkqOk6HbmvhxI1ZkUIt9Qqhs
+sl716n0CU4rvKHYO9UoT
+=r/dt
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.23.ebuild b/dev-db/mariadb/mariadb-10.0.24.ebuild
similarity index 98%
rename from dev-db/mariadb/mariadb-10.0.23.ebuild
rename to dev-db/mariadb/mariadb-10.0.24.ebuild
index b369838..7ee3980 100644
--- a/dev-db/mariadb/mariadb-10.0.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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='20004_all_mariadb-filter-tokudb-flags-10.0.7.patch'
+EPATCH_EXCLUDE=''
COMMON_DEPEND="
!bindist? ( >=sys-libs/readline-4.1:0= )
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-02-12 3:30 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-02-12 3:30 UTC (permalink / raw
To: gentoo-commits
commit: 8743185bd66a3bfd1402ca59ee5e8ca7a70a2671
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 03:28:26 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 03:28:26 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=8743185b
dev-db/mariadb: Version bump for 5.5.48
Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 17 ++---
dev-db/mariadb/mariadb-5.5.48.ebuild | 123 +++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+), 8 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 511a475..0c2b2fb 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-5.5.48 (12 Feb 2016)
+
+ 12 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-5.5.48.ebuild:
+ dev-db/mariadb: Version bump for 5.5.48
+
31 Jan 2016; Brian Evans <grknight@gentoo.org> mariadb-10.1.11.ebuild:
dev-db/mariadb: Bump patch version to fix kerberos plugin MDEV-9494
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7d94050..d239440 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,6 +8,7 @@ DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645a
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.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
+DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
@@ -15,13 +16,13 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQF8BAEBCABmBQJWrX8BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJWvVFaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44dV4UH/2yt+TdgIznOUDZrWxk3BTx3
-5WnRK1+gHYyGjZRzW0XJE9v4c9XzxktHMZil05xPd897KD5GVs48vNtx5vVkyJed
-HOf1uuEOYOU7Nb5w9V9+bY8KrNJD9Tq4MbHsVipIHCMxM1xC+GUS0LOx901odW7y
-3dyu2k46surXK+0pM4htcJapdnAdgg7jpffHqMX67zVRDmPtEIxaruVABX12I7pz
-1LMwkPGBpWLHIGQCNbevUGrSWCnEgBNB/Jkvm32lp/BDlJ3yz7ZUBpwxorO65cfJ
-lpBmZ5hQ3iP6v70YJmyQEpORV716K6eK9ee+mt/ZlQgd9H7zDaiXRYk5tQKJoMY=
-=8BLC
+RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d/LMH/1yzgXUv5Wed2yQKaRcrlOG+
+Px5AvwznFvAXWu0Rx41ltM8XdBD1dRF4bZdjEtoWSBTfNb2GtDdhgC8NqUBACWv7
+h7fHGwd0E+OAt7HsRlV17BYHJLb6bIMTCj7o/gvSCQ3cZSma1PVkAxaqpLhvKTgH
+XsUARhNUk0jNDf4B5UCEXdAVZS2ROKa1GKPzO5mFcwvyD4oyQ7iNEXMDk7ZY+ThP
+e/FaLmiZfpJqnQD2nl+hMtDRvfC0rW73IaCPkWmxBEGJ9BTg6eYtJpecLU73U64X
+Kosi12MeFURwgFWZUj+Zh9Skz4hDVIfbby+Dy6Bqv4KU2BSs4hoXBqlIVzR/ip8=
+=KkUu
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.48.ebuild b/dev-db/mariadb/mariadb-5.5.48.ebuild
new file mode 100644
index 0000000..d3fb539
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.48.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20150509-1847Z"
+
+# 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='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.
+ #
+ # archive.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.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-02-12 3:30 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-02-12 3:30 UTC (permalink / raw
To: gentoo-commits
commit: 086fc16b53f8ebef0e10f2cfda43d46c68fa718c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 03:30:06 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 03:30:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=086fc16b
dev-db/mariadb: Drop old
Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +
dev-db/mariadb/Manifest | 17 +++--
dev-db/mariadb/mariadb-5.5.47.ebuild | 123 -----------------------------------
3 files changed, 11 insertions(+), 132 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 0c2b2fb..377a382 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 12 Feb 2016; Brian Evans <grknight@gentoo.org> -mariadb-5.5.47.ebuild:
+ dev-db/mariadb: Drop old
+
*mariadb-5.5.48 (12 Feb 2016)
12 Feb 2016; Brian Evans <grknight@gentoo.org> +mariadb-5.5.48.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d239440..c8e36eb 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,7 +7,6 @@ DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c2
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.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
@@ -16,13 +15,13 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQF8BAEBCABmBQJWvVFaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJWvVG+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d/LMH/1yzgXUv5Wed2yQKaRcrlOG+
-Px5AvwznFvAXWu0Rx41ltM8XdBD1dRF4bZdjEtoWSBTfNb2GtDdhgC8NqUBACWv7
-h7fHGwd0E+OAt7HsRlV17BYHJLb6bIMTCj7o/gvSCQ3cZSma1PVkAxaqpLhvKTgH
-XsUARhNUk0jNDf4B5UCEXdAVZS2ROKa1GKPzO5mFcwvyD4oyQ7iNEXMDk7ZY+ThP
-e/FaLmiZfpJqnQD2nl+hMtDRvfC0rW73IaCPkWmxBEGJ9BTg6eYtJpecLU73U64X
-Kosi12MeFURwgFWZUj+Zh9Skz4hDVIfbby+Dy6Bqv4KU2BSs4hoXBqlIVzR/ip8=
-=KkUu
+RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44dRSIH/1sGUVvTm14e6L07Vk9jCIT0
+SUSV9lP1GNJ2lvHWyc4Mpw5KjTRKb08N1wdm0ee942QfgXwkL65Ajw4NFbEB7p5n
+reVusZoIWImrL/l8g8KnBevx6hReBb98tF47Q0B8aFLAS40e2xbMznDsPyhp9huM
+euuPMR9tOyP9ho/966+lED0E00/5NBIELVEtPVuHftx9u50nCw6UhB/sw9afiCCD
+gJ0PtaKZo8IuTdqNuIE1R4IHP4MS9EE8a1PSSJgZ8WsJ9YILViu825XWpw3R1u+w
+nQfmNO9hazjvm3PrWUKZsHzA6b9FRJFMoMLPimMn7+mK5w7xcPHXnceJXpvoQR0=
+=wR4n
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.47.ebuild b/dev-db/mariadb/mariadb-5.5.47.ebuild
deleted file mode 100644
index 0700185..0000000
--- a/dev-db/mariadb/mariadb-5.5.47.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150509-1847Z"
-
-# 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='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.
- #
- # archive.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.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help \
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-01-31 3:27 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-01-31 3:27 UTC (permalink / raw
To: gentoo-commits
commit: 2274c5e71aa6956c4ad3aa6e26399b83ff14f081
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 03:26:57 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 03:26:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=2274c5e7
dev-db/mariadb: Bump patch version to fix kerberos plugin MDEV-9494
Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/Manifest | 17 +++++++++++++++++
dev-db/mariadb/mariadb-10.1.11.ebuild | 7 ++-----
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 8bd89d6..511a475 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 31 Jan 2016; Brian Evans <grknight@gentoo.org> mariadb-10.1.11.ebuild:
+ dev-db/mariadb: Bump patch version to fix kerberos plugin MDEV-9494
+
*mariadb-10.1.11 (29 Jan 2016)
29 Jan 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.11.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1986fc8..7d94050 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
@@ -8,3 +11,17 @@ DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba24999
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
+DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQF8BAEBCABmBQJWrX8BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
+RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44dV4UH/2yt+TdgIznOUDZrWxk3BTx3
+5WnRK1+gHYyGjZRzW0XJE9v4c9XzxktHMZil05xPd897KD5GVs48vNtx5vVkyJed
+HOf1uuEOYOU7Nb5w9V9+bY8KrNJD9Tq4MbHsVipIHCMxM1xC+GUS0LOx901odW7y
+3dyu2k46surXK+0pM4htcJapdnAdgg7jpffHqMX67zVRDmPtEIxaruVABX12I7pz
+1LMwkPGBpWLHIGQCNbevUGrSWCnEgBNB/Jkvm32lp/BDlJ3yz7ZUBpwxorO65cfJ
+lpBmZ5hQ3iP6v70YJmyQEpORV716K6eK9ee+mt/ZlQgd9H7zDaiXRYk5tQKJoMY=
+=8BLC
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.11.ebuild b/dev-db/mariadb/mariadb-10.1.11.ebuild
index 98f08c6..b71db06 100644
--- a/dev-db/mariadb/mariadb-10.1.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.11.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-MY_EXTRAS_VER="20151223-1501Z"
+MY_EXTRAS_VER="20160131-0252Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
SUBSLOT="18"
@@ -14,7 +14,6 @@ inherit toolchain-funcs mysql-multilib-r1
HOMEPAGE="http://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-# Now includes a kerberos plugin but the server pieces doesn't build MDEV-9494
IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
@@ -101,10 +100,8 @@ src_configure(){
-DWITH_INNODB_LZO=$(usex innodb-lzo)
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
-DPLUGIN_MROONGA=$(usex mroonga YES NO)
- -DPLUGIN_AUTH_GSSAPI=NO
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
)
-# Disable until upstream fixes it
-# -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
fi
mysql-multilib-r1_src_configure
}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2016-01-29 22:01 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2016-01-29 22:01 UTC (permalink / raw
To: gentoo-commits
commit: cf7af8df9924b43d65365c19625e7dfdf57d8a80
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 22:00:56 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 22:00:56 2016 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cf7af8df
dev-db/mariadb: Version bump; needs testing before moving to main tree
Package-Manager: portage-2.2.27
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 7 +-
dev-db/mariadb/Manifest | 23 +---
dev-db/mariadb/mariadb-10.1.11.ebuild | 207 ++++++++++++++++++++++++++++++++++
3 files changed, 214 insertions(+), 23 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 3e2a423..8bd89d6 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.1.11 (29 Jan 2016)
+
+ 29 Jan 2016; Brian Evans <grknight@gentoo.org> +mariadb-10.1.11.ebuild:
+ dev-db/mariadb: Version bump; needs testing before moving to main tree
+
29 Dec 2015; Brian Evans <grknight@gentoo.org> mariadb-10.0.23.ebuild,
mariadb-10.1.10.ebuild:
dev-db/mariadb: Add missing build dependency wrt bug 570114 app-arch/snappy
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5a25000..1986fc8 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
+DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
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
@@ -10,22 +8,3 @@ DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba24999
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJWgcrqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2/toP/3Mf3xrpYsehjI+TrunfEDZ4
-WxnIF5w5avbSfPIKcT4SanuPSdGekkwDJP4ZlNX3ayAHVHpLIPX/sCVVquhtz3ac
-rHFI9yboGNAAcIp1uBUwyiDdKc66U1I2YZMxQqWazps+x01c+6F1JXT+oLWJxHfe
-HsgQOSjCXN0kRk+Zy7FTg89zErYa+XsuqFG/H9lL86kkSVy5R2Q5co+0PlQ4CcOu
-T7XA8H1McsohCdHYygMwZNEJF9BWy9DBoMsSNlmHHncrKZNxEQAJsDfTrtuy1MWw
-C/OgDWgdG1OXsuUPmN6924Wpo1utwc08ctndFNV6JLO6WZPiXaJ6xUfKDR5qJ2sF
-aDkAS5TrMWlYFr0RjcF9tgI38oNU5+g5CP6V+oNmAHD94yTL+P0CMx7+MztSBbSQ
-Les8TX+WUw+dw1pswDhcpCDeP3L60/GJaXihEv1Yvn5gF3T+tShqJnaVrBnETeVs
-yjS8mw1ncanu7nKN60CKteVHr0J5YxHVelATjEwIJTtzvrTLrruWCKNyWYKTtrhS
-34hWg9DR/GyUUnCOtfZDPxnZa8aUEI5J5d9daVjebuP1DE2XD0aL2ruMcUczteLh
-WiKNiDhEtoq+i0RPtsAdOIjDNZJCZ2HS0Dbrg97gEVmQgPdWPHTS3BtApS+0aT9z
-nO6VuqxzC9g2qjVzCVj7
-=n2dR
------END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.11.ebuild b/dev-db/mariadb/mariadb-10.1.11.ebuild
new file mode 100644
index 0000000..98f08c6
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.11.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151223-1501Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+# Now includes a kerberos plugin but the server pieces doesn't build MDEV-9494
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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=''
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ kerberos? ( virtual/krb5 )
+ systemd? ( sys-apps/systemd:= )
+ !bindist? ( >=sys-libs/readline-4.1:0= )
+ server? (
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+ )
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO)
+ -DPLUGIN_AUTH_GSSAPI=NO
+ )
+# Disable until upstream fixes it
+# -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-12-29 15:42 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-12-29 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 3c0ecf007bb807237d8b8a49b209f3655d22096d
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 15:42:01 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 15:42:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3c0ecf00
dev-db/mariadb: Add missing build dependency wrt bug 570114
app-arch/snappy is needed for TokuDB
Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +++++
dev-db/mariadb/mariadb-10.0.23.ebuild | 1 +
dev-db/mariadb/mariadb-10.1.10.ebuild | 1 +
3 files changed, 7 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 33c0828..3e2a423 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 29 Dec 2015; Brian Evans <grknight@gentoo.org> mariadb-10.0.23.ebuild,
+ mariadb-10.1.10.ebuild:
+ dev-db/mariadb: Add missing build dependency wrt bug 570114 app-arch/snappy
+ is needed for TokuDB
+
29 Dec 2015; Brian Evans <grknight@gentoo.org> mariadb-10.1.10.ebuild:
dev-db/mariadb: Fix Mroonga Engine cmake option
diff --git a/dev-db/mariadb/mariadb-10.0.23.ebuild b/dev-db/mariadb/mariadb-10.0.23.ebuild
index 5bcbfd2..b369838 100644
--- a/dev-db/mariadb/mariadb-10.0.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.23.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
)
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=
"
diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild
index 578c46a..1390a68 100644
--- a/dev-db/mariadb/mariadb-10.1.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.10.ebuild
@@ -40,6 +40,7 @@ COMMON_DEPEND="
innodb-snappy? ( app-arch/snappy )
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( virtual/pam:0= )
+ tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=
"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-12-29 0:36 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-12-29 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 76550cd5e5a279d7b5cbe2cf65d168c9160542af
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 00:36:11 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 00:36:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=76550cd5
dev-db/mariadb: Fix Mroonga Engine cmake option
Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-10.1.10.ebuild | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 90434e2..33c0828 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 29 Dec 2015; Brian Evans <grknight@gentoo.org> mariadb-10.1.10.ebuild:
+ dev-db/mariadb: Fix Mroonga Engine cmake option
+
28 Dec 2015; Brian Evans <grknight@gentoo.org> -mariadb-10.0.19.ebuild,
-mariadb-10.0.22-r1.ebuild, -mariadb-10.0.22.ebuild, -mariadb-10.1.8.ebuild,
-mariadb-10.1.9-r1.ebuild, -mariadb-10.1.9.ebuild, metadata.xml:
diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild
index dad8418..578c46a 100644
--- a/dev-db/mariadb/mariadb-10.1.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.10.ebuild
@@ -95,9 +95,8 @@ src_configure(){
-DWITH_INNODB_LZ4=$(usex innodb-lz4)
-DWITH_INNODB_LZO=$(usex innodb-lzo)
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO)
)
-
- use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 )
fi
mysql-multilib-r1_src_configure
}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-12-28 23:51 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-12-28 23:51 UTC (permalink / raw
To: gentoo-commits
commit: bd2f350acf03b6ba4c87879d3bcea01ee817faac
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 23:51:06 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 23:51:06 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=bd2f350a
dev-db/mariadb: Drop old
Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 36 +++---
dev-db/mariadb/mariadb-10.0.19.ebuild | 115 ------------------
dev-db/mariadb/mariadb-10.0.22-r1.ebuild | 127 --------------------
dev-db/mariadb/mariadb-10.0.22.ebuild | 123 -------------------
dev-db/mariadb/mariadb-10.1.8.ebuild | 128 --------------------
dev-db/mariadb/mariadb-10.1.9-r1.ebuild | 200 -------------------------------
dev-db/mariadb/mariadb-10.1.9.ebuild | 128 --------------------
dev-db/mariadb/metadata.xml | 11 +-
9 files changed, 21 insertions(+), 852 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index cbb99ba..90434e2 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 28 Dec 2015; Brian Evans <grknight@gentoo.org> -mariadb-10.0.19.ebuild,
+ -mariadb-10.0.22-r1.ebuild, -mariadb-10.0.22.ebuild, -mariadb-10.1.8.ebuild,
+ -mariadb-10.1.9-r1.ebuild, -mariadb-10.1.9.ebuild, metadata.xml:
+ dev-db/mariadb: Drop old
+
*mariadb-10.1.10 (28 Dec 2015)
28 Dec 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.1.10.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 44ce222..5a25000 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,39 +1,31 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
-DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
-DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
-DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
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.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
-DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
-DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJWgcnzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWgcrqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2WYoP/ReopVJYCAJ4wZcesCz3hasZ
-TseFoWQrBIGLrHWON1lK1NOsG2tzTDG1e6cLuymNRnSCTkEahs77yvLFYpN/OErx
-59QDAxO3Hlbh+BARDDOmhKOArNs/glWuqY/1kVPsGEYwb3OriOvr6coWwuiuDP11
-Ze3Xk74s6hAMYfsutlJh6LJ9Zuuu0wIiyV4NQOCkTrCc2HshId82j3OxbZv4CHMq
-+xk/MbJs55rz4kOcr4ID0BTN8npjRs1IlDMTFtReIJa+igPijAkPoshNu9MFUR8w
-SPYKWLooUYwZa6RG7QriDLwD8Fjjvm0uBblzhAjmC/a9KC50HZQbR7CZljbs3vO7
-Lnb0dIaqA4npBpf8RlBqTz6XI1RRCJReU0zg6DEsBv4rUMIlDxi8k+iPQgLfsHql
-nZ0pAwFfpo/YTs68eBWdaXyBoTS0aWAeeIBz8q31LrXska/IMzkaMSs96Cs/WzMB
-UzP0D7/r9/o9IW6jmzUPwnj1gFESud/qDcl22M5l06Rp8GNTO97SrYHzuWplIUTi
-Z4xP8GNf+5my1Pvz3fIZcGjpm6NiijtPqnkBV0CeWnVJ780JJ5mhCZiWDErf8HJt
-1izpXC88xviQVFqP68Rrk1PyQRCW4jIX7tF+u9SjRrrYCxOc+6proAM//Zmf1nB1
-YNHZvptBLP/A2FVm/dMQ
-=cjEt
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2/toP/3Mf3xrpYsehjI+TrunfEDZ4
+WxnIF5w5avbSfPIKcT4SanuPSdGekkwDJP4ZlNX3ayAHVHpLIPX/sCVVquhtz3ac
+rHFI9yboGNAAcIp1uBUwyiDdKc66U1I2YZMxQqWazps+x01c+6F1JXT+oLWJxHfe
+HsgQOSjCXN0kRk+Zy7FTg89zErYa+XsuqFG/H9lL86kkSVy5R2Q5co+0PlQ4CcOu
+T7XA8H1McsohCdHYygMwZNEJF9BWy9DBoMsSNlmHHncrKZNxEQAJsDfTrtuy1MWw
+C/OgDWgdG1OXsuUPmN6924Wpo1utwc08ctndFNV6JLO6WZPiXaJ6xUfKDR5qJ2sF
+aDkAS5TrMWlYFr0RjcF9tgI38oNU5+g5CP6V+oNmAHD94yTL+P0CMx7+MztSBbSQ
+Les8TX+WUw+dw1pswDhcpCDeP3L60/GJaXihEv1Yvn5gF3T+tShqJnaVrBnETeVs
+yjS8mw1ncanu7nKN60CKteVHr0J5YxHVelATjEwIJTtzvrTLrruWCKNyWYKTtrhS
+34hWg9DR/GyUUnCOtfZDPxnZa8aUEI5J5d9daVjebuP1DE2XD0aL2ruMcUczteLh
+WiKNiDhEtoq+i0RPtsAdOIjDNZJCZ2HS0Dbrg97gEVmQgPdWPHTS3BtApS+0aT9z
+nO6VuqxzC9g2qjVzCVj7
+=n2dR
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.19.ebuild b/dev-db/mariadb/mariadb-10.0.19.ebuild
deleted file mode 100644
index 282d4e5..0000000
--- a/dev-db/mariadb/mariadb-10.0.19.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-
-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 ~arm64 ~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}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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}
-
- # 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
-
- 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 main.bootstrap \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
- 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-10.0.22-r1.ebuild b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
deleted file mode 100644
index fbba5c3..0000000
--- a/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150717-1707Z"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-IUSE="${IUSE}"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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"
-
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
- # 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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # archive.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.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.bootstrap \
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --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
-}
diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild
deleted file mode 100644
index 825bd6f..0000000
--- a/dev-db/mariadb/mariadb-10.0.22.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-SUBSLOT="18"
-
-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 ~arm64 ~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}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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}
-
- # 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
- #
- # archive.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.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.bootstrap \
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
- 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-10.1.8.ebuild b/dev-db/mariadb/mariadb-10.1.8.ebuild
deleted file mode 100644
index 9ece8ee..0000000
--- a/dev-db/mariadb/mariadb-10.1.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20151019-1714Z"
-WSREP_REVISION="25"
-SUBSLOT="18"
-HAS_TOOLS_PATCH="yes"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga systemd"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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 )
- mroonga? ( app-text/groonga-normalizer-mysql )
- systemd? ( sys-apps/systemd:= )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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"
-
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
- # 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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --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
-}
diff --git a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
deleted file mode 100644
index 5a48322..0000000
--- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20151123-1643Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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=''
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- systemd? ( sys-apps/systemd:= )
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- )
-
- use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # 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-10.1.9.ebuild b/dev-db/mariadb/mariadb-10.1.9.ebuild
deleted file mode 100644
index e4562b0..0000000
--- a/dev-db/mariadb/mariadb-10.1.9.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20151123-1643Z"
-WSREP_REVISION="25"
-SUBSLOT="18"
-HAS_TOOLS_PATCH="yes"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga systemd"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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 )
- mroonga? ( app-text/groonga-normalizer-mysql )
- systemd? ( sys-apps/systemd:= )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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"
-
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
- # 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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --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
-}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 2d8bff7..cc1967f 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -6,14 +6,8 @@
<email>hasufell@gentoo.org</email>
<description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else</description>
</maintainer>
-<!--
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
<use>
<flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
- <flag name='client-libs'>Build the libmysqlclient libraries</flag>
<flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
<flag name='community'>Enables the community features from upstream.</flag>
<flag name='embedded'>Build embedded server (libmysqld)</flag>
@@ -22,7 +16,7 @@ dev-db/mariadb
<flag name='innodb-lz4'>Enables lz4 compression methods for InnoDB/XtraDB</flag>
<flag name='innodb-lzo'>Enables lzo compression methods for InnoDB/XtraDB</flag>
<flag name='innodb-snappy'>Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
- <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+ <flag name='jemalloc'>Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
<flag name='libevent'>Use libevent for connection handling</flag>
<flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
@@ -38,8 +32,7 @@ dev-db/mariadb
<flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
<flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
- <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
- <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+ <flag name='systemtap'>Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
<flag name='tokudb'>Add support for TokuDB storage engine</flag>
<flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-12-28 23:51 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-12-28 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 8b108c88fedad6ffd90d2328fdfc2840fcdd5f41
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 23:47:03 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 23:47:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=8b108c88
dev-db/mariadb: Version bump for 10.1.10
Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 29 ++---
dev-db/mariadb/mariadb-10.1.10.ebuild | 200 ++++++++++++++++++++++++++++++++++
3 files changed, 220 insertions(+), 14 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index fb292c5..cbb99ba 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.1.10 (28 Dec 2015)
+
+ 28 Dec 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.1.10.ebuild:
+ dev-db/mariadb: Version bump for 10.1.10
+
*mariadb-5.5.47 (23 Dec 2015)
23 Dec 2015; Brian Evans <grknight@gentoo.org> +mariadb-5.5.47.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 50ebed3..44ce222 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
+DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
@@ -20,19 +21,19 @@ DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb3895
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJWet1NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWgcnzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2rycP+wSayVg0QEOnW/WoCgEXxaBB
-bvIuW8uD6nKAnTmetBYUH96wnwXOWakEC4itOIyHIPqWC/tE4ARfmffpITOb0knl
-vdhvPOoxj7XusfRxSyi7g5MQa8dIyUq4wLb4tYDQRTJ0djwv6+6w2ZCt4VLij8sn
-M648R9XEiuiCNtshsDQdImvfS6wBzNoZYv+WvvVNXd2vnCJt3blyGvyZOPpOOKeY
-ELTkTCE8fCGYxkEz4vrzLgO/ckZYFyG3SOF9l0PvXd8fbYuCjLi90ZnVyF0z80J1
-s7dLgBrEAQIbEUoQXE5XU7PEBdcudbO2/b9YRaWHNdqTsNP1gqim6pIVjG0T6Xe1
-M2/VGPGqvd9gvH51dWlvoXyGlWuoaUqbm4YZkEiIVk4/AooB2VDpFhhZDfEnBNXx
-jQyAkaBPqX799q+nLERANA0/wBY9bDGx7tfxz6lhi2pqYAOjQOLlDvrOvRUYDyC9
-NAgLkVVt0bVqpYbrC2Edp2C/ecpgFXiccF56Z7WIPTmxfAVlC8Pna4cHMIUlrOpX
-bpGcm0dBYtPYOwpbefmLHHAdH/cFLkgLalR+CWz1Z7fNW51a0AKf9gzFO263xRIv
-VXD8wo3hJnJHoCCqMmcoA8YX1msR28rFZYG0WDWKLZRksnNI+Kx9cEVkjkw9UDV+
-ZJFK/S3Snc3oNUGmoYPz
-=/xpc
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2WYoP/ReopVJYCAJ4wZcesCz3hasZ
+TseFoWQrBIGLrHWON1lK1NOsG2tzTDG1e6cLuymNRnSCTkEahs77yvLFYpN/OErx
+59QDAxO3Hlbh+BARDDOmhKOArNs/glWuqY/1kVPsGEYwb3OriOvr6coWwuiuDP11
+Ze3Xk74s6hAMYfsutlJh6LJ9Zuuu0wIiyV4NQOCkTrCc2HshId82j3OxbZv4CHMq
++xk/MbJs55rz4kOcr4ID0BTN8npjRs1IlDMTFtReIJa+igPijAkPoshNu9MFUR8w
+SPYKWLooUYwZa6RG7QriDLwD8Fjjvm0uBblzhAjmC/a9KC50HZQbR7CZljbs3vO7
+Lnb0dIaqA4npBpf8RlBqTz6XI1RRCJReU0zg6DEsBv4rUMIlDxi8k+iPQgLfsHql
+nZ0pAwFfpo/YTs68eBWdaXyBoTS0aWAeeIBz8q31LrXska/IMzkaMSs96Cs/WzMB
+UzP0D7/r9/o9IW6jmzUPwnj1gFESud/qDcl22M5l06Rp8GNTO97SrYHzuWplIUTi
+Z4xP8GNf+5my1Pvz3fIZcGjpm6NiijtPqnkBV0CeWnVJ780JJ5mhCZiWDErf8HJt
+1izpXC88xviQVFqP68Rrk1PyQRCW4jIX7tF+u9SjRrrYCxOc+6proAM//Zmf1nB1
+YNHZvptBLP/A2FVm/dMQ
+=cjEt
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild
new file mode 100644
index 0000000..dad8418
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.10.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151223-1501Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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=''
+
+COMMON_DEPEND="
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ systemd? ( sys-apps/systemd:= )
+ !bindist? ( >=sys-libs/readline-4.1:0= )
+ server? (
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-${WSREP_REVISION}*
+ sst-rsync? ( sys-process/lsof )
+ sst-xtrabackup? ( net-misc/socat[ssl] )
+ )
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ )
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+ )
+
+ use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 )
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-12-23 17:43 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-12-23 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 0f6ee79dbb525913d9eb632629142952e312b7d0
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 17:43:42 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 17:43:42 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=0f6ee79d
dev-db/mariadb: Version bump for 5.5.47
Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 +++++
dev-db/mariadb/Manifest | 30 +++++++++++-----------
...mariadb-5.5.46.ebuild => mariadb-5.5.47.ebuild} | 0
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 911f527..fb292c5 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-5.5.47 (23 Dec 2015)
+
+ 23 Dec 2015; Brian Evans <grknight@gentoo.org> +mariadb-5.5.47.ebuild,
+ -mariadb-5.5.46.ebuild:
+ dev-db/mariadb: Version bump for 5.5.47
+
*mariadb-10.0.23 (23 Dec 2015)
23 Dec 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.0.23.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 87bcaaf..50ebed3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,7 +9,7 @@ DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae610696645131
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.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
+DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
@@ -20,19 +20,19 @@ DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb3895
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJWerkhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWet1NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2nXYP/0Q674v2dFhm4E7bZrb7MBcW
-3BK46Bv1bNzZ2a2XwYQdD0dTD2fxmosNDS2g+2e9+RXMv9bP1b2xNxyPpzHTsUNx
-aql8PHBbod4g4AfZi+VPdAksk72YjwmIisJvEufoJFLs4iE8vBB3p4Ym1tnL4rMb
-kI6i8AoW8l9AH8lZM4TMXn0r8Vcx2zIc/Nvby6cOBCThAXEN00wlKglFHyT4cXC8
-Bw94E54r9An1itS7uW6OBUF3KqXWLFHVN7qriEpT8wIzq1Cf/YZjowP3ouVE0gkF
-xbjbQG/kUbeR1KKd7RFYNrsJHi1GQFKqLg/Ige3YgXRahXqyHCbbbH1YYr9mzFUn
-iBrEsF+XemAM9aIQ3bs6pz+2pYfEDmkbvGv+bt5ghXtJH8NJNopAzfdAy2CgRebQ
-Uk4T83adyY4A0xNIITTV2qqCop15HU6sJTTPYTv8ZHH+rvm2Ws8C7jOYT6C82fDs
-uGaUeM9lUp5z+HDYSjQFLLSLxvS6LM8gDDXEWwH8L8YlPCDYrNw7JF1Fy7Aj7YH5
-zSU6eQ+Em+dcEkR1C8T061AaTDtA16WZC+nF+WKKbYYtaeAJYhk1sDP/BfpbPWCl
-LN83OGoF1T/XxiQZGL3fTtzI/tlhDiXKFr6cNL9reldWO+DLeC5UKUg721eHCPCq
-Dem/l9QnKyEiv+WD6d/Y
-=wwvA
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2rycP+wSayVg0QEOnW/WoCgEXxaBB
+bvIuW8uD6nKAnTmetBYUH96wnwXOWakEC4itOIyHIPqWC/tE4ARfmffpITOb0knl
+vdhvPOoxj7XusfRxSyi7g5MQa8dIyUq4wLb4tYDQRTJ0djwv6+6w2ZCt4VLij8sn
+M648R9XEiuiCNtshsDQdImvfS6wBzNoZYv+WvvVNXd2vnCJt3blyGvyZOPpOOKeY
+ELTkTCE8fCGYxkEz4vrzLgO/ckZYFyG3SOF9l0PvXd8fbYuCjLi90ZnVyF0z80J1
+s7dLgBrEAQIbEUoQXE5XU7PEBdcudbO2/b9YRaWHNdqTsNP1gqim6pIVjG0T6Xe1
+M2/VGPGqvd9gvH51dWlvoXyGlWuoaUqbm4YZkEiIVk4/AooB2VDpFhhZDfEnBNXx
+jQyAkaBPqX799q+nLERANA0/wBY9bDGx7tfxz6lhi2pqYAOjQOLlDvrOvRUYDyC9
+NAgLkVVt0bVqpYbrC2Edp2C/ecpgFXiccF56Z7WIPTmxfAVlC8Pna4cHMIUlrOpX
+bpGcm0dBYtPYOwpbefmLHHAdH/cFLkgLalR+CWz1Z7fNW51a0AKf9gzFO263xRIv
+VXD8wo3hJnJHoCCqMmcoA8YX1msR28rFZYG0WDWKLZRksnNI+Kx9cEVkjkw9UDV+
+ZJFK/S3Snc3oNUGmoYPz
+=/xpc
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.46.ebuild b/dev-db/mariadb/mariadb-5.5.47.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.46.ebuild
rename to dev-db/mariadb/mariadb-5.5.47.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-12-23 15:09 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-12-23 15:09 UTC (permalink / raw
To: gentoo-commits
commit: edef165ac431504865e3548e4a97129fb4339312
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 15:09:21 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 15:09:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=edef165a
dev-db/mariadb: Version bump
Package-Manager: portage-2.2.26
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 24 +++++
dev-db/mariadb/mariadb-10.0.23.ebuild | 182 ++++++++++++++++++++++++++++++++++
3 files changed, 211 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 32fe707..911f527 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.0.23 (23 Dec 2015)
+
+ 23 Dec 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.0.23.ebuild:
+ dev-db/mariadb: Version bump
+
29 Oct 2015; Brian Evans <grknight@gentoo.org> -mariadb-10.1.6_beta.ebuild,
-mariadb-10.1.7_rc.ebuild:
dev-db/mariadb: Drop old, vulnerable 10.1 series beta releases
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 00b6fd3..87bcaaf 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
+DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
@@ -12,3 +16,23 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de
+DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJWerkhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2nXYP/0Q674v2dFhm4E7bZrb7MBcW
+3BK46Bv1bNzZ2a2XwYQdD0dTD2fxmosNDS2g+2e9+RXMv9bP1b2xNxyPpzHTsUNx
+aql8PHBbod4g4AfZi+VPdAksk72YjwmIisJvEufoJFLs4iE8vBB3p4Ym1tnL4rMb
+kI6i8AoW8l9AH8lZM4TMXn0r8Vcx2zIc/Nvby6cOBCThAXEN00wlKglFHyT4cXC8
+Bw94E54r9An1itS7uW6OBUF3KqXWLFHVN7qriEpT8wIzq1Cf/YZjowP3ouVE0gkF
+xbjbQG/kUbeR1KKd7RFYNrsJHi1GQFKqLg/Ige3YgXRahXqyHCbbbH1YYr9mzFUn
+iBrEsF+XemAM9aIQ3bs6pz+2pYfEDmkbvGv+bt5ghXtJH8NJNopAzfdAy2CgRebQ
+Uk4T83adyY4A0xNIITTV2qqCop15HU6sJTTPYTv8ZHH+rvm2Ws8C7jOYT6C82fDs
+uGaUeM9lUp5z+HDYSjQFLLSLxvS6LM8gDDXEWwH8L8YlPCDYrNw7JF1Fy7Aj7YH5
+zSU6eQ+Em+dcEkR1C8T061AaTDtA16WZC+nF+WKKbYYtaeAJYhk1sDP/BfpbPWCl
+LN83OGoF1T/XxiQZGL3fTtzI/tlhDiXKFr6cNL9reldWO+DLeC5UKUg721eHCPCq
+Dem/l9QnKyEiv+WD6d/Y
+=wwvA
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.23.ebuild b/dev-db/mariadb/mariadb-10.0.23.ebuild
new file mode 100644
index 0000000..5bcbfd2
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.23.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151223-1501Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist odbc oqgraph pam sphinx tokudb xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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='20004_all_mariadb-filter-tokudb-flags-10.0.7.patch'
+
+COMMON_DEPEND="
+ !bindist? ( >=sys-libs/readline-4.1:0= )
+ server? (
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+ pam? ( virtual/pam:0= )
+ )
+ >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ ${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+ perl? ( !dev-db/mytop
+ virtual/perl-Getopt-Long
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes )
+"
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ local MYSQL_CMAKE_NATIVE_DEFINES=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
+ -DWITH_PCRE=system
+ )
+ if use server ; then
+ # Federated{,X} must be treated special otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ -DWITHOUT_FEDERATED=1
+ -DWITHOUT_FEDERATEDX=1 )
+ fi
+
+ MYSQL_CMAKE_NATIVE_DEFINES+=(
+ $(mysql-cmake_use_plugin oqgraph OQGRAPH)
+ $(mysql-cmake_use_plugin sphinx SPHINX)
+ $(mysql-cmake_use_plugin tokudb TOKUDB)
+ $(mysql-cmake_use_plugin pam AUTH_PAM)
+ -DWITHOUT_CASSANDRA=0
+ $(mysql-cmake_use_plugin extraengine SEQUENCE)
+ $(mysql-cmake_use_plugin extraengine SPIDER)
+ $(mysql-cmake_use_plugin extraengine CONNECT)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DWITHOUT_MROONGA=1
+ )
+ fi
+ mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # archive.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.mysql_client_test_nonblock \
+ main.mysql_client_test_comp \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.bootstrap \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-11-23 18:29 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-11-23 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 647e1016b9c4636e3f31bb69a0d5a07f78dd5691
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 18:28:21 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 18:28:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=647e1016
dev-db/mariadb: Version bump to 10.1.9
One test failure on missing warnings: innodb.innodb_uninstall
Reported upstream: https://mariadb.atlassian.net/browse/MDEV-9171
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb/Manifest | 24 +------
dev-db/mariadb/mariadb-10.1.9.ebuild | 128 +++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 22 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 423d07c..00b6fd3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
+DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
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
@@ -13,22 +11,4 @@ DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6d
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJWMmmlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RJEQAIGO63ovUeNECFCSnv4EiPXX
-kZE4C1H9I6mxE2Ig9VCi/b2vINoGesGuGQgO/CTq7oP63itkkchehSoZJ4O2hw6v
-eivRQlFqDgJ5DzywefnFtaWXlKu33nRiyzT11FeWMvb1htHN1y9GSnHU2KoyeMqC
-ZYAdGWJfuWduQa8JBVR973/RK1HbtEufd79y5a+CZZvEeeRXzKu6s9xZxXZUmJGG
-SEgBcPp7u8c+A+SWkoaY4Fta4kv47wMnIIGGmV0JuNU508rzySmCnEzC7Zfq+fKi
-rbcbmcje4T85YQLKGSATGB1znUIpw187+EuY1+V/1pXyp4mK4EbcX1DdOub71zMq
-X6ZaqZZsok1S+6HsN5aXmkIA8r1/U6qbkP9z7zvkC9pf9R5Zdg+sJRnawwMhFBBu
-ex7e24aj7qnfZwYhC2aSTE4CuqRWpt5OVioAEUKqbcjAh9AaSbbHs/hgRrbLHuXs
-jpRqc4CWe/ZABeQhkProhI4DSlOCLDFvefDSFnpiWhKVNZ+jgOnJJ2dnmvSgz4UX
-roJEBIfi7xn8/smoPUw4S3F035L8JpHde8yZQsAsUs5mf3YiT2bFpD/MKMEWv2EX
-jKPGEmTy69mbfIf/5OrsHvgDX79sL76yO9D6NbWihxMqrgmBoHgF/wEId/KojFEm
-Aban1Iu2jPY2rLyAGayA
-=s7Eq
------END PGP SIGNATURE-----
+DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de
diff --git a/dev-db/mariadb/mariadb-10.1.9.ebuild b/dev-db/mariadb/mariadb-10.1.9.ebuild
new file mode 100644
index 0000000..e4562b0
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.9.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151123-1643Z"
+WSREP_REVISION="25"
+SUBSLOT="18"
+HAS_TOOLS_PATCH="yes"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE mroonga systemd"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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 )
+ mroonga? ( app-text/groonga-normalizer-mysql )
+ systemd? ( sys-apps/systemd:= )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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
+
+ if use server ; then
+
+ # 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 [[ $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"
+
+ # Create a symlink to provided binaries so the tests can find them when client-libs is off
+ if ! use client-libs ; then
+ ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+ ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+ mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+ fi
+
+ # 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 run 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ main.mysql_client_test_comp main.bootstrap \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.cracklib_password_check \
+ 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
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-10-29 18:47 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-10-29 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 93af0ab20dcb82150258466510cacdeafaa82562
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 18:47:02 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 18:47:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=93af0ab2
dev-db/mariadb: Drop old, vulnerable 10.1 series beta releases
Package-Manager: portage-2.2.23
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 4 +
dev-db/mariadb/Manifest | 31 ++++----
dev-db/mariadb/mariadb-10.1.6_beta.ebuild | 121 ----------------------------
dev-db/mariadb/mariadb-10.1.7_rc.ebuild | 127 ------------------------------
4 files changed, 18 insertions(+), 265 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index e0d8105..32fe707 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 29 Oct 2015; Brian Evans <grknight@gentoo.org> -mariadb-10.1.6_beta.ebuild,
+ -mariadb-10.1.7_rc.ebuild:
+ dev-db/mariadb: Drop old, vulnerable 10.1 series beta releases
+
*mariadb-10.0.22-r1 (29 Oct 2015)
*mariadb-10.0.22 (29 Oct 2015)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2c4e7b1..423d07c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,8 +3,6 @@ Hash: SHA256
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
-DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
-DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
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
@@ -14,24 +12,23 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJWMmkpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWMmmlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2BEEP/1EGwmahYjqK7NW9OGPyQtdT
-9DMm5y1MRubtGmrnQh5sbKH4sWQ2vu6N8J9DG41pxDkcWhyssGqOnTnyIh4Q7fsN
-w7qs9hi1I3sN8ZjY4c/ftf5F2xeqi5SxsQ/HgYT4mlPafSiI/IEyWWKZuaOkOs9B
-FVRLdlTBcOzcK8QvhxoidVbA6+tA72eTyFTOnz3UuAKxGu6muScFpIiTUk2/nscJ
-Z+Jn6dgibpxFe2ae2q/EXJOe+2g9kzHNLYfJudNwT757O4+bx4Tp3hqd9NUA1IHJ
-wJAQmDCFunVTiCdzdY0/LSIWzXx4+vCOhnukvbyR/I5Gd5igctL/dK6m3dl6fUtw
-2kILv996fMXvV+rMlr7irfKIIFf6Q9IUFWnVwlGpZbBXUAKWf306tROnjBa8o6qe
-l8+y7KQzyanVNnWbe0ECDdt4GjshXa4dWosr11SErVro+J5yf7J1GERVvwtI8Tfv
-7t34JpMak5HZFQabWpDYtZcS2oeMjNeLSQYfiZnlGM2fVDp5cIOj0u5T+tTKXpo+
-T4yzsKxun8IcX3IncB750i2lz8S+F0eRlWD27mGUm7pCVoBZS6cGzh+Sl8QMO3Y5
-0YJnY+QyLpRs53RfX1v+rei+zetVx7RMF7P832PNADwuMws3P4xNUdyrsQH2etzx
-VrDecE6Rjr7eeJpDGPXT
-=APX5
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RJEQAIGO63ovUeNECFCSnv4EiPXX
+kZE4C1H9I6mxE2Ig9VCi/b2vINoGesGuGQgO/CTq7oP63itkkchehSoZJ4O2hw6v
+eivRQlFqDgJ5DzywefnFtaWXlKu33nRiyzT11FeWMvb1htHN1y9GSnHU2KoyeMqC
+ZYAdGWJfuWduQa8JBVR973/RK1HbtEufd79y5a+CZZvEeeRXzKu6s9xZxXZUmJGG
+SEgBcPp7u8c+A+SWkoaY4Fta4kv47wMnIIGGmV0JuNU508rzySmCnEzC7Zfq+fKi
+rbcbmcje4T85YQLKGSATGB1znUIpw187+EuY1+V/1pXyp4mK4EbcX1DdOub71zMq
+X6ZaqZZsok1S+6HsN5aXmkIA8r1/U6qbkP9z7zvkC9pf9R5Zdg+sJRnawwMhFBBu
+ex7e24aj7qnfZwYhC2aSTE4CuqRWpt5OVioAEUKqbcjAh9AaSbbHs/hgRrbLHuXs
+jpRqc4CWe/ZABeQhkProhI4DSlOCLDFvefDSFnpiWhKVNZ+jgOnJJ2dnmvSgz4UX
+roJEBIfi7xn8/smoPUw4S3F035L8JpHde8yZQsAsUs5mf3YiT2bFpD/MKMEWv2EX
+jKPGEmTy69mbfIf/5OrsHvgDX79sL76yO9D6NbWihxMqrgmBoHgF/wEId/KojFEm
+Aban1Iu2jPY2rLyAGayA
+=s7Eq
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.1.6_beta.ebuild b/dev-db/mariadb/mariadb-10.1.6_beta.ebuild
deleted file mode 100644
index 4678099..0000000
--- a/dev-db/mariadb/mariadb-10.1.6_beta.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="live"
-WSREP_REVISION="25"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- mroonga? ( app-text/groonga-normalizer-mysql )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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}
-
- # 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
-# main.bootstrap \
- 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 plugins.cracklib_password_check \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
- 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-10.1.7_rc.ebuild b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
deleted file mode 100644
index a28f854..0000000
--- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150914-1946Z"
-WSREP_REVISION="25"
-SUBSLOT="18"
-HAS_TOOLS_PATCH="yes"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- mroonga? ( app-text/groonga-normalizer-mysql )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
- if use server ; then
-
- # 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 [[ $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"
-
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
- # 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 run 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 main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-10-29 18:47 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-10-29 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 6aa807a9c7d11c059d798790f9ea117402c87171
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 18:45:01 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 18:45:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6aa807a9
dev-db/mariadb: Version bump to 10.0.22
Package-Manager: portage-2.2.23
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 7 +++++++
dev-db/mariadb/Manifest | 24 +++++++++++++++++++++-
...10.0.21-r1.ebuild => mariadb-10.0.22-r1.ebuild} | 0
...riadb-10.0.21.ebuild => mariadb-10.0.22.ebuild} | 0
4 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 31ee018..e0d8105 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-10.0.22-r1 (29 Oct 2015)
+*mariadb-10.0.22 (29 Oct 2015)
+
+ 29 Oct 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.0.22-r1.ebuild,
+ +mariadb-10.0.22.ebuild, -mariadb-10.0.21-r1.ebuild, -mariadb-10.0.21.ebuild:
+ dev-db/mariadb: Version bump to 10.0.22
+
21 Oct 2015; Brian Evans <grknight@gentoo.org> mariadb-10.1.8.ebuild:
dev-db/mariadb: Update test instructions
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bc1dec1..2c4e7b1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
-DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
+DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
@@ -13,3 +16,22 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJWMmkpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2BEEP/1EGwmahYjqK7NW9OGPyQtdT
+9DMm5y1MRubtGmrnQh5sbKH4sWQ2vu6N8J9DG41pxDkcWhyssGqOnTnyIh4Q7fsN
+w7qs9hi1I3sN8ZjY4c/ftf5F2xeqi5SxsQ/HgYT4mlPafSiI/IEyWWKZuaOkOs9B
+FVRLdlTBcOzcK8QvhxoidVbA6+tA72eTyFTOnz3UuAKxGu6muScFpIiTUk2/nscJ
+Z+Jn6dgibpxFe2ae2q/EXJOe+2g9kzHNLYfJudNwT757O4+bx4Tp3hqd9NUA1IHJ
+wJAQmDCFunVTiCdzdY0/LSIWzXx4+vCOhnukvbyR/I5Gd5igctL/dK6m3dl6fUtw
+2kILv996fMXvV+rMlr7irfKIIFf6Q9IUFWnVwlGpZbBXUAKWf306tROnjBa8o6qe
+l8+y7KQzyanVNnWbe0ECDdt4GjshXa4dWosr11SErVro+J5yf7J1GERVvwtI8Tfv
+7t34JpMak5HZFQabWpDYtZcS2oeMjNeLSQYfiZnlGM2fVDp5cIOj0u5T+tTKXpo+
+T4yzsKxun8IcX3IncB750i2lz8S+F0eRlWD27mGUm7pCVoBZS6cGzh+Sl8QMO3Y5
+0YJnY+QyLpRs53RfX1v+rei+zetVx7RMF7P832PNADwuMws3P4xNUdyrsQH2etzx
+VrDecE6Rjr7eeJpDGPXT
+=APX5
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.21-r1.ebuild b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-10.0.21-r1.ebuild
rename to dev-db/mariadb/mariadb-10.0.22-r1.ebuild
diff --git a/dev-db/mariadb/mariadb-10.0.21.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-10.0.21.ebuild
rename to dev-db/mariadb/mariadb-10.0.22.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-10-21 19:12 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-10-21 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 692f19e0e9363b42844c52ba23ab843f31302000
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 19:12:26 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 19:12:26 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=692f19e0
dev-db/mariadb: Update test instructions
Package-Manager: portage-2.2.23
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-10.1.8.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 7b64fea..31ee018 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 21 Oct 2015; Brian Evans <grknight@gentoo.org> mariadb-10.1.8.ebuild:
+ dev-db/mariadb: Update test instructions
+
12 Oct 2015; Brian Evans <grknight@gentoo.org> mariadb-10.1.7_rc.ebuild:
dev-db/mariadb: Readd ~arm64 which was dropped accidentally
diff --git a/dev-db/mariadb/mariadb-10.1.8.ebuild b/dev-db/mariadb/mariadb-10.1.8.ebuild
index 08140db..8b5df41 100644
--- a/dev-db/mariadb/mariadb-10.1.8.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.8.ebuild
@@ -24,7 +24,7 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
RDEPEND="${RDEPEND}"
# Official test instructions:
-# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
+# USE='client-libs community embedded extraengine perl server openssl static-libs tools' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-10-12 18:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-10-12 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 1943ca6454d4d89b690753150791b75b4c76e17d
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 18:33:41 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 18:33:41 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1943ca64
dev-db/mariadb: Version bump for 5.5 series
Package-Manager: portage-2.2.23
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 6 ++++++
dev-db/mariadb/Manifest | 24 +++++++++++++++++++++-
...mariadb-5.5.45.ebuild => mariadb-5.5.46.ebuild} | 0
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index cc9a3ab..14f88ee 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*mariadb-5.5.46 (12 Oct 2015)
+
+ 12 Oct 2015; Brian Evans <grknight@gentoo.org> +mariadb-5.5.46.ebuild,
+ -mariadb-5.5.45.ebuild:
+ dev-db/mariadb: Version bump for 5.5 series
+
*mariadb-10.1.4_beta (14 Apr 2015)
14 Apr 2015; <grknight@gentoo.org> -mariadb-5.5.41.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ee47bd1..b5bda06 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
@@ -5,9 +8,28 @@ DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f
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.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa
+DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJWG/0EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2At0P/jB8CYOdFb5gOMj434bkuJ8r
+Tkb3KdKxnCurHykSenhoMEve0l37E3/Sf+0onv83/dxtJLq46qq7XXFLlvwGtN7Y
+AuMro1Qzxgl5bMrjq79lBr5+gQFKSjNfmOKSeyh50lgYoblhg652TcxqA6lj/yIv
+IQmvWVhqQnsUC1UXeI3D/oS7mrDuYC4DFh5Tyj1XSTDI07mBHUWQSpG60E8xd0SY
+zNlTrVN6T7EgfbWRz8+sTxdZR8a4x4HUSpc21AjOIApbw69FcpZhyVvJVh1qBBFT
+REyaeafMv+Sfq/x8caNcUHSPxFIxvkapaBdM3bJr0LgVB8d81EGHBvBtMzw/NfbK
+xJ+W2PN8Qna3isCtc3h/USn8pOuyMZl/lhYceWb4bmzOWjsifi4eyCuU7vNWZzct
+EB1OAqu9xdv3/BY8Lle5iV8/dikEczkJ+YEsoIcxSb9oT+/cckuRayAyxscZQIMR
+jN/66nGq0yByOnZTkJZGyKDfafqBcZcC1HI/a6vneLivap//9JNEL1bfEUMOra07
+qYn98V04OTag2HJvc6v/wArisxjlEX9xtaOOor39uW3UXcfXgURC2/BycPyBadjJ
+BigDrYgoaNQCo+ZJj3VaU1xXYwCbi72+5LgCarDh9RD9ueaIozzkHHfhyAbc8bFO
+O+2gNMikvRRI0qN7PzCV
+=e9Dj
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.45.ebuild b/dev-db/mariadb/mariadb-5.5.46.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.45.ebuild
rename to dev-db/mariadb/mariadb-5.5.46.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-10-12 18:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-10-12 18:37 UTC (permalink / raw
To: gentoo-commits
commit: cacfc239ab353cf4fc2d24785b4831c99183e648
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 18:37:30 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 18:37:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cacfc239
dev-db/mariadb: Readd ~arm64 which was dropped accidentally
Package-Manager: portage-2.2.23
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb/ChangeLog | 3 +++
dev-db/mariadb/mariadb-10.1.7_rc.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 14f88ee..7b64fea 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 12 Oct 2015; Brian Evans <grknight@gentoo.org> mariadb-10.1.7_rc.ebuild:
+ dev-db/mariadb: Readd ~arm64 which was dropped accidentally
+
*mariadb-5.5.46 (12 Oct 2015)
12 Oct 2015; Brian Evans <grknight@gentoo.org> +mariadb-5.5.46.ebuild,
diff --git a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
index c416925..38c96e0 100644
--- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE mroonga"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-09-14 19:47 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-09-14 19:47 UTC (permalink / raw
To: gentoo-commits
commit: db4277730a35f860d174ae00d571c29827ea356c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 19:51:40 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 19:51:51 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=db427773
dev-db/mariadb: Freeze the patch version for 10.1.7_rc
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.1.7_rc.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e5d3bb1..ee47bd1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -10,3 +10,4 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
+DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212 WHIRLPOOL 588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
diff --git a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
index 53de1cf..c416925 100644
--- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20150914-1946Z"
WSREP_REVISION="25"
SUBSLOT="18"
HAS_TOOLS_PATCH="yes"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-09-12 2:28 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-09-12 2:28 UTC (permalink / raw
To: gentoo-commits
commit: 6975745920bec3bb2151556dc5aa92428f042445
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 01:32:07 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 01:32:07 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=69757459
dev-db/mariadb: update tests for 10.1.7_rc
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb/mariadb-10.1.7_rc.ebuild | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
index f90c1ca..53de1cf 100644
--- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
@@ -23,7 +23,7 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
RDEPEND="${RDEPEND}"
# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
+# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
@@ -38,11 +38,11 @@ multilib_src_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 server ; then
- if ! use "minimal" ; then
+ # 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 [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
@@ -57,6 +57,13 @@ multilib_src_test() {
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+ # Create a symlink to provided binaries so the tests can find them when client-libs is off
+ if ! use client-libs ; then
+ ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+ ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+ mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+ fi
+
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# Enable parallel testing, auto will try to detect number of cores
@@ -64,7 +71,7 @@ multilib_src_test() {
# 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
+ # create directories because mysqladmin might run out of order
mkdir -p "${T}"/var-tests{,/log}
# These are failing in MariaDB 10.0 for now and are believed to be
@@ -82,9 +89,8 @@ multilib_src_test() {
# plugins.cracklib_password_check
# Can randomly fail due to cracklib return message
-# main.bootstrap \
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 plugins.cracklib_password_check \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
@@ -95,7 +101,7 @@ multilib_src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -116,7 +122,6 @@ multilib_src_test() {
einfo "Tests successfully completed"
else
-
einfo "Skipping server tests due to minimal build."
fi
}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-09-11 20:53 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-09-11 20:53 UTC (permalink / raw
To: gentoo-commits
commit: fba5af3b7bf628aca02031c615155361c2cfa242
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 20:38:01 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 20:38:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=fba5af3b
dev-db/mariadb: Version bump for 10.1 series to RC
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
...{mariadb-10.1.5_beta.ebuild => mariadb-10.1.7_rc.ebuild} | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.5_beta.ebuild b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
similarity index 94%
rename from dev-db/mariadb/mariadb-10.1.5_beta.ebuild
rename to dev-db/mariadb/mariadb-10.1.7_rc.ebuild
index c9f314f..f90c1ca 100644
--- a/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
@@ -6,18 +6,20 @@ EAPI="5"
MY_EXTRAS_VER="live"
WSREP_REVISION="25"
SUBSLOT="18"
+HAS_TOOLS_PATCH="yes"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
+IUSE="$IUSE mroonga"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
+#EPATCH_EXCLUDE='20014_all_mariadb-innodb-compression.patch'
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ mroonga? ( app-text/groonga-normalizer-mysql )"
RDEPEND="${RDEPEND}"
# Official test instructions:
@@ -79,15 +81,12 @@ multilib_src_test() {
#
# plugins.cracklib_password_check
# Can randomly fail due to cracklib return message
- #
- # sys_vars.all_vars
- # Fails when galera support is disabled
+# main.bootstrap \
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 plugins.cracklib_password_check \
- main.bootstrap sys_vars.all_vars \
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
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-08-08 4:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-08-08 4:37 UTC (permalink / raw
To: gentoo-commits
commit: 4c64013cd05259dc048624cc333690bfae0fdfeb
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 04:37:05 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 04:37:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4c64013c
Version bumps
dev-db/mariadb/Manifest | 5 +-
...10.0.20-r1.ebuild => mariadb-10.0.21-r1.ebuild} | 7 +-
...riadb-10.0.20.ebuild => mariadb-10.0.21.ebuild} | 9 +-
dev-db/mariadb/mariadb-5.5.42.ebuild | 118 ---------------------
...mariadb-5.5.44.ebuild => mariadb-5.5.45.ebuild} | 7 +-
5 files changed, 22 insertions(+), 124 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1e7d8a4..bfb286e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,12 +1,11 @@
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
-DIST mariadb-10.0.20.tar.gz 56241178 SHA256 3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b SHA512 40214e29ec3fd6402b6e075644ab3fc3acd080e9e0d6e77db83c14d928f69a9af366c5df715d3d52692b90259c6b6d28160376a4d6e05811ed9973741a3ba445 WHIRLPOOL 5a5dfa7a53254a22fc4540aa78a6ac3704e17e90b22d1bae32f40bddd906e6e9409161c973e9229d48af27419df410c7214859bd979137221ba394d37cf1bbbb
+DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
DIST mariadb-10.1.5.tar.gz 53573071 SHA256 af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512 50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f WHIRLPOOL b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
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.42.tar.gz 45586372 SHA256 3c868e768f4c24b4aa2f8f1725460d15a5485ed75e17b0755c6e604520e34439 SHA512 8fd9916e7ad225ea47936c34a14d37d0e4c9ac182b8791d46d158aa86151cbfe45e54e0b680d281223f175d492765aeadd7565e2a706d86b69696a51761e9769 WHIRLPOOL 9adaa1006ddb736fce0bdcc6d8bbc8012f083d443cced67088efe5b7107082f3c6ce1e4ee1d40558ea90501c69a7db456723ad7cb6345affece3adbdddfccd29
-DIST mariadb-5.5.44.tar.gz 45672065 SHA256 7d425caf5f1e45de9e5eb72daa98ceb542e7b134a89bd01540b60fe9c5965e8f SHA512 34cde1a49055e4389b9b17a7d5ee8465a6213bf2b0e6a9c9ed327c1bcbe3abfa0023ee55755ac40940887315b7f7204960aed1328a767bd6b3129dee2b7a32d9 WHIRLPOOL bbdfa58077b232e900140b9ffe26661f2d2865eecfdae0ad26ab70b0589ad8759b344c4f77e510ff25d3d6db11527c7e69ed8473a550207db02f335bc2b0d060
+DIST mariadb-5.5.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
diff --git a/dev-db/mariadb/mariadb-10.0.20-r1.ebuild b/dev-db/mariadb/mariadb-10.0.21-r1.ebuild
similarity index 92%
rename from dev-db/mariadb/mariadb-10.0.20-r1.ebuild
rename to dev-db/mariadb/mariadb-10.0.21-r1.ebuild
index 38eb7c5..564600a 100644
--- a/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.21-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.21-r1.ebuild,v 1.1 2015/08/08 03:41:14 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20150717-1707Z"
@@ -83,11 +83,16 @@ multilib_src_test() {
# main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
+ # archive.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.mysql_client_test_nonblock \
main.mysql_client_test_comp \
binlog.binlog_statement_insert_delayed main.information_schema \
main.mysqld--help main.bootstrap \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
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
diff --git a/dev-db/mariadb/mariadb-10.0.20.ebuild b/dev-db/mariadb/mariadb-10.0.21.ebuild
similarity index 91%
rename from dev-db/mariadb/mariadb-10.0.20.ebuild
rename to dev-db/mariadb/mariadb-10.0.21.ebuild
index 5c110b3..7c02a28 100644
--- a/dev-db/mariadb/mariadb-10.0.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.21.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-10.0.20.ebuild,v 1.1 2015/06/20 01:04:32 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.21.ebuild,v 1.1 2015/08/08 03:41:14 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -76,11 +76,18 @@ multilib_src_test() {
# main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ #
+ # archive.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.mysql_client_test_nonblock \
main.mysql_client_test_comp \
binlog.binlog_statement_insert_delayed main.information_schema \
main.mysqld--help main.bootstrap \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
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
diff --git a/dev-db/mariadb/mariadb-5.5.42.ebuild b/dev-db/mariadb/mariadb-5.5.42.ebuild
deleted file mode 100644
index 5a6f1bc..0000000
--- a/dev-db/mariadb/mariadb-5.5.42.ebuild
+++ /dev/null
@@ -1,118 +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/mariadb-5.5.42.ebuild,v 1.1 2015/02/24 17:16:10 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.44.ebuild b/dev-db/mariadb/mariadb-5.5.45.ebuild
similarity index 92%
rename from dev-db/mariadb/mariadb-5.5.44.ebuild
rename to dev-db/mariadb/mariadb-5.5.45.ebuild
index 5cf1ddf..120d643 100644
--- a/dev-db/mariadb/mariadb-5.5.44.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.45.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.44.ebuild,v 1.1 2015/06/20 01:46:49 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.45.ebuild,v 1.1 2015/08/08 04:35:53 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20150509-1847Z"
@@ -79,10 +79,15 @@ src_test() {
# main.mysql_client_test, main.mysql_client_test_nonblock:
# segfaults at random under Portage only, suspect resource limits.
#
+ # archive.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.mysql_client_test_nonblock \
binlog.binlog_statement_insert_delayed main.information_schema \
main.mysqld--help \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
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
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-07-27 20:28 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-07-27 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 3e3ae028607a72be0824df3bdd60a08da30d9751
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 20:31:46 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 20:31:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3e3ae028
MariaDB 10.1 bump
dev-db/mariadb/Manifest | 3 +-
dev-db/mariadb/mariadb-10.1.3_beta.ebuild | 116 ---------------------
....1.4_beta.ebuild => mariadb-10.1.6_beta.ebuild} | 11 +-
dev-db/mariadb/metadata.xml | 1 +
4 files changed, 9 insertions(+), 122 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d2783b4..1e7d8a4 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,7 @@
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.0.20.tar.gz 56241178 SHA256 3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b SHA512 40214e29ec3fd6402b6e075644ab3fc3acd080e9e0d6e77db83c14d928f69a9af366c5df715d3d52692b90259c6b6d28160376a4d6e05811ed9973741a3ba445 WHIRLPOOL 5a5dfa7a53254a22fc4540aa78a6ac3704e17e90b22d1bae32f40bddd906e6e9409161c973e9229d48af27419df410c7214859bd979137221ba394d37cf1bbbb
-DIST mariadb-10.1.3.tar.gz 52935207 SHA256 565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae WHIRLPOOL 08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
-DIST mariadb-10.1.4.tar.gz 53358393 SHA256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512 c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91 WHIRLPOOL d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
DIST mariadb-10.1.5.tar.gz 53573071 SHA256 af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512 50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f WHIRLPOOL b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
+DIST mariadb-10.1.6.tar.gz 53777046 SHA256 492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb WHIRLPOOL 23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
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
diff --git a/dev-db/mariadb/mariadb-10.1.3_beta.ebuild b/dev-db/mariadb/mariadb-10.1.3_beta.ebuild
deleted file mode 100644
index 681e55a..0000000
--- a/dev-db/mariadb/mariadb-10.1.3_beta.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-MY_EXTRAS_VER="live"
-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="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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}
-
- # 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
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
-
- 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 \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
- 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-10.1.4_beta.ebuild b/dev-db/mariadb/mariadb-10.1.6_beta.ebuild
similarity index 93%
rename from dev-db/mariadb/mariadb-10.1.4_beta.ebuild
rename to dev-db/mariadb/mariadb-10.1.6_beta.ebuild
index 911f98f..2500eec 100644
--- a/dev-db/mariadb/mariadb-10.1.4_beta.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.6_beta.ebuild
@@ -5,18 +5,20 @@
EAPI="5"
MY_EXTRAS_VER="live"
WSREP_REVISION="25"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
+IUSE="$IUSE mroonga"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
+#EPATCH_EXCLUDE='20014_all_mariadb-innodb-compression.patch'
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+ mroonga? ( app-text/groonga-normalizer-mysql )"
RDEPEND="${RDEPEND}"
# Official test instructions:
@@ -69,7 +71,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
@@ -79,6 +81,7 @@ multilib_src_test() {
# plugins.cracklib_password_check
# Can randomly fail due to cracklib return message
+# main.bootstrap \
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 \
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 190ca5e..01c1e4d 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -22,6 +22,7 @@ dev-db/mariadb
<flag name='libevent'>Use libevent for connection handling</flag>
<flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
<flag name='minimal'>Install client programs only, no server</flag>
+ <flag name='mroonga'>Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
<flag name='pam'>Enable the optional PAM authentication plugin for the server</flag>
<flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-06-20 2:07 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-06-20 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 15748040522cd15211463340dbc20c3bc24c80dd
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 02:07:33 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 02:07:33 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=15748040
Version bumps
dev-db/mariadb/Manifest | 4 +-
...riadb-10.0.16.ebuild => mariadb-10.0.20.ebuild} | 16 +++-----
...ariadb-10.0.16.ebuild => mariadb-5.5.44.ebuild} | 45 ++++++++++------------
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5a142e3..52ff954 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,5 @@
-DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3 WHIRLPOOL 916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
+DIST mariadb-10.0.20.tar.gz 56241178 SHA256 3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b SHA512 40214e29ec3fd6402b6e075644ab3fc3acd080e9e0d6e77db83c14d928f69a9af366c5df715d3d52692b90259c6b6d28160376a4d6e05811ed9973741a3ba445 WHIRLPOOL 5a5dfa7a53254a22fc4540aa78a6ac3704e17e90b22d1bae32f40bddd906e6e9409161c973e9229d48af27419df410c7214859bd979137221ba394d37cf1bbbb
DIST mariadb-10.1.3.tar.gz 52935207 SHA256 565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae WHIRLPOOL 08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
DIST mariadb-10.1.4.tar.gz 53358393 SHA256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512 c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91 WHIRLPOOL d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
DIST mariadb-10.1.5.tar.gz 53573071 SHA256 af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512 50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f WHIRLPOOL b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
@@ -7,5 +7,7 @@ DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645a
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.42.tar.gz 45586372 SHA256 3c868e768f4c24b4aa2f8f1725460d15a5485ed75e17b0755c6e604520e34439 SHA512 8fd9916e7ad225ea47936c34a14d37d0e4c9ac182b8791d46d158aa86151cbfe45e54e0b680d281223f175d492765aeadd7565e2a706d86b69696a51761e9769 WHIRLPOOL 9adaa1006ddb736fce0bdcc6d8bbc8012f083d443cced67088efe5b7107082f3c6ce1e4ee1d40558ea90501c69a7db456723ad7cb6345affece3adbdddfccd29
+DIST mariadb-5.5.44.tar.gz 45672065 SHA256 7d425caf5f1e45de9e5eb72daa98ceb542e7b134a89bd01540b60fe9c5965e8f SHA512 34cde1a49055e4389b9b17a7d5ee8465a6213bf2b0e6a9c9ed327c1bcbe3abfa0023ee55755ac40940887315b7f7204960aed1328a767bd6b3129dee2b7a32d9 WHIRLPOOL bbdfa58077b232e900140b9ffe26661f2d2865eecfdae0ad26ab70b0589ad8759b344c4f77e510ff25d3d6db11527c7e69ed8473a550207db02f335bc2b0d060
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
+DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild b/dev-db/mariadb/mariadb-10.0.20.ebuild
similarity index 83%
copy from dev-db/mariadb/mariadb-10.0.16.ebuild
copy to dev-db/mariadb/mariadb-10.0.20.ebuild
index 0320067..0fd88bd 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.20.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-10.0.16.ebuild,v 1.12 2015/03/03 06:08:08 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.20.ebuild,v 1.1 2015/06/20 01:04:32 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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=''
@@ -19,7 +19,7 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
# 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
@@ -68,7 +68,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
@@ -79,17 +79,11 @@ multilib_src_test() {
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 \
+ main.mysqld--help main.bootstrap \
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
-
# Run mysql tests
pushd "${TESTDIR}"
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild b/dev-db/mariadb/mariadb-5.5.44.ebuild
similarity index 72%
rename from dev-db/mariadb/mariadb-10.0.16.ebuild
rename to dev-db/mariadb/mariadb-5.5.44.ebuild
index 0320067..5cf1ddf 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.44.ebuild
@@ -1,16 +1,19 @@
# 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-10.0.16.ebuild,v 1.12 2015/03/03 06:08:08 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.44.ebuild,v 1.1 2015/06/20 01:46:49 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
+MY_EXTRAS_VER="20150509-1847Z"
-inherit toolchain-funcs mysql-multilib
+# 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 ~arm64 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"
+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=''
@@ -18,17 +21,16 @@ 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' \
+# USE='embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-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
+src_test() {
local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
@@ -63,7 +65,10 @@ multilib_src_test() {
# 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
+ # 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,
@@ -71,31 +76,23 @@ multilib_src_test() {
# funcs_1.is_columns_mysql
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
+ # 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 \
- main.mysql_client_test_comp \
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-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"
+ 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"
-
+ 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"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-06-10 3:31 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-06-10 3:31 UTC (permalink / raw
To: gentoo-commits
commit: a0556ae693572b352057dfcd6f79c484bdf36412
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 03:31:04 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 03:31:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a0556ae6
Version bump for 10.1 series.
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.1.5_beta.ebuild | 122 ++++++++++++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ae063e3..5a142e3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -2,6 +2,7 @@ DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ff
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.1.3.tar.gz 52935207 SHA256 565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae WHIRLPOOL 08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
DIST mariadb-10.1.4.tar.gz 53358393 SHA256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512 c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91 WHIRLPOOL d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
+DIST mariadb-10.1.5.tar.gz 53573071 SHA256 af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512 50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f WHIRLPOOL b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
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
diff --git a/dev-db/mariadb/mariadb-10.1.5_beta.ebuild b/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
new file mode 100644
index 0000000..5c21fdd
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+MY_EXTRAS_VER="live"
+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="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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}
+
+ # 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 main.bootstrap
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.cracklib_password_check
+ # Can randomly fail due to cracklib return message
+ #
+ # sys_vars.all_vars
+ # Fails when galera support is disabled
+
+ 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 plugins.cracklib_password_check \
+ main.bootstrap sys_vars.all_vars \
+ 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
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-05-09 18:38 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-05-09 18:38 UTC (permalink / raw
To: gentoo-commits
commit: e43fb65f83758f9e120a569369f3012ae8a2791c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 18:37:57 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat May 9 18:37:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e43fb65f
Version bump; drop old
dev-db/mariadb/Manifest | 3 +-
dev-db/mariadb/mariadb-10.0.18.ebuild | 115 ---------------------
...riadb-10.0.17.ebuild => mariadb-10.0.19.ebuild} | 8 +-
3 files changed, 5 insertions(+), 121 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0a90346..ae063e3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,5 @@
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-10.0.18.tar.gz 56238153 SHA256 686fee90aaa04a112256d1581336fee734f2d1068784be57a27683ca421a9af5 SHA512 64a093f2d0d9809d77b77cdd067132a8f54e53c5f069bc06340c0b2bcc5938c9c95fcf8e01c3d5140e31455b9c6e2dcbc06e11cc2ae43abd648f811f1ade86eb WHIRLPOOL b1677e5e65bcf8c22b83664b4491e40b31c13c788fa207734c4b3f2808737fa78ccf0d7a70edf1a2f81038dfaed96ab1d2a86912534e457f616e0dd01788b017
+DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
DIST mariadb-10.1.3.tar.gz 52935207 SHA256 565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae WHIRLPOOL 08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
DIST mariadb-10.1.4.tar.gz 53358393 SHA256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512 c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91 WHIRLPOOL d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
diff --git a/dev-db/mariadb/mariadb-10.0.18.ebuild b/dev-db/mariadb/mariadb-10.0.18.ebuild
deleted file mode 100644
index 0ec6ec8..0000000
--- a/dev-db/mariadb/mariadb-10.0.18.ebuild
+++ /dev/null
@@ -1,115 +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/mariadb-10.0.17.ebuild,v 1.2 2015/03/25 18:22:33 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-
-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 ~arm64 ~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}"
-
-# 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
-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}
-
- # 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
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
-
- 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 \
- 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
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
- 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-10.0.17.ebuild b/dev-db/mariadb/mariadb-10.0.19.ebuild
similarity index 94%
rename from dev-db/mariadb/mariadb-10.0.17.ebuild
rename to dev-db/mariadb/mariadb-10.0.19.ebuild
index 0ec6ec8..50df7e1 100644
--- a/dev-db/mariadb/mariadb-10.0.17.ebuild
+++ b/dev-db/mariadb/mariadb-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/mariadb-10.0.17.ebuild,v 1.2 2015/03/25 18:22:33 grknight Exp $
+# $Header: $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -19,7 +19,7 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
# 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
@@ -68,7 +68,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
@@ -79,7 +79,7 @@ multilib_src_test() {
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 \
+ main.mysqld--help main.bootstrap \
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
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-05-07 20:27 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-05-07 20:27 UTC (permalink / raw
To: gentoo-commits
commit: e6b782cc0c9fce14bdb919f7f4fe04eaa122fe7a
Author: layman <layman <AT> localhost>
AuthorDate: Thu May 7 20:27:53 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu May 7 20:27:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e6b782cc
Version bump; needs tests run before importing to portage
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.18.ebuild | 115 ++++++++++++++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index fd007d8..0a90346 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
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-10.0.18.tar.gz 56238153 SHA256 686fee90aaa04a112256d1581336fee734f2d1068784be57a27683ca421a9af5 SHA512 64a093f2d0d9809d77b77cdd067132a8f54e53c5f069bc06340c0b2bcc5938c9c95fcf8e01c3d5140e31455b9c6e2dcbc06e11cc2ae43abd648f811f1ade86eb WHIRLPOOL b1677e5e65bcf8c22b83664b4491e40b31c13c788fa207734c4b3f2808737fa78ccf0d7a70edf1a2f81038dfaed96ab1d2a86912534e457f616e0dd01788b017
DIST mariadb-10.1.3.tar.gz 52935207 SHA256 565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae WHIRLPOOL 08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
DIST mariadb-10.1.4.tar.gz 53358393 SHA256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512 c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91 WHIRLPOOL d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
diff --git a/dev-db/mariadb/mariadb-10.0.18.ebuild b/dev-db/mariadb/mariadb-10.0.18.ebuild
new file mode 100644
index 0000000..0ec6ec8
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.18.ebuild
@@ -0,0 +1,115 @@
+# 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-10.0.17.ebuild,v 1.2 2015/03/25 18:22:33 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+
+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 ~arm64 ~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}"
+
+# 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
+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}
+
+ # 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
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+
+ 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 \
+ 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
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-02-24 17:19 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-02-24 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 438756387ed2b8e36780b1b473c860dac3b3cd72
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 24 17:18:54 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 17:19:12 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=43875638
Version bump for 5.5 series
---
dev-db/mariadb/Manifest | 8 +--
dev-db/mariadb/mariadb-5.5.42.ebuild | 118 +++++++++++++++++++++++++++++++++++
2 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 89f235e..d3493dc 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,15 +1,11 @@
-DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 SHA512 7e7f08d52054ce6ec9f8f3e13369a7faf762f8ddd41129be935a340f51cdb3639687ad877838a8157558106cafd11102d863368610bba4f58b6d2aca415cbb92 WHIRLPOOL 9d4eb91ac9f45e34286d64a4dfcae9a1ba293eb0283c848abe1f25c93692cfb773e9cd18b52ce6bf7c02c08f93a41d047e1bf6366015a55036de68ae4d1e7499
DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3 WHIRLPOOL 916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
DIST mariadb-10.1.2.tar.gz 52586559 SHA256 411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421 WHIRLPOOL 67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
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.39.tar.gz 45084762 SHA256 cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14 SHA512 a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67 WHIRLPOOL d1c3efdb2ff4de1830e8d5f03709b7c7a1e037a07902fce3253473a241b62f15b3ccb54896e4ca048ecd952acc84577cfc0788632a2c4aa77694f86fe48f1089
-DIST mariadb-5.5.40.tar.gz 44745240 SHA256 cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a SHA512 178b77d95bcd72bd8ec7840e77a6c7156379d676ff65eeb9a9f58897c4476f2dcd8f390ddaf12471d836f0224d7dec3aebeaa6fd1589ffae071f1eba4ed60eac WHIRLPOOL 1c6462b73c9ed8a5c7a16d327e066c92280a61ccfe28e5b28ea274fa711df4ae5cc06d7dbab3fa1b225c255ddaa4bbb4dfe71906a6e5ac72de5d550581935213
+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 mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20140817-2320Z.tar.bz2 1495153 SHA256 9a32dcc646c86cb8f9a941f4da6fd9fc183c0bd60faf47331d465e422ff7b8ac SHA512 d4eb8451a894206cc2d1f3431f6106a910495d357cc07b4e6088b545fc39a995a1d230a307467da73c8c6b11efa0eda634150e09a486a9c53fb063c7fa8d9bbc WHIRLPOOL f57573e6d3ca9f37c666848f07f65f963ed70cfe4e3408730e96be68073251a7611cad068c1d84a5fbfe42ee7c5f9e161d7962dcf591e6eae856ef1cfd286e9f
-DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256 b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512 b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e WHIRLPOOL 35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
-DIST mysql-extras-20141125-1930Z.tar.bz2 1494197 SHA256 a150a5680bb505a4187c16bc5a5f3ac09c3a83f71bd66b6cbd6111b8f0d25f8f SHA512 9e3e0cc99a54f936282ab5f5857e4a6308509f8686595f4a248542f43ca661732e26fd4703365c09a276d079c374e7f63bcd0ee6332d2c1b86e80298ac82b296 WHIRLPOOL 90eff797b33c859a0d2ad5fef8c9756ae86130fe21a6414ab95de45a135068d1d327e5e302431e3b78b26629ce66312955da25a9b8250e8b2596ef2ff5d270ad
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
diff --git a/dev-db/mariadb/mariadb-5.5.42.ebuild b/dev-db/mariadb/mariadb-5.5.42.ebuild
new file mode 100644
index 0000000..5a6f1bc
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.42.ebuild
@@ -0,0 +1,118 @@
+# 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 $
+
+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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-02-10 18:36 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-02-10 18:36 UTC (permalink / raw
To: gentoo-commits
commit: f9bca32ce6491c3a4f2979d5ee0d049a68c00203
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 10 18:35:26 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 10 18:35:26 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f9bca32c
Remove tests from mariadb 10.0.16 due to expired certificate in tarball
---
dev-db/mariadb/mariadb-10.0.16.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild b/dev-db/mariadb/mariadb-10.0.16.ebuild
index e9b0d90..692ab85 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.16.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-10.0.16.ebuild,v 1.1 2015/01/28 13:51:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.2 2015/02/08 20:35:57 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -84,6 +84,12 @@ multilib_src_test() {
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
+
# Run mysql tests
pushd "${TESTDIR}"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-01-28 15:51 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-01-28 15:51 UTC (permalink / raw
To: gentoo-commits
commit: e6281e10f893b71c8ff55e626e6cbbfdf87e8e22
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 15:51:38 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 15:51:38 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e6281e10
Update header and manifest
---
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/mariadb-10.0.16.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index fa5e711..89f235e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,5 @@
DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 SHA512 7e7f08d52054ce6ec9f8f3e13369a7faf762f8ddd41129be935a340f51cdb3639687ad877838a8157558106cafd11102d863368610bba4f58b6d2aca415cbb92 WHIRLPOOL 9d4eb91ac9f45e34286d64a4dfcae9a1ba293eb0283c848abe1f25c93692cfb773e9cd18b52ce6bf7c02c08f93a41d047e1bf6366015a55036de68ae4d1e7499
-DIST mariadb-10.0.16.tar.gz 55652009 SHA256 bc1643cc1aee2ee371f0feee3e9e0d1f90fd8c9748372582928d45223d9421bf SHA512 cdd9c0866d0efe0427f45800c9525950008564e9a368831505646a1a3bb90a6bccbd14e746e4a8ac2405721099ba2d64519a42dc26d2713a821cb9de3c875644 WHIRLPOOL a322bf2f11704a58214fa282ba3ce5936ef5023ad6227f630abbc20fa3821a48916113ba4d13240d9d7189d6c2308b06b0bf8033e4dcbf5ece7d2bc8c5f39fc4
+DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3 WHIRLPOOL 916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
DIST mariadb-10.1.2.tar.gz 52586559 SHA256 411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421 WHIRLPOOL 67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild b/dev-db/mariadb/mariadb-10.0.16.ebuild
index fc2fe29..e9b0d90 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.16.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-10.0.15-r1.ebuild,v 1.8 2015/01/25 10:19:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.1 2015/01/28 13:51:27 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2015-01-27 3:41 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2015-01-27 3:41 UTC (permalink / raw
To: gentoo-commits
commit: db86042885c4d2198ace5470699db61e3d899c0e
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 27 03:39:33 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 03:39:33 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=db860428
Version bump
---
dev-db/mariadb/Manifest | 2 +
dev-db/mariadb/mariadb-10.0.16.ebuild | 115 ++++++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0495c21..fa5e711 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,5 @@
DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 SHA512 7e7f08d52054ce6ec9f8f3e13369a7faf762f8ddd41129be935a340f51cdb3639687ad877838a8157558106cafd11102d863368610bba4f58b6d2aca415cbb92 WHIRLPOOL 9d4eb91ac9f45e34286d64a4dfcae9a1ba293eb0283c848abe1f25c93692cfb773e9cd18b52ce6bf7c02c08f93a41d047e1bf6366015a55036de68ae4d1e7499
+DIST mariadb-10.0.16.tar.gz 55652009 SHA256 bc1643cc1aee2ee371f0feee3e9e0d1f90fd8c9748372582928d45223d9421bf SHA512 cdd9c0866d0efe0427f45800c9525950008564e9a368831505646a1a3bb90a6bccbd14e746e4a8ac2405721099ba2d64519a42dc26d2713a821cb9de3c875644 WHIRLPOOL a322bf2f11704a58214fa282ba3ce5936ef5023ad6227f630abbc20fa3821a48916113ba4d13240d9d7189d6c2308b06b0bf8033e4dcbf5ece7d2bc8c5f39fc4
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
DIST mariadb-10.1.2.tar.gz 52586559 SHA256 411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421 WHIRLPOOL 67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
@@ -11,3 +12,4 @@ DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a
DIST mysql-extras-20140817-2320Z.tar.bz2 1495153 SHA256 9a32dcc646c86cb8f9a941f4da6fd9fc183c0bd60faf47331d465e422ff7b8ac SHA512 d4eb8451a894206cc2d1f3431f6106a910495d357cc07b4e6088b545fc39a995a1d230a307467da73c8c6b11efa0eda634150e09a486a9c53fb063c7fa8d9bbc WHIRLPOOL f57573e6d3ca9f37c666848f07f65f963ed70cfe4e3408730e96be68073251a7611cad068c1d84a5fbfe42ee7c5f9e161d7962dcf591e6eae856ef1cfd286e9f
DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256 b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512 b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e WHIRLPOOL 35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
DIST mysql-extras-20141125-1930Z.tar.bz2 1494197 SHA256 a150a5680bb505a4187c16bc5a5f3ac09c3a83f71bd66b6cbd6111b8f0d25f8f SHA512 9e3e0cc99a54f936282ab5f5857e4a6308509f8686595f4a248542f43ca661732e26fd4703365c09a276d079c374e7f63bcd0ee6332d2c1b86e80298ac82b296 WHIRLPOOL 90eff797b33c859a0d2ad5fef8c9756ae86130fe21a6414ab95de45a135068d1d327e5e302431e3b78b26629ce66312955da25a9b8250e8b2596ef2ff5d270ad
+DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild b/dev-db/mariadb/mariadb-10.0.16.ebuild
new file mode 100644
index 0000000..fc2fe29
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.16.ebuild
@@ -0,0 +1,115 @@
+# 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-10.0.15-r1.ebuild,v 1.8 2015/01/25 10:19:12 ago Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+
+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}"
+
+# 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
+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}
+
+ # 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
+ # main.mysql_client_test_comp:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+
+ 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 \
+ 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
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-10-20 20:52 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-10-20 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 726067ca76dcc3383ba40f4da0cea46c0f40c5c7
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 20:50:36 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 20:50:36 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=726067ca
Add new MariaDB alpha version. Still needs work on innodb compression method deps
---
dev-db/mariadb/mariadb-10.1.1_alpha.ebuild | 112 +++++++++++++++++++++++++++++
dev-db/mariadb/metadata.xml | 3 +
2 files changed, 115 insertions(+)
diff --git a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
new file mode 100644
index 0000000..4fb6c32
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+MY_EXTRAS_VER="20140514-0124Z"
+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="~alpha ~amd64 ~arm ~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}"
+
+# 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
+multilib_src_test() {
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ multilib_is_native_abi || return
+
+ # 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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/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:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.unix_socket \
+ 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
+
+ # Run mysql tests
+ pushd "${TESTDIR}" || die
+
+ # run mysql-test tests
+ # Skip all CONNECT engine tests until upstream respondes to how to reference data files
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd || die
+
+ # 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"
+
+ # Cleanup test data after a successful run
+ rm -r "${S}/mysql-test/var-tests"
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index df3c16c..4ff7fec 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -13,6 +13,7 @@ dev-db/mariadb
<flag name='community'>Enables the community features from upstream.</flag>
<flag name='embedded'>Build embedded server (libmysqld)</flag>
<flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+ <flag name='galera'>Enables galera replication</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
<flag name='libevent'>Use libevent for connection handling</flag>
@@ -21,6 +22,8 @@ dev-db/mariadb
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
<flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
<flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+ <flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
+ <flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
<flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-09-26 19:15 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-09-26 19:15 UTC (permalink / raw
To: gentoo-commits
commit: debdaf24fbac68c7e3698ed686e50669c11ead90
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 19:15:00 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 19:15:00 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=debdaf24
sync from tree
---
dev-db/mariadb/mariadb-10.0.14.ebuild | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.14.ebuild b/dev-db/mariadb/mariadb-10.0.14.ebuild
index f202746..8fe9f86 100644
--- a/dev-db/mariadb/mariadb-10.0.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.1 2014/09/26 19:07:01 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140924-1913Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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=''
@@ -55,6 +55,10 @@ multilib_src_test() {
# 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 "${S}"/mysql-test/var-tests{,/log}
@@ -86,7 +90,7 @@ multilib_src_test() {
# run mysql-test tests
# Skip all CONNECT engine tests until upstream respondes to how to reference data files
perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
- --skip-test=connect --parallel=auto
+ --skip-test=connect
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-09-26 16:34 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-09-26 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 1acbd6e18c76044248a130194e2459529837420e
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 16:34:23 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 16:34:23 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1acbd6e1
[mariadb] Version bump. needs test run
---
dev-db/mariadb/Manifest | 4 ++--
.../mariadb/{mariadb-10.0.13.ebuild => mariadb-10.0.14.ebuild} | 10 +++-------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b33c4df..7251554 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,5 @@
DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
-DIST mariadb-10.0.13.tar.gz 51333762 SHA256 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d SHA512 4bee28c1a1f51dde607f59587f7d0281e9677d6af65501238d6ddf9c4fee9b3ab7bc7da8fc7f321fb7d859fbbfec96354bea3c7852ad36c9cae883fbdba22ac1 WHIRLPOOL 524bdf2131d4e090c2cb9a1f5ee7eb64599b0180db9c7f8b4483223d7b28e986f91d81589ded6f3c2df65e5ae0c6b1d218d1c860db8aa8d1c0e45b035cb975a7
+DIST mariadb-10.0.14.tar.gz 51156364 SHA256 ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d SHA512 9bb4466f4a71dd85e5811c3117208a6687815b60075beca341c281f5f919b7d6007d2c706f6916d135c7d1d4b02d57f7afb4d97cfac36a61195d994f8a269f17 WHIRLPOOL 3b1e76bc2f3f668bb73cc4159fc09d1757cb32555ea5a0e40a12112cdf101d0be01d93384e4e28a5247f1ea6e0811ed0582325bcd2e37f253cf79fe2d195ee35
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
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
@@ -9,4 +9,4 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
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
-DIST mysql-extras-20140811-2248Z.tar.bz2 1494408 SHA256 704df7c55261eda39eec8d0a7b90c079bf34d8d013e2f6e61364482c5d95a819 SHA512 906dc9527f16d15e86fc3929ec4ed1be2680895a28168f2ba78305a8c39c04d2e79f5decbda703c84745bd112f7035d07402c6258d0cea877efa716ae9910544 WHIRLPOOL 7fae2dd461e595d74bc4594be4af2bced6270400398e36f1e4181d3948a5204739e030fb58cf3c2ac90001af5806aacaa4460ce1240750ca3eb0868884bf2a5d
+DIST mysql-extras-20140924-1913Z.tar.bz2 1494659 SHA256 958114bbe5fe21220f27b478c67a9ad3edd8d88fc58b528c6e7b5cf20e46dabb SHA512 b5fc435804b5843ecb9e522dbc8c6b5d2bb9bc8a7c39633032aaf566f2a2488fc6c0017a92dd6db95db6c14d06d25c43a67fb2387818a0060611c3c811491037 WHIRLPOOL a6a3b1953180923882de75d2e15cdbbf29f42c90947c88e1b29ceee3a2d8094eb5ee015ce2f38b13dbb84d52120be9e867618c90b655ffeec10d32947ce625d0
diff --git a/dev-db/mariadb/mariadb-10.0.13.ebuild b/dev-db/mariadb/mariadb-10.0.14.ebuild
similarity index 91%
rename from dev-db/mariadb/mariadb-10.0.13.ebuild
rename to dev-db/mariadb/mariadb-10.0.14.ebuild
index d199046..f202746 100644
--- a/dev-db/mariadb/mariadb-10.0.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.14.ebuild
@@ -1,9 +1,9 @@
# 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-10.0.13.ebuild,v 1.1 2014/08/12 17:16:36 grknight Exp $
+# $Header: $
EAPI="5"
-MY_EXTRAS_VER="20140811-2248Z"
+MY_EXTRAS_VER="20140924-1913Z"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
@@ -71,15 +71,11 @@ multilib_src_test() {
# main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # innodb.innodb_simulate_comp_failures_small
- # Has a very long timeout requirement to be consistent
- # Upstream bug MDEV-6546
- #
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 innodb.innodb_simulate_comp_failures_small \
+ main.mysqld--help \
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
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-08-18 23:40 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-08-18 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 3c4b8772b55d693c3440fe99b5de66252681d1a8
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 12 17:18:25 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Aug 12 17:18:59 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3c4b8772
[mariadb] Version bump
---
dev-db/mariadb/Manifest | 17 ++-------------
...db-10.0.11-r1.ebuild => mariadb-10.0.13.ebuild} | 24 ++++++++++++++--------
2 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2d359e2..b33c4df 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
+DIST mariadb-10.0.13.tar.gz 51333762 SHA256 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d SHA512 4bee28c1a1f51dde607f59587f7d0281e9677d6af65501238d6ddf9c4fee9b3ab7bc7da8fc7f321fb7d859fbbfec96354bea3c7852ad36c9cae883fbdba22ac1 WHIRLPOOL 524bdf2131d4e090c2cb9a1f5ee7eb64599b0180db9c7f8b4483223d7b28e986f91d81589ded6f3c2df65e5ae0c6b1d218d1c860db8aa8d1c0e45b035cb975a7
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
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
@@ -12,14 +9,4 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJT4RfDAAoJEE4V4vFnx44daOYH/3SVmrASAVqQ683P6z7qgm3v
-eiYpXSu60NRIK1Jlad4ipekHXzTdC2mVDvU8o+jToAgpfJdTeGV9hdMAsYliA4jU
-ShrMU1sy+SPJYDNbOMUZnjH2H/Cdg9gYDR4ZJJaVKSLATie3hBlOzif0R+Ho1M5r
-adzdrOhxis1h+WsODk4/HGwSvC/fJzxZ9WzcTgoHNJKYNBtpdqcwtHWFsBL/kYWX
-ZUVJr1USdWn6htXFCYnaGgky15I08nX6aQ6IPajv9YPHLYOmrOA8+GZDiNKygaxG
-kGVMm00Cgz+l+wa7E9gi5g0XAroXVi7J6AGz6cnQQdrqdKFMbfd3jtBBlZfDjGc=
-=Xdjy
------END PGP SIGNATURE-----
+DIST mysql-extras-20140811-2248Z.tar.bz2 1494408 SHA256 704df7c55261eda39eec8d0a7b90c079bf34d8d013e2f6e61364482c5d95a819 SHA512 906dc9527f16d15e86fc3929ec4ed1be2680895a28168f2ba78305a8c39c04d2e79f5decbda703c84745bd112f7035d07402c6258d0cea877efa716ae9910544 WHIRLPOOL 7fae2dd461e595d74bc4594be4af2bced6270400398e36f1e4181d3948a5204739e030fb58cf3c2ac90001af5806aacaa4460ce1240750ca3eb0868884bf2a5d
diff --git a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild b/dev-db/mariadb/mariadb-10.0.13.ebuild
similarity index 83%
rename from dev-db/mariadb/mariadb-10.0.11-r1.ebuild
rename to dev-db/mariadb/mariadb-10.0.13.ebuild
index c81f927..d199046 100644
--- a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.13.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.13.ebuild,v 1.1 2014/08/12 17:16:36 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20140729-2200Z"
+MY_EXTRAS_VER="20140811-2248Z"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
@@ -23,7 +23,12 @@ RDEPEND="${RDEPEND}"
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
-src_test() {
+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
@@ -62,18 +67,21 @@ src_test() {
# funcs_1.is_columns_mysql
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
+ # innodb.innodb_simulate_comp_failures_small
+ # Has a very long timeout requirement to be consistent
+ # Upstream bug MDEV-6546
#
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 plugins.unix_socket \
+ main.mysqld--help innodb.innodb_simulate_comp_failures_small \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-08-12 17:19 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-08-12 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 3c4b8772b55d693c3440fe99b5de66252681d1a8
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 12 17:18:25 2014 +0000
Commit: Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Tue Aug 12 17:18:59 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3c4b8772
[mariadb] Version bump
---
dev-db/mariadb/Manifest | 17 ++-------------
...db-10.0.11-r1.ebuild => mariadb-10.0.13.ebuild} | 24 ++++++++++++++--------
2 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2d359e2..b33c4df 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
+DIST mariadb-10.0.13.tar.gz 51333762 SHA256 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d SHA512 4bee28c1a1f51dde607f59587f7d0281e9677d6af65501238d6ddf9c4fee9b3ab7bc7da8fc7f321fb7d859fbbfec96354bea3c7852ad36c9cae883fbdba22ac1 WHIRLPOOL 524bdf2131d4e090c2cb9a1f5ee7eb64599b0180db9c7f8b4483223d7b28e986f91d81589ded6f3c2df65e5ae0c6b1d218d1c860db8aa8d1c0e45b035cb975a7
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
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
@@ -12,14 +9,4 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJT4RfDAAoJEE4V4vFnx44daOYH/3SVmrASAVqQ683P6z7qgm3v
-eiYpXSu60NRIK1Jlad4ipekHXzTdC2mVDvU8o+jToAgpfJdTeGV9hdMAsYliA4jU
-ShrMU1sy+SPJYDNbOMUZnjH2H/Cdg9gYDR4ZJJaVKSLATie3hBlOzif0R+Ho1M5r
-adzdrOhxis1h+WsODk4/HGwSvC/fJzxZ9WzcTgoHNJKYNBtpdqcwtHWFsBL/kYWX
-ZUVJr1USdWn6htXFCYnaGgky15I08nX6aQ6IPajv9YPHLYOmrOA8+GZDiNKygaxG
-kGVMm00Cgz+l+wa7E9gi5g0XAroXVi7J6AGz6cnQQdrqdKFMbfd3jtBBlZfDjGc=
-=Xdjy
------END PGP SIGNATURE-----
+DIST mysql-extras-20140811-2248Z.tar.bz2 1494408 SHA256 704df7c55261eda39eec8d0a7b90c079bf34d8d013e2f6e61364482c5d95a819 SHA512 906dc9527f16d15e86fc3929ec4ed1be2680895a28168f2ba78305a8c39c04d2e79f5decbda703c84745bd112f7035d07402c6258d0cea877efa716ae9910544 WHIRLPOOL 7fae2dd461e595d74bc4594be4af2bced6270400398e36f1e4181d3948a5204739e030fb58cf3c2ac90001af5806aacaa4460ce1240750ca3eb0868884bf2a5d
diff --git a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild b/dev-db/mariadb/mariadb-10.0.13.ebuild
similarity index 83%
rename from dev-db/mariadb/mariadb-10.0.11-r1.ebuild
rename to dev-db/mariadb/mariadb-10.0.13.ebuild
index c81f927..d199046 100644
--- a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.13.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.13.ebuild,v 1.1 2014/08/12 17:16:36 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20140729-2200Z"
+MY_EXTRAS_VER="20140811-2248Z"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
@@ -23,7 +23,12 @@ RDEPEND="${RDEPEND}"
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
-src_test() {
+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
@@ -62,18 +67,21 @@ src_test() {
# funcs_1.is_columns_mysql
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # main.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
+ # innodb.innodb_simulate_comp_failures_small
+ # Has a very long timeout requirement to be consistent
+ # Upstream bug MDEV-6546
#
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 plugins.unix_socket \
+ main.mysqld--help innodb.innodb_simulate_comp_failures_small \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib_disable_test "$t" "False positives in Gentoo"
done
# Run mysql tests
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-08-05 17:50 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-08-05 17:50 UTC (permalink / raw
To: gentoo-commits
commit: aef82d90617fac23616e9ddf8309f43a4fa6db8c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 5 17:43:31 2014 +0000
Commit: Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Tue Aug 5 17:43:31 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=aef82d90
[mariadb] Version bump Bug 518718
Package-Manager: portage-2.2.11
Manifest-Sign-Key: 67C78E1D
---
dev-db/mariadb/ChangeLog | 8 +++++++-
dev-db/mariadb/Manifest | 16 +++++++++++++++-
.../{mariadb-5.5.38-r1.ebuild => mariadb-5.5.39.ebuild} | 7 ++++---
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 6a9d494..dfc3b0e 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.39 (05 Aug 2014)
+
+ 05 Aug 2014; <grknight@gentoo.org> +mariadb-5.5.39.ebuild,
+ -mariadb-5.5.38-r1.ebuild:
+ [mariadb] Version bump Bug 518718
+
*mariadb-10.0.7 (30 Dec 2013)
30 Dec 2013; Brian Evans <grknight@tuffmail.com> files/my.cnf-5.5,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6467960..2d359e2 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,11 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
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-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJT4RfDAAoJEE4V4vFnx44daOYH/3SVmrASAVqQ683P6z7qgm3v
+eiYpXSu60NRIK1Jlad4ipekHXzTdC2mVDvU8o+jToAgpfJdTeGV9hdMAsYliA4jU
+ShrMU1sy+SPJYDNbOMUZnjH2H/Cdg9gYDR4ZJJaVKSLATie3hBlOzif0R+Ho1M5r
+adzdrOhxis1h+WsODk4/HGwSvC/fJzxZ9WzcTgoHNJKYNBtpdqcwtHWFsBL/kYWX
+ZUVJr1USdWn6htXFCYnaGgky15I08nX6aQ6IPajv9YPHLYOmrOA8+GZDiNKygaxG
+kGVMm00Cgz+l+wa7E9gi5g0XAroXVi7J6AGz6cnQQdrqdKFMbfd3jtBBlZfDjGc=
+=Xdjy
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.38-r1.ebuild b/dev-db/mariadb/mariadb-5.5.39.ebuild
similarity index 94%
rename from dev-db/mariadb/mariadb-5.5.38-r1.ebuild
rename to dev-db/mariadb/mariadb-5.5.39.ebuild
index 1d9bea7..24aa609 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: $
+# $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"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-06-17 5:37 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-06-17 5:37 UTC (permalink / raw
To: gentoo-commits
commit: 5616c395583ce19c87641b5f03a7ef337a7d0c34
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 17 05:37:01 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Jun 17 05:37:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5616c395
[mariadb] Version bump on 5.5 and 10.0 series. Test pass
---
dev-db/mariadb/Manifest | 3 ++-
dev-db/mariadb/{mariadb-10.0.11.ebuild => mariadb-10.0.12.ebuild} | 2 +-
dev-db/mariadb/{mariadb-5.5.37-r1.ebuild => mariadb-5.5.38.ebuild} | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e35cde5..f35ad67 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,9 @@
DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
+DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
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.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
+DIST mariadb-5.5.38.tar.gz 45083505 SHA256 efc839e6627064b3b5c6c39854198f0d34907f48937804758d4c09c7717be8d3 SHA512 f83e501cb1c99ad17ba3e1c2fd2aa306664a16e22f71ac73013f04def6532ec1f678dade4075ab4bcbbb04ac2c4aea1cc72fd98a1fe23b17e314414ee0bc17f5 WHIRLPOOL a07f284e0a8615426f26af3698261c1d4edd4b1fcbe5190f33a0756e5d29e9ec84d38b454ca6c3f9f4edd1e009f59e06a6d3e99a2967ccdb49cbbaa02f7bb57d
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
diff --git a/dev-db/mariadb/mariadb-10.0.11.ebuild b/dev-db/mariadb/mariadb-10.0.12.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.0.11.ebuild
rename to dev-db/mariadb/mariadb-10.0.12.ebuild
index bc48682..8b83df0 100644
--- a/dev-db/mariadb/mariadb-10.0.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.12.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
MY_EXTRAS_VER="20140514-0124Z"
# Build system
diff --git a/dev-db/mariadb/mariadb-5.5.37-r1.ebuild b/dev-db/mariadb/mariadb-5.5.38.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-5.5.37-r1.ebuild
rename to dev-db/mariadb/mariadb-5.5.38.ebuild
index 448d84c..d027735 100644
--- a/dev-db/mariadb/mariadb-5.5.37-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.38.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
MY_EXTRAS_VER="20140426-0232Z"
# Build system
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-05-14 2:31 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-05-14 2:31 UTC (permalink / raw
To: gentoo-commits
commit: ebf6e663a90951a7a75da539744c92455c25fea1
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 02:30:22 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed May 14 02:31:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ebf6e663
[mariadb] Set extras version on 10.0.11, remove old
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.10-r1.ebuild | 110 -------------------------------
dev-db/mariadb/mariadb-10.0.11.ebuild | 2 +-
3 files changed, 2 insertions(+), 111 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index a5f91d1..4b914b9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,3 +6,4 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
+DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
diff --git a/dev-db/mariadb/mariadb-10.0.10-r1.ebuild b/dev-db/mariadb/mariadb-10.0.10-r1.ebuild
deleted file mode 100644
index 33c48c8..0000000
--- a/dev-db/mariadb/mariadb-10.0.10-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# 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 ~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}"
-
-# 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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/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:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
- 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
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
- 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-10.0.11.ebuild b/dev-db/mariadb/mariadb-10.0.11.ebuild
index 33c48c8..bc48682 100644
--- a/dev-db/mariadb/mariadb-10.0.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.11.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140514-0124Z"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-05-13 1:31 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-05-13 1:31 UTC (permalink / raw
To: gentoo-commits
commit: faf8cf71d0d81778587948f1dfac99700ace0291
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 01:31:09 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue May 13 01:31:09 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=faf8cf71
[mariadb] Version bump, binlog.binlog_old_versions test failed
---
dev-db/mariadb/Manifest | 3 +--
dev-db/mariadb/{mariadb-10.0.10.ebuild => mariadb-10.0.11.ebuild} | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2068db1..a5f91d1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,9 +1,8 @@
DIST mariadb-10.0.10.tar.gz 51946792 SHA256 66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512 806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948 WHIRLPOOL 79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
-DIST mariadb-10.0.9.tar.gz 51614120 SHA256 301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512 2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064 WHIRLPOOL 0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
+DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
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.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild b/dev-db/mariadb/mariadb-10.0.11.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.0.10.ebuild
rename to dev-db/mariadb/mariadb-10.0.11.ebuild
index 108d8bf..33c48c8 100644
--- a/dev-db/mariadb/mariadb-10.0.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.11.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20140424-1043Z"
+MY_EXTRAS_VER="live"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-04-26 19:10 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-04-26 19:10 UTC (permalink / raw
To: gentoo-commits
commit: b5b9cc85253b7dcb6269ca846373b40f09353dd8
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Apr 25 01:58:45 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sat Apr 26 19:10:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b5b9cc85
[mariadb] Drop old
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
---
dev-db/mariadb/mariadb-10.0.9_rc.ebuild | 110 --------------------------------
1 file changed, 110 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild b/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
deleted file mode 100644
index d4a66b7..0000000
--- a/dev-db/mariadb/mariadb-10.0.9_rc.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# 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 ~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}"
-
-# 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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/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:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
- 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
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-04-24 10:59 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-04-24 10:59 UTC (permalink / raw
To: gentoo-commits
commit: a220f33c5310b986d5bcbf6538f8bf5dfc5d545f
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 10:57:10 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 10:57:10 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a220f33c
Use a release mysql-extras. Fix copyright date.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.10.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.37.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8c16e7c..a3be6b9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,3 +5,4 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
+DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild b/dev-db/mariadb/mariadb-10.0.10.ebuild
index d4a66b7..108d8bf 100644
--- a/dev-db/mariadb/mariadb-10.0.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140424-1043Z"
# Build system
BUILD="cmake"
diff --git a/dev-db/mariadb/mariadb-5.5.37.ebuild b/dev-db/mariadb/mariadb-5.5.37.ebuild
index 8cdf607..1cb0a55 100644
--- a/dev-db/mariadb/mariadb-5.5.37.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.37.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140424-1043Z"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-04-17 17:24 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-04-17 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 054502f532301255028c15eb0622b235ad624379
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Apr 17 17:23:07 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Apr 17 17:23:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=054502f5
[mariadb] Version bump
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
---
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/{mariadb-5.5.36.ebuild => mariadb-5.5.37.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 56b9e34..8c16e7c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,5 +3,5 @@ DIST mariadb-10.0.9.tar.gz 51614120 SHA256 301320ade949a80f16a83b140a068278d234b
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.36.tar.gz 45767693 SHA256 16f2cc9c219b4fbe0b3e97f14d1ed6fd8b7d377b22b95f31adae91965e36bb0c SHA512 b7de14f4d4a08f51aae339779c59798f3ed110aa3d65038c39514161ee73b6cc95f95fe1b15434daf33de689b0d7351cbf7a1c90ca980f0f020b085ef23aa016 WHIRLPOOL 439e10efedf90f0a66e2e166728ade1e7112049802ac76fc83a5dd64a62daadbad1eb91d437f71ab36b5e2a6f5a0911cd6625b9b726c831057b44b38bf482593
+DIST mariadb-5.5.37.tar.gz 46078042 SHA256 a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c SHA512 aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 WHIRLPOOL 2c5ad8c4531c5a333bd88e1f281a1f7cbb9051b2fb20426b1f3c7ab80148428515149298dfc9e68ee7d0ef86ebfcc4eceb4eda68582916a4ed42edc67dc21327
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/mariadb-5.5.36.ebuild b/dev-db/mariadb/mariadb-5.5.37.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.36.ebuild
rename to dev-db/mariadb/mariadb-5.5.37.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-03-31 15:27 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-03-31 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 21a81c273991c246374a2e1562183ab985f35d79
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Mar 31 15:27:17 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Mar 31 15:27:17 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=21a81c27
[mariadb] Version bump for 10.0.10 GA
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.10.ebuild | 110 ++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0c3263f..56b9e34 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,4 @@
+DIST mariadb-10.0.10.tar.gz 51946792 SHA256 66e9700c283e026b00d399dd98d6a1712cda573026e78c205dc639665d7bd8bf SHA512 806b32cbfe9e90656bfa62f9aac96c39688a94105e048465d58d7624a989290f92250555cf3de2cba3ce18391e41aa349e7139d4e7739e061fbd2c7ee30ba948 WHIRLPOOL 79a2e8a9ca8616ffc4118b3c40cb0d6d135d648c31d97a1182206bb078db72768e0ea611910669926f95d9c7969a6d418b608d4a2646e17f88c67c92ddfc93bf
DIST mariadb-10.0.9.tar.gz 51614120 SHA256 301320ade949a80f16a83b140a068278d234bd808b620e06cc0ba111cb968b40 SHA512 2c9a7179fed3249ad0574e524ea87d35c6c65f68232575af58acb724724d29a2bb89637de2f769408e40772e5a3330e07daec73f8a5764bbd2d3242a100f0064 WHIRLPOOL 0058bd1a0b6f0e7ea4e06d61a1a64ff76aa0bc87c0c69904d42f1a784a59a43f31c24c73e50301895fa0d9ef979f6b11f08d2f7fe07cbe24de4c5dc91e848279
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
diff --git a/dev-db/mariadb/mariadb-10.0.10.ebuild b/dev-db/mariadb/mariadb-10.0.10.ebuild
new file mode 100644
index 0000000..d4a66b7
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.10.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# 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 ~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}"
+
+# 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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/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:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.unix_socket \
+ 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
+ # Skip all CONNECT engine tests until upstream respondes to how to reference data files
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-25 18:05 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-02-25 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 8994d442d6d0f24e10b07bc69d38417c9989f226
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Feb 25 18:05:07 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Feb 25 18:05:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8994d442
[mariadb] Fix Manifest
---
dev-db/mariadb/Manifest | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index fe182ff..1623cb0 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,10 +1,7 @@
-DIST mariadb-10.0.7.tar.gz 51365829 SHA256 71422d8106c038fa4723e6e040fa149030e193545078402f661d793f81e3fe7b SHA512 e5e827ae42594a9b071bc01864a3ab3de2e873baeacb4364e08e4e27e7dc6214fa63e481cf0521426b9a2b0899311ff8cc95682cf3dd5161c466a290921b8314 WHIRLPOOL 740453867f03286687e0ad381793e5c254285a574398a2f2003993fa554e077d1ef2b126d90ea47e39e99bb298a1f9e495ada1b99adfb82c5531dcfe8cfc0d31
DIST mariadb-10.0.8.tar.gz 51547358 SHA256 1240012d6c39fcb0dbd19f0697b833da3a612c8be802accb89cee6e369c4a7a8 SHA512 8d86a474cf6998a9e1c3c5c6ccb651d401652ce176e53c681fe02c12627089e0c29f5b786f351ce0b3c02ac200b11d82c0ad1de7e06a861579991fda13c07ae9 WHIRLPOOL fe703662c6914d7f91069e6776d00093dd34c32144d8a91c1614cddf309590bbe3c9e6613cdaadacd7d45e51a1ec90ba7f96a99c1a0811d8370d926e856afb56
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.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88
-DIST mariadb-5.5.35.tar.gz 45723697 SHA256 b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e SHA512 fe456d3bd63d78ec65ff4a9db182d18f02e6a04f5513d911d525743f0bb8bef74a5c3d058845eb6c5e9195c901c6afef51f453a9b836e8d432d12e62da041d8d WHIRLPOOL b58c1d979083bcc0e5f16dc1277c25fbc83ef33bee891e15216d8363496b7e488334d4dd40cae1763a53f09690b639df845ac23b4c8008330f76e12d58d0d407
-DIST mariadb-5.5.36.tar.gz 45761732 SHA256 9eb5dc8b717773821c11dc2580028093908dc2073c3df3044d54f083ac85fcf9 SHA512 c8e60fbc474b19974d690d750287ce0a2e4d630c0e21fc47185ff6e48a5cbe03ae00af09d7e64cb1f616d7b3b085b95b24997ca8a42b9d1341f6b8f654e3ceda WHIRLPOOL 20ba056bd19ad48b0682f26e0ebeb62e55d69cd360d953e2293e73e0de2cbb6f84bf49736a226b7b835647656846ad2d477ef4cdf74b4784a33668d7a55d17e8
+DIST mariadb-5.5.36.tar.gz 45767693 SHA256 16f2cc9c219b4fbe0b3e97f14d1ed6fd8b7d377b22b95f31adae91965e36bb0c SHA512 b7de14f4d4a08f51aae339779c59798f3ed110aa3d65038c39514161ee73b6cc95f95fe1b15434daf33de689b0d7351cbf7a1c90ca980f0f020b085ef23aa016 WHIRLPOOL 439e10efedf90f0a66e2e166728ade1e7112049802ac76fc83a5dd64a62daadbad1eb91d437f71ab36b5e2a6f5a0911cd6625b9b726c831057b44b38bf482593
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-25 14:23 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-02-25 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 1d869d2d8ba338c1fb06e4fc0f9ac584fbcc1491
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Feb 25 14:23:27 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Feb 25 14:23:27 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1d869d2d
[mariadb] Remove old
---
dev-db/mariadb/mariadb-10.0.7.ebuild | 125 ---------------------------------
dev-db/mariadb/mariadb-5.5.34.ebuild | 131 -----------------------------------
dev-db/mariadb/mariadb-5.5.35.ebuild | 116 -------------------------------
3 files changed, 372 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.7.ebuild b/dev-db/mariadb/mariadb-10.0.7.ebuild
deleted file mode 100644
index 939a4ca..0000000
--- a/dev-db/mariadb/mariadb-10.0.7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# 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 ~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}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl 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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
- 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.34.ebuild b/dev-db/mariadb/mariadb-5.5.34.ebuild
deleted file mode 100644
index 580a6ac..0000000
--- a/dev-db/mariadb/mariadb-5.5.34.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20140121-1138Z"
-
-# 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 ~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 community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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
- # 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.35.ebuild b/dev-db/mariadb/mariadb-5.5.35.ebuild
deleted file mode 100644
index 6431c06..0000000
--- a/dev-db/mariadb/mariadb-5.5.35.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20140121-1138Z"
-
-# 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 ~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 community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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
- # 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.
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-25 14:05 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-02-25 14:05 UTC (permalink / raw
To: gentoo-commits
commit: 68e4116c24dd0d63628eed6e8cf4b43156817190
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Feb 25 14:05:03 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Feb 25 14:05:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=68e4116c
[mariadb] Bump to 5.5.36. All tests pass
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.36.ebuild | 113 +++++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 28bfa2f..fe182ff 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,5 +5,6 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88
DIST mariadb-5.5.35.tar.gz 45723697 SHA256 b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e SHA512 fe456d3bd63d78ec65ff4a9db182d18f02e6a04f5513d911d525743f0bb8bef74a5c3d058845eb6c5e9195c901c6afef51f453a9b836e8d432d12e62da041d8d WHIRLPOOL b58c1d979083bcc0e5f16dc1277c25fbc83ef33bee891e15216d8363496b7e488334d4dd40cae1763a53f09690b639df845ac23b4c8008330f76e12d58d0d407
+DIST mariadb-5.5.36.tar.gz 45761732 SHA256 9eb5dc8b717773821c11dc2580028093908dc2073c3df3044d54f083ac85fcf9 SHA512 c8e60fbc474b19974d690d750287ce0a2e4d630c0e21fc47185ff6e48a5cbe03ae00af09d7e64cb1f616d7b3b085b95b24997ca8a42b9d1341f6b8f654e3ceda WHIRLPOOL 20ba056bd19ad48b0682f26e0ebeb62e55d69cd360d953e2293e73e0de2cbb6f84bf49736a226b7b835647656846ad2d477ef4cdf74b4784a33668d7a55d17e8
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
diff --git a/dev-db/mariadb/mariadb-5.5.36.ebuild b/dev-db/mariadb/mariadb-5.5.36.ebuild
new file mode 100644
index 0000000..0e7fbaa
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.36.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20140121-1138Z"
+
+# 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 ~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 community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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
+ # 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-10 18:45 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-02-10 18:45 UTC (permalink / raw
To: gentoo-commits
commit: c079dd4adb92b5cfacee86652b874f1a3f8ec5c9
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Feb 10 18:45:36 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Feb 10 18:45:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c079dd4a
[mariadb] Version bump for 10.0 Tests pass
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.8.ebuild | 110 +++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 79661f2..28bfa2f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,5 @@
DIST mariadb-10.0.7.tar.gz 51365829 SHA256 71422d8106c038fa4723e6e040fa149030e193545078402f661d793f81e3fe7b SHA512 e5e827ae42594a9b071bc01864a3ab3de2e873baeacb4364e08e4e27e7dc6214fa63e481cf0521426b9a2b0899311ff8cc95682cf3dd5161c466a290921b8314 WHIRLPOOL 740453867f03286687e0ad381793e5c254285a574398a2f2003993fa554e077d1ef2b126d90ea47e39e99bb298a1f9e495ada1b99adfb82c5531dcfe8cfc0d31
+DIST mariadb-10.0.8.tar.gz 51547358 SHA256 1240012d6c39fcb0dbd19f0697b833da3a612c8be802accb89cee6e369c4a7a8 SHA512 8d86a474cf6998a9e1c3c5c6ccb651d401652ce176e53c681fe02c12627089e0c29f5b786f351ce0b3c02ac200b11d82c0ad1de7e06a861579991fda13c07ae9 WHIRLPOOL fe703662c6914d7f91069e6776d00093dd34c32144d8a91c1614cddf309590bbe3c9e6613cdaadacd7d45e51a1ec90ba7f96a99c1a0811d8370d926e856afb56
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
diff --git a/dev-db/mariadb/mariadb-10.0.8.ebuild b/dev-db/mariadb/mariadb-10.0.8.ebuild
new file mode 100644
index 0000000..da480fd
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# 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 ~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}"
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl 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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/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:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help plugins.unix_socket \
+ 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
+ # Skip all CONNECT engine tests until upstream respondes to how to reference data files
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-06 18:12 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-02-06 18:12 UTC (permalink / raw
To: gentoo-commits
commit: bcbb9ec330181aa5d6341edb6a937b9b06d3cec3
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Feb 6 17:38:32 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Feb 6 17:38:32 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bcbb9ec3
[mariadb] Remove some test exceptions that were fixed
---
dev-db/mariadb/mariadb-5.5.35.ebuild | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.5.35.ebuild b/dev-db/mariadb/mariadb-5.5.35.ebuild
index 580a6ac..6431c06 100644
--- a/dev-db/mariadb/mariadb-5.5.35.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.35.ebuild
@@ -75,28 +75,13 @@ src_test() {
# main.mysql_client_test, main.mysql_client_test_nonblock:
# segfaults at random under Portage only, suspect resource limits.
#
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
# plugins.unix_socket
# fails because portage strips out the USER enviornment variable
#
for t in main.mysql_client_test main.mysql_client_test_nonblock \
binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ main.mysqld--help plugins.unix_socket \
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
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-05 16:29 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-02-05 16:29 UTC (permalink / raw
To: gentoo-commits
commit: e3af7cb2d89613c364c165de3c288486871a03da
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 16:26:54 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 16:26:54 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e3af7cb2
Restore mysql-5.5.34 per regression reported on bug 490580 by Vasilis Lourdas.
---
dev-db/mariadb/Manifest | 4 --
dev-db/mariadb/mariadb-5.5.34.ebuild | 131 +++++++++++++++++++++++++++++++++++
2 files changed, 131 insertions(+), 4 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9104a44..79661f2 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,12 +1,8 @@
-DIST mariadb-10.0.6.tar.gz 50375294 SHA256 da382b3acf90b05f5bdc1e4a7cd57e9903182d8247f1f48c4d5afe9e4211c174 SHA512 97a86c0611a5ae4e8ea28b4879f67682d5100db9e2f9340e7e2aad60e638e9f34164740c4259cf0c2bb701aef0b80181fea1923e8401e61039c159783db8cfcf WHIRLPOOL c3ec49d5106ac0bc011275a944acba93ecec9c3e37f01f0e1be73f133405d213423a5d3c1619986fa60d6272bf39e4a29bc4f464d4a2205e0a526e477a6387a3
DIST mariadb-10.0.7.tar.gz 51365829 SHA256 71422d8106c038fa4723e6e040fa149030e193545078402f661d793f81e3fe7b SHA512 e5e827ae42594a9b071bc01864a3ab3de2e873baeacb4364e08e4e27e7dc6214fa63e481cf0521426b9a2b0899311ff8cc95682cf3dd5161c466a290921b8314 WHIRLPOOL 740453867f03286687e0ad381793e5c254285a574398a2f2003993fa554e077d1ef2b126d90ea47e39e99bb298a1f9e495ada1b99adfb82c5531dcfe8cfc0d31
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.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
-DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b
DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88
DIST mariadb-5.5.35.tar.gz 45723697 SHA256 b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e SHA512 fe456d3bd63d78ec65ff4a9db182d18f02e6a04f5513d911d525743f0bb8bef74a5c3d058845eb6c5e9195c901c6afef51f453a9b836e8d432d12e62da041d8d WHIRLPOOL b58c1d979083bcc0e5f16dc1277c25fbc83ef33bee891e15216d8363496b7e488334d4dd40cae1763a53f09690b639df845ac23b4c8008330f76e12d58d0d407
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
diff --git a/dev-db/mariadb/mariadb-5.5.34.ebuild b/dev-db/mariadb/mariadb-5.5.34.ebuild
new file mode 100644
index 0000000..580a6ac
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.34.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20140121-1138Z"
+
+# 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 ~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 community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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
+ # 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-02-01 2:12 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-02-01 2:12 UTC (permalink / raw
To: gentoo-commits
commit: 9cfaa76180238afde147bf497e348561fd080003
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 02:11:47 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 02:11:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9cfaa761
Clean-up mariadb versions.
---
dev-db/mariadb/mariadb-10.0.6.ebuild | 132 -------------------------------
dev-db/mariadb/mariadb-5.5.32-r1.ebuild | 128 ------------------------------
dev-db/mariadb/mariadb-5.5.32.ebuild | 128 ------------------------------
dev-db/mariadb/mariadb-5.5.33a-r1.ebuild | 128 ------------------------------
dev-db/mariadb/mariadb-5.5.34.ebuild | 131 ------------------------------
5 files changed, 647 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.6.ebuild b/dev-db/mariadb/mariadb-10.0.6.ebuild
deleted file mode 100644
index cbc4c51..0000000
--- a/dev-db/mariadb/mariadb-10.0.6.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# 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 ~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}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl 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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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
-
- for t in plugins.show_all_plugins roles.create_and_drop_role_invalid_user_table ; do
- mysql-v2_disable_test "$t" "False postives due to hard coded versions"
- done
-
- # Confirmed with upstream
- mysql-v2_disable_test "rpl.rpl_row_func003" "Random failure with GTID"
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
- 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.32-r1.ebuild b/dev-db/mariadb/mariadb-5.5.32-r1.ebuild
deleted file mode 100644
index 5c14476..0000000
--- a/dev-db/mariadb/mariadb-5.5.32-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20140121-1138Z"
-
-# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.32.ebuild b/dev-db/mariadb/mariadb-5.5.32.ebuild
deleted file mode 100644
index 7e94379..0000000
--- a/dev-db/mariadb/mariadb-5.5.32.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.33a-r1.ebuild b/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
deleted file mode 100644
index 57edaca..0000000
--- a/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.34.ebuild b/dev-db/mariadb/mariadb-5.5.34.ebuild
deleted file mode 100644
index 580a6ac..0000000
--- a/dev-db/mariadb/mariadb-5.5.34.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20140121-1138Z"
-
-# 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 ~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 community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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
- # 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2014-01-30 3:01 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2014-01-30 3:01 UTC (permalink / raw
To: gentoo-commits
commit: 99356f5af71aca48159f02c41963386cfe60a2d2
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Jan 30 03:01:07 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Jan 30 03:01:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=99356f5a
[mariadb] Version bump 5.5.35 Tests pass
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.35.ebuild | 131 +++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 97eff4c..9104a44 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,6 +6,7 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b
DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88
+DIST mariadb-5.5.35.tar.gz 45723697 SHA256 b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e SHA512 fe456d3bd63d78ec65ff4a9db182d18f02e6a04f5513d911d525743f0bb8bef74a5c3d058845eb6c5e9195c901c6afef51f453a9b836e8d432d12e62da041d8d WHIRLPOOL b58c1d979083bcc0e5f16dc1277c25fbc83ef33bee891e15216d8363496b7e488334d4dd40cae1763a53f09690b639df845ac23b4c8008330f76e12d58d0d407
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
diff --git a/dev-db/mariadb/mariadb-5.5.35.ebuild b/dev-db/mariadb/mariadb-5.5.35.ebuild
new file mode 100644
index 0000000..580a6ac
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.35.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20140121-1138Z"
+
+# 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 ~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 community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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
+ # 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-11-22 13:39 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-11-22 13:39 UTC (permalink / raw
To: gentoo-commits
commit: fdf13c718cd5c011c1c804995a3b7979c107de4c
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Nov 22 13:39:04 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Nov 22 13:39:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fdf13c71
[mariadb] Version bump
Package-Manager: portage-2.2.7
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.34.ebuild | 131 +++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 3011fcd..9fce537 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.34 (22 Nov 2013)
+
+ 22 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.34.ebuild:
+ [mariadb] Version bump
+
19 Nov 2013; Brian Evans <grknight@tuffmail.com> -mariadb-10.0.1.ebuild,
-mariadb-10.0.2.ebuild, -mariadb-10.0.3.ebuild, -mariadb-5.5.31.ebuild:
[mariadb] Drop old
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e70a566..96885c8 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,5 +5,6 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b
+DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.34.ebuild b/dev-db/mariadb/mariadb-5.5.34.ebuild
new file mode 100644
index 0000000..947551b
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.34.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# 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 ~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 community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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
+ # 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-11-19 16:24 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-11-19 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 2cf879504f631e9b9fe4b7df2109130d76625578
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Nov 19 16:24:13 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Nov 19 16:24:13 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2cf87950
[mariadb] Drop old
Package-Manager: portage-2.2.7
---
dev-db/mariadb/ChangeLog | 4 ++
dev-db/mariadb/Manifest | 4 --
dev-db/mariadb/mariadb-10.0.1.ebuild | 124 ---------------------------------
dev-db/mariadb/mariadb-10.0.2.ebuild | 124 ---------------------------------
dev-db/mariadb/mariadb-10.0.3.ebuild | 124 ---------------------------------
dev-db/mariadb/mariadb-5.5.31.ebuild | 128 -----------------------------------
6 files changed, 4 insertions(+), 504 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index ab3a4a7..3011fcd 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Nov 2013; Brian Evans <grknight@tuffmail.com> -mariadb-10.0.1.ebuild,
+ -mariadb-10.0.2.ebuild, -mariadb-10.0.3.ebuild, -mariadb-5.5.31.ebuild:
+ [mariadb] Drop old
+
*mariadb-10.0.6 (19 Nov 2013)
19 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.6.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d38cd59..e70a566 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,12 +1,8 @@
-DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
-DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
-DIST mariadb-10.0.3.tar.gz 29969048 SHA256 6283ec23a68f4765fea9579b587eb78be013aeb61d04e4d7b63a3f552ffb2c35 SHA512 a371ca441f639e58a5a437abd33ef2fa0d152213add3b7bd708e15e26243efb3c15c3d974c3b72f2c6ee317f09f14299395670d7eba0bf078995b06a034ac7d3 WHIRLPOOL 4933770042ce30b03263a3cabad3a3937cd715629a09183551ded9cf73e652417bc615b1c5defde3344870cc2e42ba400a23c99751e0fe30a920b0a788230a25
DIST mariadb-10.0.4.tar.gz 31104543 SHA256 f04fa28452cf27ea5ce9fb443a407a233402831559c258dd81caa4908be72af9 SHA512 337b1801a12aa29b65025436b41fb1857f1deca85825dde72cc8f30e5e24ce62ad702125bb41d95316d2b096f88a32e18649bfa57b077acba7b57d93a5b0b398 WHIRLPOOL f6c8c7d23853b1b41d53b5a1dd4381d6d4c30aabf7699fe4a5dd0530cb8782ab7f82960ae049ee52dfe16946c42b0019570ba39a9ef83b764a3b1052afa8f6f8
DIST mariadb-10.0.6.tar.gz 50375294 SHA256 da382b3acf90b05f5bdc1e4a7cd57e9903182d8247f1f48c4d5afe9e4211c174 SHA512 97a86c0611a5ae4e8ea28b4879f67682d5100db9e2f9340e7e2aad60e638e9f34164740c4259cf0c2bb701aef0b80181fea1923e8401e61039c159783db8cfcf WHIRLPOOL c3ec49d5106ac0bc011275a944acba93ecec9c3e37f01f0e1be73f133405d213423a5d3c1619986fa60d6272bf39e4a29bc4f464d4a2205e0a526e477a6387a3
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.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/mariadb-10.0.1.ebuild b/dev-db/mariadb/mariadb-10.0.1.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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-10.0.2.ebuild b/dev-db/mariadb/mariadb-10.0.2.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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-10.0.3.ebuild b/dev-db/mariadb/mariadb-10.0.3.ebuild
deleted file mode 100644
index 262e97b..0000000
--- a/dev-db/mariadb/mariadb-10.0.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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}"
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.31.ebuild b/dev-db/mariadb/mariadb-5.5.31.ebuild
deleted file mode 100644
index 7e94379..0000000
--- a/dev-db/mariadb/mariadb-5.5.31.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-11-19 15:19 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-11-19 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 8b2e51a06fb919de1285eff22a3e36f0ef4a4ac8
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Nov 19 15:17:57 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Nov 19 15:17:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8b2e51a0
[mariadb] Version bump to 10.0.6
Package-Manager: portage-2.2.7
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.6.ebuild | 132 +++++++++++++++++++++++++++++++++++
3 files changed, 138 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 12e2ac1..ab3a4a7 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-10.0.6 (19 Nov 2013)
+
+ 19 Nov 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.6.ebuild:
+ [mariadb] Version bump to 10.0.6
+
*mariadb-10.0.4 (09 Oct 2013)
09 Oct 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.4.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ae6150f..d38cd59 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -2,6 +2,7 @@ DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e75
DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
DIST mariadb-10.0.3.tar.gz 29969048 SHA256 6283ec23a68f4765fea9579b587eb78be013aeb61d04e4d7b63a3f552ffb2c35 SHA512 a371ca441f639e58a5a437abd33ef2fa0d152213add3b7bd708e15e26243efb3c15c3d974c3b72f2c6ee317f09f14299395670d7eba0bf078995b06a034ac7d3 WHIRLPOOL 4933770042ce30b03263a3cabad3a3937cd715629a09183551ded9cf73e652417bc615b1c5defde3344870cc2e42ba400a23c99751e0fe30a920b0a788230a25
DIST mariadb-10.0.4.tar.gz 31104543 SHA256 f04fa28452cf27ea5ce9fb443a407a233402831559c258dd81caa4908be72af9 SHA512 337b1801a12aa29b65025436b41fb1857f1deca85825dde72cc8f30e5e24ce62ad702125bb41d95316d2b096f88a32e18649bfa57b077acba7b57d93a5b0b398 WHIRLPOOL f6c8c7d23853b1b41d53b5a1dd4381d6d4c30aabf7699fe4a5dd0530cb8782ab7f82960ae049ee52dfe16946c42b0019570ba39a9ef83b764a3b1052afa8f6f8
+DIST mariadb-10.0.6.tar.gz 50375294 SHA256 da382b3acf90b05f5bdc1e4a7cd57e9903182d8247f1f48c4d5afe9e4211c174 SHA512 97a86c0611a5ae4e8ea28b4879f67682d5100db9e2f9340e7e2aad60e638e9f34164740c4259cf0c2bb701aef0b80181fea1923e8401e61039c159783db8cfcf WHIRLPOOL c3ec49d5106ac0bc011275a944acba93ecec9c3e37f01f0e1be73f133405d213423a5d3c1619986fa60d6272bf39e4a29bc4f464d4a2205e0a526e477a6387a3
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
diff --git a/dev-db/mariadb/mariadb-10.0.6.ebuild b/dev-db/mariadb/mariadb-10.0.6.ebuild
new file mode 100644
index 0000000..cbc4c51
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="live"
+
+# 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 ~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}"
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl 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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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
+
+ for t in plugins.show_all_plugins roles.create_and_drop_role_invalid_user_table ; do
+ mysql-v2_disable_test "$t" "False postives due to hard coded versions"
+ done
+
+ # Confirmed with upstream
+ mysql-v2_disable_test "rpl.rpl_row_func003" "Random failure with GTID"
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ # Skip all CONNECT engine tests until upstream respondes to how to reference data files
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-10-10 20:03 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-10-10 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 0b96b3bbf72c59a9f865784bff630a5079e5f529
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Oct 9 14:16:11 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Oct 9 14:16:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0b96b3bb
[mariadb] Version bump for 10.0.4
All tests pass
Package-Manager: portage-2.2.7
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.4.ebuild | 124 +++++++++++++++++++++++++++++++++++
3 files changed, 130 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 9420804..12e2ac1 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-10.0.4 (09 Oct 2013)
+
+ 09 Oct 2013; Brian Evans <grknight@tuffmail.com> +mariadb-10.0.4.ebuild:
+ [mariadb] Version bump for 10.0.4 All tests pass
+
*mariadb-5.5.33a (20 Sep 2013)
20 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33a.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4f17934..ae6150f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,7 @@
DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
DIST mariadb-10.0.3.tar.gz 29969048 SHA256 6283ec23a68f4765fea9579b587eb78be013aeb61d04e4d7b63a3f552ffb2c35 SHA512 a371ca441f639e58a5a437abd33ef2fa0d152213add3b7bd708e15e26243efb3c15c3d974c3b72f2c6ee317f09f14299395670d7eba0bf078995b06a034ac7d3 WHIRLPOOL 4933770042ce30b03263a3cabad3a3937cd715629a09183551ded9cf73e652417bc615b1c5defde3344870cc2e42ba400a23c99751e0fe30a920b0a788230a25
+DIST mariadb-10.0.4.tar.gz 31104543 SHA256 f04fa28452cf27ea5ce9fb443a407a233402831559c258dd81caa4908be72af9 SHA512 337b1801a12aa29b65025436b41fb1857f1deca85825dde72cc8f30e5e24ce62ad702125bb41d95316d2b096f88a32e18649bfa57b077acba7b57d93a5b0b398 WHIRLPOOL f6c8c7d23853b1b41d53b5a1dd4381d6d4c30aabf7699fe4a5dd0530cb8782ab7f82960ae049ee52dfe16946c42b0019570ba39a9ef83b764a3b1052afa8f6f8
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
diff --git a/dev-db/mariadb/mariadb-10.0.4.ebuild b/dev-db/mariadb/mariadb-10.0.4.ebuild
new file mode 100644
index 0000000..262e97b
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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}"
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-09-20 22:29 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-09-20 22:29 UTC (permalink / raw
To: gentoo-commits
commit: cd8ddf6c1a02386b1bff445df7fb3d11e0286e78
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Sep 20 20:52:46 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Sep 20 20:52:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cd8ddf6c
[mariadb] Version Bump to 5.5.33a
All tests pass
Fix crashes upstream
Remove hacks for jemalloc and tokudb per upstream
Package-Manager: portage-2.2.6
---
dev-db/mariadb/ChangeLog | 7 +++++++
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/{mariadb-5.5.33.ebuild => mariadb-5.5.33a.ebuild} | 0
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 05599b6..9420804 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.33a (20 Sep 2013)
+
+ 20 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33a.ebuild,
+ -mariadb-5.5.33.ebuild:
+ [mariadb] Version Bump to 5.5.33a All tests pass Fix crashes upstream Remove
+ hacks for jemalloc and tokudb per upstream
+
*mariadb-5.5.33 (18 Sep 2013)
18 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 56613ea..4f17934 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,6 +6,6 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
-DIST mariadb-5.5.33.tar.gz 45230432 SHA256 233251494242e7c964523f834e513e624728f2c2602ada0eb717aaff777ac546 SHA512 cf14a68ce2bfbee2940e5b9313393b2f58d723d81d4da1e51101623aa6136f7b73e65ef8a18ce6845787f9daf6c93e574e18aeabecafafa76ea5afea145bc519 WHIRLPOOL bd46e20e184435597744831268675eec09e6e1ac5072833de20e11b32aa20f71562af7bd07ffc3fde43d3ddfb00f77c9ea1ea82bc8fd14aed46f4f4a487bd2db
+DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.33.ebuild b/dev-db/mariadb/mariadb-5.5.33a.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.33.ebuild
rename to dev-db/mariadb/mariadb-5.5.33a.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-09-18 20:27 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-09-18 20:27 UTC (permalink / raw
To: gentoo-commits
commit: fdbe3c7443d336ebe038936b9a6ce51ffcbb44ec
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Sep 18 20:21:58 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Sep 18 20:21:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fdbe3c74
[mariadb] Bump to version 5.5.33
PBXT was removed upstream
TokuDB was added. TokuDB only builds on amd64 according to author.
jemalloc was added by upstream. Small hack in cmake to use system lib.
Package-Manager: portage-2.2.6
---
dev-db/mariadb/ChangeLog | 8 +++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.33.ebuild | 128 +++++++++++++++++++++++++++++++++++
dev-db/mariadb/metadata.xml | 1 +
4 files changed, 138 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 59a0328..05599b6 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.33 (18 Sep 2013)
+
+ 18 Sep 2013; Brian Evans <grknight@tuffmail.com> +mariadb-5.5.33.ebuild,
+ metadata.xml:
+ [mariadb] Bump to version 5.5.33 PBXT was removed upstream TokuDB was added.
+ TokuDB only builds on amd64 according to author. jemalloc was added by
+ upstream. Small hack in cmake to use system lib.
+
29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mariadb-5.1.66.ebuild,
-mariadb-5.2.13.ebuild, -mariadb-5.3.11.ebuild, -mariadb-5.5.28a.ebuild,
-mariadb-5.5.29.ebuild, -mariadb-5.5.30.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 38faf2d..56613ea 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,5 +6,6 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
+DIST mariadb-5.5.33.tar.gz 45230432 SHA256 233251494242e7c964523f834e513e624728f2c2602ada0eb717aaff777ac546 SHA512 cf14a68ce2bfbee2940e5b9313393b2f58d723d81d4da1e51101623aa6136f7b73e65ef8a18ce6845787f9daf6c93e574e18aeabecafafa76ea5afea145bc519 WHIRLPOOL bd46e20e184435597744831268675eec09e6e1ac5072833de20e11b32aa20f71562af7bd07ffc3fde43d3ddfb00f77c9ea1ea82bc8fd14aed46f4f4a487bd2db
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.33.ebuild b/dev-db/mariadb/mariadb-5.5.33.ebuild
new file mode 100644
index 0000000..7e94379
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.33.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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/metadata.xml b/dev-db/mariadb/metadata.xml
index 8fb0475..df3c16c 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -24,5 +24,6 @@ dev-db/mariadb
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
<flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
+ <flag name='tokudb'>Add support for TokuDB storage engine</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-08-29 18:04 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-08-29 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 48287d849532a3fb3b0e1b0fbfcb0d36bc4b78d6
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Aug 29 18:03:40 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Aug 29 18:03:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=48287d84
[dev-db/mariadb] Trim old
Package-Manager: portage-2.2.1
---
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 6 --
dev-db/mariadb/mariadb-5.1.66.ebuild | 171 ----------------------------------
dev-db/mariadb/mariadb-5.2.13.ebuild | 171 ----------------------------------
dev-db/mariadb/mariadb-5.3.11.ebuild | 171 ----------------------------------
dev-db/mariadb/mariadb-5.5.28a.ebuild | 128 -------------------------
dev-db/mariadb/mariadb-5.5.29.ebuild | 128 -------------------------
dev-db/mariadb/mariadb-5.5.30.ebuild | 128 -------------------------
8 files changed, 5 insertions(+), 903 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 3ce1db0..59a0328 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mariadb-5.1.66.ebuild,
+ -mariadb-5.2.13.ebuild, -mariadb-5.3.11.ebuild, -mariadb-5.5.28a.ebuild,
+ -mariadb-5.5.29.ebuild, -mariadb-5.5.30.ebuild:
+ [dev-db/mariadb] Trim old
+
*mariadb-5.5.32 (19 Jul 2013)
19 Jul 2013; Brian Evans <grknight@lavabit.com> +mariadb-5.5.32.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5f2de48..38faf2d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,15 +1,9 @@
DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
DIST mariadb-10.0.3.tar.gz 29969048 SHA256 6283ec23a68f4765fea9579b587eb78be013aeb61d04e4d7b63a3f552ffb2c35 SHA512 a371ca441f639e58a5a437abd33ef2fa0d152213add3b7bd708e15e26243efb3c15c3d974c3b72f2c6ee317f09f14299395670d7eba0bf078995b06a034ac7d3 WHIRLPOOL 4933770042ce30b03263a3cabad3a3937cd715629a09183551ded9cf73e652417bc615b1c5defde3344870cc2e42ba400a23c99751e0fe30a920b0a788230a25
-DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
-DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
-DIST mariadb-5.3.11.tar.gz 26865690 SHA256 07a766b007c2f2c50680ccde121801208222877bb9311ffc9abf85e2f5e09f3a SHA512 8f501c6c4c3c886ff65c079ebba8e4870ebf8e6b451f35014b6d7cd4f74bf5c23360c271b5ef759b10a491914136213d759b859b1df9ba06d9863d684aa8d8e9 WHIRLPOOL 4b74bc8e4606a5c14e437a57398091d717bd866e179e26ced8054f3b5c6e88548f8e15e9a822f39ff5e81c6d6f90d7d69c5a42549bf81c2eb57f5b0d448ca2c0
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
-DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
-DIST mariadb-5.5.29.tar.gz 27935253 SHA256 b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 SHA512 ef3e386a634d1239067d91f6a17941807e62c36cd7f25e80ef43918d30ec0baa3d339ead85df5fc7958a3841d511c716bb873f039afdca49a50a409957b51d83 WHIRLPOOL 6b650c2ae23c6f9211792a2a9f3ddd0636306b7463308ecdc938ea003ee148956eda3fb1a2390ca72f3db1ea5eaabeafd4f26b23aa267766c61a77cf2b82b827
-DIST mariadb-5.5.30.tar.gz 27875216 SHA256 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f SHA512 41d160f71a1c0df3cfaaf864dbcf5aeccbfe3c2c1b0d1316750613d333f5789313606b2e959651e56ab7e26b1054b3ee93dc874ad1d2e43af097390ea960bae4 WHIRLPOOL 3a342de25ee1dbecb7f6ec07d237b830a6aeb24f3db3f90601345694b424236414ade860b589c3158ad207e1ff633e28585a96d463587d93a5e76245553992ff
DIST mariadb-5.5.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/mariadb-5.1.66.ebuild b/dev-db/mariadb/mariadb-5.1.66.ebuild
deleted file mode 100644
index c2d4827..0000000
--- a/dev-db/mariadb/mariadb-5.1.66.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.66.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.13.ebuild b/dev-db/mariadb/mariadb-5.2.13.ebuild
deleted file mode 100644
index 75532c7..0000000
--- a/dev-db/mariadb/mariadb-5.2.13.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.13.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.11.ebuild b/dev-db/mariadb/mariadb-5.3.11.ebuild
deleted file mode 100644
index 0e46ac0..0000000
--- a/dev-db/mariadb/mariadb-5.3.11.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.11.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
deleted file mode 100644
index 97ff0da..0000000
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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='20001_all_fix-minimal-build-cmake-mariadb.patch'
-
-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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild
deleted file mode 100644
index 7e94379..0000000
--- a/dev-db/mariadb/mariadb-5.5.29.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.30.ebuild b/dev-db/mariadb/mariadb-5.5.30.ebuild
deleted file mode 100644
index 7e94379..0000000
--- a/dev-db/mariadb/mariadb-5.5.30.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-
-# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-07-19 12:36 Brian Evans
0 siblings, 0 replies; 141+ messages in thread
From: Brian Evans @ 2013-07-19 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 63fd49617bcf06b28f0cc4d27d5110e2c9e52ff2
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Jul 19 12:35:46 2013 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Jul 19 12:35:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=63fd4961
Version bump
Package-Manager: portage-2.1.12.2
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.32.ebuild | 128 +++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 79569e9..3ce1db0 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.32 (19 Jul 2013)
+
+ 19 Jul 2013; Brian Evans <grknight@lavabit.com> +mariadb-5.5.32.ebuild:
+ Version bump
+
*mariadb-10.0.3 (12 Jun 2013)
12 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.3.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 20d7328..5f2de48 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -11,5 +11,6 @@ DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d
DIST mariadb-5.5.29.tar.gz 27935253 SHA256 b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 SHA512 ef3e386a634d1239067d91f6a17941807e62c36cd7f25e80ef43918d30ec0baa3d339ead85df5fc7958a3841d511c716bb873f039afdca49a50a409957b51d83 WHIRLPOOL 6b650c2ae23c6f9211792a2a9f3ddd0636306b7463308ecdc938ea003ee148956eda3fb1a2390ca72f3db1ea5eaabeafd4f26b23aa267766c61a77cf2b82b827
DIST mariadb-5.5.30.tar.gz 27875216 SHA256 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f SHA512 41d160f71a1c0df3cfaaf864dbcf5aeccbfe3c2c1b0d1316750613d333f5789313606b2e959651e56ab7e26b1054b3ee93dc874ad1d2e43af097390ea960bae4 WHIRLPOOL 3a342de25ee1dbecb7f6ec07d237b830a6aeb24f3db3f90601345694b424236414ade860b589c3158ad207e1ff633e28585a96d463587d93a5e76245553992ff
DIST mariadb-5.5.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
+DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.32.ebuild b/dev-db/mariadb/mariadb-5.5.32.ebuild
new file mode 100644
index 0000000..7e94379
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.32.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-06-12 19:10 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-06-12 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 5604cc9800fe66a48bf858cc29699f9c4b5ce76b
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 19:10:12 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 19:10:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5604cc98
Bump, tests still running for now.
Package-Manager: portage-2.2.0_alpha177
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.3.ebuild | 124 +++++++++++++++++++++++++++++++++++
3 files changed, 130 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 0bde589..79569e9 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-10.0.3 (12 Jun 2013)
+
+ 12 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.3.ebuild:
+ Bump, tests still running for now.
+
*mariadb-5.5.31 (28 May 2013)
28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.31.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e738a45..20d7328 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
+DIST mariadb-10.0.3.tar.gz 29969048 SHA256 6283ec23a68f4765fea9579b587eb78be013aeb61d04e4d7b63a3f552ffb2c35 SHA512 a371ca441f639e58a5a437abd33ef2fa0d152213add3b7bd708e15e26243efb3c15c3d974c3b72f2c6ee317f09f14299395670d7eba0bf078995b06a034ac7d3 WHIRLPOOL 4933770042ce30b03263a3cabad3a3937cd715629a09183551ded9cf73e652417bc615b1c5defde3344870cc2e42ba400a23c99751e0fe30a920b0a788230a25
DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
diff --git a/dev-db/mariadb/mariadb-10.0.3.ebuild b/dev-db/mariadb/mariadb-10.0.3.ebuild
new file mode 100644
index 0000000..262e97b
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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}"
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-05-28 21:51 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-05-28 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 91b3818f01e07289ca4627765ee60c73e104ec9d
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 21:45:49 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 28 21:51:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=91b3818f
Bump.
Package-Manager: portage-2.2.0_alpha177
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.31.ebuild | 128 +++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index e87957c..0bde589 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.31 (28 May 2013)
+
+ 28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.31.ebuild:
+ Bump.
+
*mariadb-10.0.1 (21 Mar 2013)
21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.1.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index fde7eba..e738a45 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,5 +9,6 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
DIST mariadb-5.5.29.tar.gz 27935253 SHA256 b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 SHA512 ef3e386a634d1239067d91f6a17941807e62c36cd7f25e80ef43918d30ec0baa3d339ead85df5fc7958a3841d511c716bb873f039afdca49a50a409957b51d83 WHIRLPOOL 6b650c2ae23c6f9211792a2a9f3ddd0636306b7463308ecdc938ea003ee148956eda3fb1a2390ca72f3db1ea5eaabeafd4f26b23aa267766c61a77cf2b82b827
DIST mariadb-5.5.30.tar.gz 27875216 SHA256 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f SHA512 41d160f71a1c0df3cfaaf864dbcf5aeccbfe3c2c1b0d1316750613d333f5789313606b2e959651e56ab7e26b1054b3ee93dc874ad1d2e43af097390ea960bae4 WHIRLPOOL 3a342de25ee1dbecb7f6ec07d237b830a6aeb24f3db3f90601345694b424236414ade860b589c3158ad207e1ff633e28585a96d463587d93a5e76245553992ff
+DIST mariadb-5.5.31.tar.gz 27888530 SHA256 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28 SHA512 2b279852c602eef74456b8ff398e25a35f8dd026d59b62731cc006acbdf9167b3e5c12a5cbb1dd4b3f91c0d837149feb55754181cbb830fcce2fe02e03dadf9e WHIRLPOOL 75f953f33dc6d432364f9d23f2d5daf03ffd4ceff03d1dd0f8395b571209a22c5ef51863f6df071e94e465a3e49cb3c34afb4e0183521aa325867623c7680adb
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.31.ebuild b/dev-db/mariadb/mariadb-5.5.31.ebuild
new file mode 100644
index 0000000..7e94379
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.31.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-04-25 19:22 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-25 19:22 UTC (permalink / raw
To: gentoo-commits
commit: ea05aab1b15b8e0abeac5a1871ad96b00bd20101
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 19:19:46 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 19:19:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ea05aab1
[dev-db/mariadb] Drop extra src_prepare on mariadb-10.0 - fixes bug 462078.
---
dev-db/mariadb/mariadb-10.0.1.ebuild | 10 ----------
dev-db/mariadb/mariadb-10.0.2.ebuild | 10 ----------
2 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.1.ebuild b/dev-db/mariadb/mariadb-10.0.1.ebuild
index 56e4012..262e97b 100644
--- a/dev-db/mariadb/mariadb-10.0.1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.1.ebuild
@@ -21,16 +21,6 @@ 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
diff --git a/dev-db/mariadb/mariadb-10.0.2.ebuild b/dev-db/mariadb/mariadb-10.0.2.ebuild
index 56e4012..262e97b 100644
--- a/dev-db/mariadb/mariadb-10.0.2.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.2.ebuild
@@ -21,16 +21,6 @@ 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-04-25 19:10 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-25 19:10 UTC (permalink / raw
To: gentoo-commits
commit: f0cf5657c31547d3a200661a4b0286448a904120
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 19:07:59 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 19:08:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f0cf5657
[dev-db/mariadb] Bump to 10.0.2 version.
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.2.ebuild | 134 ++++++++++++++++++++++++++++++++++
2 files changed, 135 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4f66555..fde7eba 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,5 @@
DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
+DIST mariadb-10.0.2.tar.gz 29889802 SHA256 8101fdbfd3130027c5edc4f896b091b6b7851cbd35ec76f9353b6bbed04bf8b9 SHA512 c5f0b6aec37331848f9e5924846d65b163df5f6b64269c120d24ea25a1f650bb33801fa68a0943653be457fd6a5d3a9a636814a4430349c3affcf45635f7cc50 WHIRLPOOL 1c462f20a602c0d7695021d70a0dd85dfa04b566e5bfc1c1d061166aa87bd8037873a2d2127a4498cd6f1352b9bf06412213449673902e4a2ca038d6d921b5c0
DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
diff --git a/dev-db/mariadb/mariadb-10.0.2.ebuild b/dev-db/mariadb/mariadb-10.0.2.ebuild
new file mode 100644
index 0000000..56e4012
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-04-25 0:43 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-25 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 7cc61ff037cf8d521acb6b656dfb56162c592fba
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Apr 12 13:08:36 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 00:40:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7cc61ff0
Remove extra src_prepare from MariaDB 5.5.x for bug 462078
---
dev-db/mariadb/mariadb-5.5.28a.ebuild | 6 ------
dev-db/mariadb/mariadb-5.5.29.ebuild | 6 ------
dev-db/mariadb/mariadb-5.5.30.ebuild | 6 ------
3 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index bd208ea..97ff0da 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -24,12 +24,6 @@ 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
diff --git a/dev-db/mariadb/mariadb-5.5.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild
index 56e4012..7e94379 100644
--- a/dev-db/mariadb/mariadb-5.5.29.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.29.ebuild
@@ -24,12 +24,6 @@ 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
diff --git a/dev-db/mariadb/mariadb-5.5.30.ebuild b/dev-db/mariadb/mariadb-5.5.30.ebuild
index 56e4012..7e94379 100644
--- a/dev-db/mariadb/mariadb-5.5.30.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.30.ebuild
@@ -24,12 +24,6 @@ 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-03-21 19:43 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-03-21 19:43 UTC (permalink / raw
To: gentoo-commits
commit: b6eb0d3d4e58de7465a18a4bed02f97ff8a40cc7
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 19:42:11 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 19:42:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b6eb0d3d
Very untested MariaDB 10 series.
Package-Manager: portage-2.2.0_alpha166
---
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-10.0.1.ebuild | 134 ++++++++++++++++++++++++++++++++++
3 files changed, 140 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index efabc46..e87957c 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-10.0.1 (21 Mar 2013)
+
+ 21 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-10.0.1.ebuild:
+ Very untested MariaDB 10 series.
+
*mariadb-5.5.30 (13 Mar 2013)
13 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.30.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 12e87f3..4f66555 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,4 @@
+DIST mariadb-10.0.1.tar.gz 29144466 SHA256 352fdc396742af642f81c8fd07edb96671e751402029ebc0f1d6aa9903707ee8 SHA512 3853497ec6f76af377bff22d58d1a7de05294748d0a63abebfe53d6d037144992eae830dc1939ef350e47ec652e34fd30ce53dbb603f15cabdd8d21cf13feab5 WHIRLPOOL 38603d48d7852595e06064383326f48f06a2617af786bcd6bd23559653b3efa30513c467ea97e227bfb5f72f701539af88b53fb799040f05818deb25a4c1b18a
DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
diff --git a/dev-db/mariadb/mariadb-10.0.1.ebuild b/dev-db/mariadb/mariadb-10.0.1.ebuild
new file mode 100644
index 0000000..56e4012
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-03-16 19:19 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-03-16 19:19 UTC (permalink / raw
To: gentoo-commits
commit: bad76f6e0833a6910c6aabeed99403b0ea183086
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 20:20:35 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 20:20:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bad76f6e
Bump.
Package-Manager: portage-2.2.0_alpha166
---
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.30.ebuild | 134 ++++++++++++++++++++++++++++++++++
3 files changed, 140 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index a955c8b..efabc46 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.5.30 (13 Mar 2013)
+
+ 13 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.5.30.ebuild:
+ Bump.
+
04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.67.ebuild,
mariadb-5.2.14.ebuild, mariadb-5.3.12.ebuild, mariadb-5.5.29.ebuild:
Update headers and keywords.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index cd6e0b2..12e87f3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,5 +6,6 @@ DIST mariadb-5.3.11.tar.gz 26865690 SHA256 07a766b007c2f2c50680ccde1218012082228
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
DIST mariadb-5.5.29.tar.gz 27935253 SHA256 b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 SHA512 ef3e386a634d1239067d91f6a17941807e62c36cd7f25e80ef43918d30ec0baa3d339ead85df5fc7958a3841d511c716bb873f039afdca49a50a409957b51d83 WHIRLPOOL 6b650c2ae23c6f9211792a2a9f3ddd0636306b7463308ecdc938ea003ee148956eda3fb1a2390ca72f3db1ea5eaabeafd4f26b23aa267766c61a77cf2b82b827
+DIST mariadb-5.5.30.tar.gz 27875216 SHA256 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f SHA512 41d160f71a1c0df3cfaaf864dbcf5aeccbfe3c2c1b0d1316750613d333f5789313606b2e959651e56ab7e26b1054b3ee93dc874ad1d2e43af097390ea960bae4 WHIRLPOOL 3a342de25ee1dbecb7f6ec07d237b830a6aeb24f3db3f90601345694b424236414ade860b589c3158ad207e1ff633e28585a96d463587d93a5e76245553992ff
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.30.ebuild b/dev-db/mariadb/mariadb-5.5.30.ebuild
new file mode 100644
index 0000000..56e4012
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.30.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-02-12 22:47 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-02-12 22:47 UTC (permalink / raw
To: gentoo-commits
commit: f47979d033fe25cecf6a975665d95a611d55dd81
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Jan 31 16:30:55 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 16:30:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f47979d0
Version bump for mariadb (includes security fixes)
---
dev-db/mariadb/Manifest | 4 +
dev-db/mariadb/mariadb-5.1.67.ebuild | 171 ++++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.2.14.ebuild | 171 ++++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.3.12.ebuild | 171 ++++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.5.29.ebuild | 134 ++++++++++++++++++++++++++
5 files changed, 651 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6448e31..cd6e0b2 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,10 @@
DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
+DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
+DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.11.tar.gz 26865690 SHA256 07a766b007c2f2c50680ccde121801208222877bb9311ffc9abf85e2f5e09f3a SHA512 8f501c6c4c3c886ff65c079ebba8e4870ebf8e6b451f35014b6d7cd4f74bf5c23360c271b5ef759b10a491914136213d759b859b1df9ba06d9863d684aa8d8e9 WHIRLPOOL 4b74bc8e4606a5c14e437a57398091d717bd866e179e26ced8054f3b5c6e88548f8e15e9a822f39ff5e81c6d6f90d7d69c5a42549bf81c2eb57f5b0d448ca2c0
+DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
+DIST mariadb-5.5.29.tar.gz 27935253 SHA256 b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 SHA512 ef3e386a634d1239067d91f6a17941807e62c36cd7f25e80ef43918d30ec0baa3d339ead85df5fc7958a3841d511c716bb873f039afdca49a50a409957b51d83 WHIRLPOOL 6b650c2ae23c6f9211792a2a9f3ddd0636306b7463308ecdc938ea003ee148956eda3fb1a2390ca72f3db1ea5eaabeafd4f26b23aa267766c61a77cf2b82b827
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
new file mode 100644
index 0000000..c2d4827
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.66.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
new file mode 100644
index 0000000..75532c7
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.13.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
new file mode 100644
index 0000000..0e46ac0
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.11.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild
new file mode 100644
index 0000000..2912643
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.29.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# 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 ~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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-28 2:13 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-28 2:13 UTC (permalink / raw
To: gentoo-commits
commit: b327728125114576b4b9ca20492f634e63c2272f
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 00:57:14 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 00:57:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b3277281
Trim old versions.
---
dev-db/mariadb/mariadb-5.1.62-r1.ebuild | 171 ------------------------------
dev-db/mariadb/mariadb-5.1.62.ebuild | 171 ------------------------------
dev-db/mariadb/mariadb-5.2.12-r1.ebuild | 171 ------------------------------
dev-db/mariadb/mariadb-5.2.12.ebuild | 171 ------------------------------
dev-db/mariadb/mariadb-5.3.6.ebuild | 174 -------------------------------
dev-db/mariadb/mariadb-5.3.7.ebuild | 174 -------------------------------
dev-db/mariadb/mariadb-5.3.9.ebuild | 174 -------------------------------
dev-db/mariadb/mariadb-5.5.24.ebuild | 134 ------------------------
dev-db/mariadb/mariadb-5.5.25-r1.ebuild | 134 ------------------------
dev-db/mariadb/mariadb-5.5.25.ebuild | 134 ------------------------
dev-db/mariadb/mariadb-5.5.28.ebuild | 134 ------------------------
11 files changed, 0 insertions(+), 1742 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
deleted file mode 100644
index 83df4ed..0000000
--- a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120906-1344Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
deleted file mode 100644
index d3ddb45..0000000
--- a/dev-db/mariadb/mariadb-5.1.62.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120416-2021Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.12-r1.ebuild b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
deleted file mode 100644
index 83df4ed..0000000
--- a/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120906-1344Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.12.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
deleted file mode 100644
index d3ddb45..0000000
--- a/dev-db/mariadb/mariadb-5.2.12.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120416-2021Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
deleted file mode 100644
index 9f91670..0000000
--- a/dev-db/mariadb/mariadb-5.3.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120416-2021Z"
-
-# Build system
-BUILD="autotools"
-
-# Suffix on files...
-#MY_PV="$PV-ga"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.7.ebuild b/dev-db/mariadb/mariadb-5.3.7.ebuild
deleted file mode 100644
index 7ce1356..0000000
--- a/dev-db/mariadb/mariadb-5.3.7.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120906-1344Z"
-
-# Build system
-BUILD="autotools"
-
-# Suffix on files...
-#MY_PV="$PV-ga"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.9.ebuild b/dev-db/mariadb/mariadb-5.3.9.ebuild
deleted file mode 100644
index 7ce1356..0000000
--- a/dev-db/mariadb/mariadb-5.3.9.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120906-1344Z"
-
-# Build system
-BUILD="autotools"
-
-# Suffix on files...
-#MY_PV="$PV-ga"
-
-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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.24.ebuild b/dev-db/mariadb/mariadb-5.5.24.ebuild
deleted file mode 100644
index f3b730b..0000000
--- a/dev-db/mariadb/mariadb-5.5.24.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120416-2021Z"
-
-# 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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.25-r1.ebuild b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
deleted file mode 100644
index 78b4c35..0000000
--- a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120906-1344Z"
-
-# 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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.25.ebuild b/dev-db/mariadb/mariadb-5.5.25.ebuild
deleted file mode 100644
index f3b730b..0000000
--- a/dev-db/mariadb/mariadb-5.5.25.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120416-2021Z"
-
-# 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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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.28.ebuild b/dev-db/mariadb/mariadb-5.5.28.ebuild
deleted file mode 100644
index 78b4c35..0000000
--- a/dev-db/mariadb/mariadb-5.5.28.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120906-1344Z"
-
-# 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 ~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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- local TESTDIR="${CMAKE_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))"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
- # 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, 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.
- #
- # sys_vars.plugin_dir_basic
- # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
- # instead of MYSQL_LIBDIR/plugin
- #
- # main.flush_read_lock_kill
- # fails because of unknown system variable 'DEBUG_SYNC'
- #
- # main.openssl_1
- # error message changing
- # -mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: ASN: bad other signature confirmation
- # +mysqltest: Could not open connection 'default': 2026 SSL connection
- # error: error:00000001:lib(0):func(0):reason(1)
- #
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
- 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="${S}/mysql-test/var-tests"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-28 2:13 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-28 2:13 UTC (permalink / raw
To: gentoo-commits
commit: dcf4b4fe0b264f86f590289398f794f4b5aefd3c
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 00:58:10 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 00:58:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=dcf4b4fe
Sync with gentoo-x86.
---
dev-db/mariadb/mariadb-5.1.66.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.13.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.11.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.28a.ebuild | 2 +-
dev-db/mariadb/metadata.xml | 7 ++++++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.1.66.ebuild b/dev-db/mariadb/mariadb-5.1.66.ebuild
index c1e94ef..c2d4827 100644
--- a/dev-db/mariadb/mariadb-5.1.66.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.66.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.66.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
diff --git a/dev-db/mariadb/mariadb-5.2.13.ebuild b/dev-db/mariadb/mariadb-5.2.13.ebuild
index c1e94ef..75532c7 100644
--- a/dev-db/mariadb/mariadb-5.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.13.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
diff --git a/dev-db/mariadb/mariadb-5.3.11.ebuild b/dev-db/mariadb/mariadb-5.3.11.ebuild
index c1e94ef..0e46ac0 100644
--- a/dev-db/mariadb/mariadb-5.3.11.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.11.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index 72a1609..bd208ea 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
EAPI="4"
MY_EXTRAS_VER="20130120-0100Z"
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 8acfc88..8fb0475 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -2,6 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>mysql</herd>
+<!--
+Please note that this list is shared between the following packages:
+dev-db/mysql
+dev-db/mariadb
+-->
<use>
<flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
<flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
@@ -16,8 +21,8 @@
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
<flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
<flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
- <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+ <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-20 2:15 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-20 2:15 UTC (permalink / raw
To: gentoo-commits
commit: 206a9aa43649a5111a5fe163001de8f9364c57d9
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 02:09:17 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 02:09:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=206a9aa4
Trim old versions.
Package-Manager: portage-2.2.0_alpha144
RepoMan-Options: --force
---
dev-db/mariadb/ChangeLog | 3 +
dev-db/mariadb/Manifest | 2 -
dev-db/mariadb/mariadb-5.1.55.ebuild | 171 ----------------------------------
3 files changed, 3 insertions(+), 173 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 043defc..fde454e 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mariadb-5.1.55.ebuild:
+ Trim old versions.
+
20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.5.24.ebuild,
mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild, mariadb-5.5.28.ebuild,
mariadb-5.5.28a.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 231c988..f9d2b6e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,3 @@
-DIST mariadb-5.1.55.tar.gz 24613002 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b SHA512 233e9fc07144aa266e4d0f65117e0f47d6445162469860e98351926c98f269c89e466bb0da8fdb9b46874f5fa5d1fdfdc63fe092218272fe02519abdadcc84b8 WHIRLPOOL 9750d587db600687465e1acc9431613a0adec734964a68752d1c2884052e1d27fdb476bbaaec9e914a90ef939d5b51f3886e2d14caeab6b451800f4329074171
DIST mariadb-5.1.62.tar.gz 24931609 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da SHA512 a579e7fb9421a7de1a77881575c35d43bfaa2cdfc398477f80373fad4faec0bcc7bea3248cd67972787745744653dbf0c27b226d79dccbc4ffe77bab7dda0c35 WHIRLPOOL 5e8207c5344309a7263570cbd6beca438b4287024ff48aedf33465327d81b2360977fe8da44d1f49500e6c3181e6dea664eb425b73185bbc0c10d3ed55c57e72
DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
DIST mariadb-5.2.12.tar.gz 25364319 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 SHA512 d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333 WHIRLPOOL 10cdec3090f733110c762daae945f6a77f61103f3c14ccf38884df41b036497c360d98cc3be3c754563f8a0affb6ad012224f2f31905b709eb34a61e0613bf90
@@ -11,7 +10,6 @@ DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3af
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mariadb-5.5.28.tar.gz 27819467 SHA256 1237568d36fcbda707d363f2819ac539aedf2f49267162ec95e90cf4bb049850 SHA512 8ee9c624da4683ba4145f15014780568c4ea2034204d4f80e0aad688cdfe41cba49d3ca6db7adf52023054a5b7f467ab11d62a5fe30e0d5e92dff491dc8e5e5e WHIRLPOOL 879683cae962d8d15d0913d21df05570b01d24e7c5e9ece3c4ce8e23324005a044122d16a7e683ce43637bed796c93fa05c17e516ddf4e59f0662705be244b6c
DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
-DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
DIST mysql-extras-20120906-1344Z.tar.bz2 1898342 SHA256 75e8efa38d6b10b63d05553f5c884396bdd50b9a445731892dc7780d0a015b2e SHA512 4c253a5772eea4e130c39b4e127372431afaf53d574f8369e905c636c7c12e7eb534432e1ffd681eb83de857850ddcba161ef5c489e1f077ff850bf95978d4f8 WHIRLPOOL 1e9bd9f1ce83d219c20e089e952a8b39c73d97d027a1309788a3d8e529d5444412d6e4445d362b16e01c9ea918cc7c994635c240ca7f7848a2c06f528d832485
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
deleted file mode 100644
index 128239b..0000000
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20110426-1046Z"
-
-# Build system
-BUILD="autotools"
-
-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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-20 2:15 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-20 2:15 UTC (permalink / raw
To: gentoo-commits
commit: ef9bf1872488bfeee53bb3db6f716ffab47e5161
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 02:10:19 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 02:10:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ef9bf187
HPPA has decided not to support mariadb for the present time.
Package-Manager: portage-2.2.0_alpha144
---
dev-db/mariadb/ChangeLog | 8 ++++++++
dev-db/mariadb/mariadb-5.1.62-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.1.62.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.1.66.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.2.12-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.2.12.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.2.13.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.3.11.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.3.6.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.3.7.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.3.9.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.24.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.25-r1.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.25.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.28.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.28a.ebuild | 2 +-
16 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index fde454e..db2b024 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.62-r1.ebuild,
+ mariadb-5.1.62.ebuild, mariadb-5.1.66.ebuild, mariadb-5.2.12-r1.ebuild,
+ mariadb-5.2.12.ebuild, mariadb-5.2.13.ebuild, mariadb-5.3.11.ebuild,
+ mariadb-5.3.6.ebuild, mariadb-5.3.7.ebuild, mariadb-5.3.9.ebuild,
+ mariadb-5.5.24.ebuild, mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild,
+ mariadb-5.5.28.ebuild, mariadb-5.5.28a.ebuild:
+ HPPA has decided not to support mariadb for the present time.
+
20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mariadb-5.1.55.ebuild:
Trim old versions.
diff --git a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
index 203948e..83df4ed 100644
--- a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
index cbab031..d3ddb45 100644
--- a/dev-db/mariadb/mariadb-5.1.62.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.1.66.ebuild b/dev-db/mariadb/mariadb-5.1.66.ebuild
index e00a998..c1e94ef 100644
--- a/dev-db/mariadb/mariadb-5.1.66.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.2.12-r1.ebuild b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
index 203948e..83df4ed 100644
--- a/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.2.12.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
index cbab031..d3ddb45 100644
--- a/dev-db/mariadb/mariadb-5.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.2.13.ebuild b/dev-db/mariadb/mariadb-5.2.13.ebuild
index e00a998..c1e94ef 100644
--- a/dev-db/mariadb/mariadb-5.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.3.11.ebuild b/dev-db/mariadb/mariadb-5.3.11.ebuild
index e00a998..c1e94ef 100644
--- a/dev-db/mariadb/mariadb-5.3.11.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
index f54ca59..9f91670 100644
--- a/dev-db/mariadb/mariadb-5.3.6.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.3.7.ebuild b/dev-db/mariadb/mariadb-5.3.7.ebuild
index 886b2a3..7ce1356 100644
--- a/dev-db/mariadb/mariadb-5.3.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.3.9.ebuild b/dev-db/mariadb/mariadb-5.3.9.ebuild
index 886b2a3..7ce1356 100644
--- a/dev-db/mariadb/mariadb-5.3.9.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.24.ebuild b/dev-db/mariadb/mariadb-5.5.24.ebuild
index 9a04c5c..f3b730b 100644
--- a/dev-db/mariadb/mariadb-5.5.24.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.24.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
index 7a7e528..78b4c35 100644
--- a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.25.ebuild b/dev-db/mariadb/mariadb-5.5.25.ebuild
index 9a04c5c..f3b730b 100644
--- a/dev-db/mariadb/mariadb-5.5.25.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.25.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.28.ebuild b/dev-db/mariadb/mariadb-5.5.28.ebuild
index 7a7e528..78b4c35 100644
--- a/dev-db/mariadb/mariadb-5.5.28.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index 3c0a87d..72a1609 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
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"
+KEYWORDS="~alpha ~amd64 ~arm ~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='20001_all_fix-minimal-build-cmake-mariadb.patch'
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-20 2:15 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-20 2:15 UTC (permalink / raw
To: gentoo-commits
commit: eec6f83af532d899bccddcf27da6f5620acfd703
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:54:41 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:54:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=eec6f83a
Fix {tests} typo.
Package-Manager: portage-2.2.0_alpha144
RepoMan-Options: --force
---
dev-db/mariadb/ChangeLog | 8 ++++++--
dev-db/mariadb/mariadb-5.5.24.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.25-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.25.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.28.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.5.28a.ebuild | 4 ++--
6 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index c02a627..043defc 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.5.24.ebuild,
+ mariadb-5.5.25-r1.ebuild, mariadb-5.5.25.ebuild, mariadb-5.5.28.ebuild,
+ mariadb-5.5.28a.ebuild:
+ Fix {tests} typo.
+
22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mariadb-5.1.55.ebuild, mariadb-5.1.62.ebuild, mariadb-5.2.7.ebuild,
mariadb-5.2.8.ebuild, mariadb-5.2.9.ebuild, mariadb-5.2.10.ebuild,
@@ -137,4 +142,3 @@
+mariadb-5.1.42.ebuild, +metadata.xml:
Add MariaDB. Bug #303130, based on the submission by Brian Evans
<grknight@scent-team.com>.
-
diff --git a/dev-db/mariadb/mariadb-5.5.24.ebuild b/dev-db/mariadb/mariadb-5.5.24.ebuild
index 46fb196..9a04c5c 100644
--- a/dev-db/mariadb/mariadb-5.5.24.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -65,7 +65,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
diff --git a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
index 4ab0808..7a7e528 100644
--- a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -65,7 +65,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
diff --git a/dev-db/mariadb/mariadb-5.5.25.ebuild b/dev-db/mariadb/mariadb-5.5.25.ebuild
index 46fb196..9a04c5c 100644
--- a/dev-db/mariadb/mariadb-5.5.25.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -65,7 +65,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
diff --git a/dev-db/mariadb/mariadb-5.5.28.ebuild b/dev-db/mariadb/mariadb-5.5.28.ebuild
index 4ab0808..7a7e528 100644
--- a/dev-db/mariadb/mariadb-5.5.28.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -65,7 +65,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index e956c90..3c0a87d 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -65,7 +65,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+ mkdir -p "${S}"/mysql-test/var-tests{,/log}
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-20 2:15 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-20 2:15 UTC (permalink / raw
To: gentoo-commits
commit: c59431043308611e2ed4ead89ca2f028c1b37771
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:06:07 2013 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:06:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c5943104
Update to latest versions of mysql-extras.
Package-Manager: portage-2.2.0_alpha144
RepoMan-Options: --force
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.28a.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index dd4164b..231c988 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -15,3 +15,4 @@ DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d214
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
DIST mysql-extras-20120906-1344Z.tar.bz2 1898342 SHA256 75e8efa38d6b10b63d05553f5c884396bdd50b9a445731892dc7780d0a015b2e SHA512 4c253a5772eea4e130c39b4e127372431afaf53d574f8369e905c636c7c12e7eb534432e1ffd681eb83de857850ddcba161ef5c489e1f077ff850bf95978d4f8 WHIRLPOOL 1e9bd9f1ce83d219c20e089e952a8b39c73d97d027a1309788a3d8e529d5444412d6e4445d362b16e01c9ea918cc7c994635c240ca7f7848a2c06f528d832485
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
+DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index b0bcc61..e956c90 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
+MY_EXTRAS_VER="20130120-0100Z"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2013-01-20 2:15 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2013-01-20 2:15 UTC (permalink / raw
To: gentoo-commits
commit: c9d1935067b39c84b01393f3f5d273d079feae9c
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Nov 30 20:27:34 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 20:27:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c9d19350
Version bump for CVE-2012-5579
---
dev-db/mariadb/Manifest | 5 +
dev-db/mariadb/mariadb-5.1.66.ebuild | 171 +++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.2.13.ebuild | 171 +++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.3.11.ebuild | 171 +++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.5.28a.ebuild | 134 ++++++++++++++++++++++++++
5 files changed, 652 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d1f3598..dd4164b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,12 +1,17 @@
DIST mariadb-5.1.55.tar.gz 24613002 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b SHA512 233e9fc07144aa266e4d0f65117e0f47d6445162469860e98351926c98f269c89e466bb0da8fdb9b46874f5fa5d1fdfdc63fe092218272fe02519abdadcc84b8 WHIRLPOOL 9750d587db600687465e1acc9431613a0adec734964a68752d1c2884052e1d27fdb476bbaaec9e914a90ef939d5b51f3886e2d14caeab6b451800f4329074171
DIST mariadb-5.1.62.tar.gz 24931609 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da SHA512 a579e7fb9421a7de1a77881575c35d43bfaa2cdfc398477f80373fad4faec0bcc7bea3248cd67972787745744653dbf0c27b226d79dccbc4ffe77bab7dda0c35 WHIRLPOOL 5e8207c5344309a7263570cbd6beca438b4287024ff48aedf33465327d81b2360977fe8da44d1f49500e6c3181e6dea664eb425b73185bbc0c10d3ed55c57e72
+DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
DIST mariadb-5.2.12.tar.gz 25364319 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 SHA512 d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333 WHIRLPOOL 10cdec3090f733110c762daae945f6a77f61103f3c14ccf38884df41b036497c360d98cc3be3c754563f8a0affb6ad012224f2f31905b709eb34a61e0613bf90
+DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
+DIST mariadb-5.3.11.tar.gz 26865690 SHA256 07a766b007c2f2c50680ccde121801208222877bb9311ffc9abf85e2f5e09f3a SHA512 8f501c6c4c3c886ff65c079ebba8e4870ebf8e6b451f35014b6d7cd4f74bf5c23360c271b5ef759b10a491914136213d759b859b1df9ba06d9863d684aa8d8e9 WHIRLPOOL 4b74bc8e4606a5c14e437a57398091d717bd866e179e26ced8054f3b5c6e88548f8e15e9a822f39ff5e81c6d6f90d7d69c5a42549bf81c2eb57f5b0d448ca2c0
DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 SHA512 ccf61f42084318a9084f742bdf03786b6590b0969b42c17c05503fac9608a56e39ee1a0ad0276aea413c61822cf5edfddcf25bfe9d421d76e01824332b7fee67 WHIRLPOOL cf5887291affd437f755e63d2c79e3fcc63fa5687dfab8c069b62caced59ced2cdae2a54e560e54a1435ec52c5a21ea19efe081704d98de104fc3c8688713b85
DIST mariadb-5.3.7.tar.gz 26741196 SHA256 463386ca84128a162e63137c8f6666859b94e2abf490b6ab2306f846a13fe9bc SHA512 08eefd9eabedf4b6097b2fcc6d7a853e9b3b7c262d02fb3aaa37f0f241b98368ca4b052cc8a47ab7fc45714a28720edd203e7f2c9227d6af2a36de7f1274fe6a WHIRLPOOL d4364585e2db4c4d7e823d22468aac21343f0f6d051533372c24c914f4b03939f6f98128872b80169d53aeb7ce4d1f4e42f6fbf38fb9baf6b240c58d7ee17cff
DIST mariadb-5.3.9.tar.gz 26806579 SHA256 4b9db3fd4ccdd8dd9f93c3f12fdb14e5523bbb08f563d29acfb919b66f804423 SHA512 dd87ad072f1b9242c76a35a1f827921ca0291a3b4009e4d29439f9e471d90b285a0b26ab5d1078505d31def91adf9c64cf8a22f56df2d4a04668ce952ae77914 WHIRLPOOL e8a346d5c44bd13978f7a30ee2b9ce782806f4043f9e020bac4a8427c9bbc8339f5e70b78ad64b4fadafe70e3130f996662bf7641df68fc063106774c696a47f
DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mariadb-5.5.28.tar.gz 27819467 SHA256 1237568d36fcbda707d363f2819ac539aedf2f49267162ec95e90cf4bb049850 SHA512 8ee9c624da4683ba4145f15014780568c4ea2034204d4f80e0aad688cdfe41cba49d3ca6db7adf52023054a5b7f467ab11d62a5fe30e0d5e92dff491dc8e5e5e WHIRLPOOL 879683cae962d8d15d0913d21df05570b01d24e7c5e9ece3c4ce8e23324005a044122d16a7e683ce43637bed796c93fa05c17e516ddf4e59f0662705be244b6c
+DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
DIST mysql-extras-20120906-1344Z.tar.bz2 1898342 SHA256 75e8efa38d6b10b63d05553f5c884396bdd50b9a445731892dc7780d0a015b2e SHA512 4c253a5772eea4e130c39b4e127372431afaf53d574f8369e905c636c7c12e7eb534432e1ffd681eb83de857850ddcba161ef5c489e1f077ff850bf95978d4f8 WHIRLPOOL 1e9bd9f1ce83d219c20e089e952a8b39c73d97d027a1309788a3d8e529d5444412d6e4445d362b16e01c9ea918cc7c994635c240ca7f7848a2c06f528d832485
+DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
diff --git a/dev-db/mariadb/mariadb-5.1.66.ebuild b/dev-db/mariadb/mariadb-5.1.66.ebuild
new file mode 100644
index 0000000..e00a998
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.66.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.2.13.ebuild b/dev-db/mariadb/mariadb-5.2.13.ebuild
new file mode 100644
index 0000000..e00a998
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.13.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.3.11.ebuild b/dev-db/mariadb/mariadb-5.3.11.ebuild
new file mode 100644
index 0000000..e00a998
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.11.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
new file mode 100644
index 0000000..b0bcc61
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# 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='20001_all_fix-minimal-build-cmake-mariadb.patch'
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-10-26 10:07 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-26 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 1db3f1924d733dae40a52bde1919255c605119f7
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 10:07:45 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 10:07:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1db3f192
[dev-db/mariadb] 5.3.9 version bump.
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.3.9.ebuild | 174 +++++++++++++++++++++++++++++++++++
2 files changed, 175 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8cdb3e3..d1f3598 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,6 +3,7 @@ DIST mariadb-5.1.62.tar.gz 24931609 SHA256 2293e973d22bc969dcb8b17710c909182d2b7
DIST mariadb-5.2.12.tar.gz 25364319 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 SHA512 d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333 WHIRLPOOL 10cdec3090f733110c762daae945f6a77f61103f3c14ccf38884df41b036497c360d98cc3be3c754563f8a0affb6ad012224f2f31905b709eb34a61e0613bf90
DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 SHA512 ccf61f42084318a9084f742bdf03786b6590b0969b42c17c05503fac9608a56e39ee1a0ad0276aea413c61822cf5edfddcf25bfe9d421d76e01824332b7fee67 WHIRLPOOL cf5887291affd437f755e63d2c79e3fcc63fa5687dfab8c069b62caced59ced2cdae2a54e560e54a1435ec52c5a21ea19efe081704d98de104fc3c8688713b85
DIST mariadb-5.3.7.tar.gz 26741196 SHA256 463386ca84128a162e63137c8f6666859b94e2abf490b6ab2306f846a13fe9bc SHA512 08eefd9eabedf4b6097b2fcc6d7a853e9b3b7c262d02fb3aaa37f0f241b98368ca4b052cc8a47ab7fc45714a28720edd203e7f2c9227d6af2a36de7f1274fe6a WHIRLPOOL d4364585e2db4c4d7e823d22468aac21343f0f6d051533372c24c914f4b03939f6f98128872b80169d53aeb7ce4d1f4e42f6fbf38fb9baf6b240c58d7ee17cff
+DIST mariadb-5.3.9.tar.gz 26806579 SHA256 4b9db3fd4ccdd8dd9f93c3f12fdb14e5523bbb08f563d29acfb919b66f804423 SHA512 dd87ad072f1b9242c76a35a1f827921ca0291a3b4009e4d29439f9e471d90b285a0b26ab5d1078505d31def91adf9c64cf8a22f56df2d4a04668ce952ae77914 WHIRLPOOL e8a346d5c44bd13978f7a30ee2b9ce782806f4043f9e020bac4a8427c9bbc8339f5e70b78ad64b4fadafe70e3130f996662bf7641df68fc063106774c696a47f
DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mariadb-5.5.28.tar.gz 27819467 SHA256 1237568d36fcbda707d363f2819ac539aedf2f49267162ec95e90cf4bb049850 SHA512 8ee9c624da4683ba4145f15014780568c4ea2034204d4f80e0aad688cdfe41cba49d3ca6db7adf52023054a5b7f467ab11d62a5fe30e0d5e92dff491dc8e5e5e WHIRLPOOL 879683cae962d8d15d0913d21df05570b01d24e7c5e9ece3c4ce8e23324005a044122d16a7e683ce43637bed796c93fa05c17e516ddf4e59f0662705be244b6c
diff --git a/dev-db/mariadb/mariadb-5.3.9.ebuild b/dev-db/mariadb/mariadb-5.3.9.ebuild
new file mode 100644
index 0000000..886b2a3
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.9.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120906-1344Z"
+
+# Build system
+BUILD="autotools"
+
+# Suffix on files...
+#MY_PV="$PV-ga"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-10-25 2:58 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-25 2:58 UTC (permalink / raw
To: gentoo-commits
commit: 7054e81ba5948485e96473ab7654e0479216ce05
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 25 02:58:23 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Oct 25 02:58:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7054e81b
[dev-db/mariadb] Version bump to 5.5.28.
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 1 +
dev-db/mariadb/mariadb-5.5.28.ebuild | 134 ++++++++++++++++++++++++++++++++++
2 files changed, 135 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b950972..8cdb3e3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,6 +5,7 @@ DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487c
DIST mariadb-5.3.7.tar.gz 26741196 SHA256 463386ca84128a162e63137c8f6666859b94e2abf490b6ab2306f846a13fe9bc SHA512 08eefd9eabedf4b6097b2fcc6d7a853e9b3b7c262d02fb3aaa37f0f241b98368ca4b052cc8a47ab7fc45714a28720edd203e7f2c9227d6af2a36de7f1274fe6a WHIRLPOOL d4364585e2db4c4d7e823d22468aac21343f0f6d051533372c24c914f4b03939f6f98128872b80169d53aeb7ce4d1f4e42f6fbf38fb9baf6b240c58d7ee17cff
DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
+DIST mariadb-5.5.28.tar.gz 27819467 SHA256 1237568d36fcbda707d363f2819ac539aedf2f49267162ec95e90cf4bb049850 SHA512 8ee9c624da4683ba4145f15014780568c4ea2034204d4f80e0aad688cdfe41cba49d3ca6db7adf52023054a5b7f467ab11d62a5fe30e0d5e92dff491dc8e5e5e WHIRLPOOL 879683cae962d8d15d0913d21df05570b01d24e7c5e9ece3c4ce8e23324005a044122d16a7e683ce43637bed796c93fa05c17e516ddf4e59f0662705be244b6c
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
DIST mysql-extras-20120906-1344Z.tar.bz2 1898342 SHA256 75e8efa38d6b10b63d05553f5c884396bdd50b9a445731892dc7780d0a015b2e SHA512 4c253a5772eea4e130c39b4e127372431afaf53d574f8369e905c636c7c12e7eb534432e1ffd681eb83de857850ddcba161ef5c489e1f077ff850bf95978d4f8 WHIRLPOOL 1e9bd9f1ce83d219c20e089e952a8b39c73d97d027a1309788a3d8e529d5444412d6e4445d362b16e01c9ea918cc7c994635c240ca7f7848a2c06f528d832485
diff --git a/dev-db/mariadb/mariadb-5.5.28.ebuild b/dev-db/mariadb/mariadb-5.5.28.ebuild
new file mode 100644
index 0000000..4ab0808
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.28.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120906-1344Z"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-09-06 13:52 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-09-06 13:52 UTC (permalink / raw
To: gentoo-commits
commit: e87f927af7982ed06bfb2daba635a154492908be
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 6 13:51:44 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep 6 13:51:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e87f927a
Use fixed mysql-extras version.
---
dev-db/mariadb/Manifest | 2 +-
dev-db/mariadb/mariadb-5.1.62-r1.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.12-r1.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.7.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.25-r1.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 454b9b0..b950972 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,4 +7,4 @@ DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3af
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
-DIST mysql-extras-20120905-1511Z.tar.bz2 1898445 SHA256 068a935aa739374a44b77b5d178364d2b6d065d54dac3ec4a69229207d5bfae5 SHA512 7d379bb4f3d7aff042d7c85994b4e038b0879fb45f923b7346329c6525f1168e1edf8a4effecd24f48c0169eed44901c8dccecc05cef1a52752cfd8bdab1e10d WHIRLPOOL 356f9d8fd4bbb81fcd9115dbbca2957de19df7fb30b26c695172169c45592a2332d7562df328e6827e0a8b79d6678ea2a6f678d990630b0d26af873f86819094
+DIST mysql-extras-20120906-1344Z.tar.bz2 1898342 SHA256 75e8efa38d6b10b63d05553f5c884396bdd50b9a445731892dc7780d0a015b2e SHA512 4c253a5772eea4e130c39b4e127372431afaf53d574f8369e905c636c7c12e7eb534432e1ffd681eb83de857850ddcba161ef5c489e1f077ff850bf95978d4f8 WHIRLPOOL 1e9bd9f1ce83d219c20e089e952a8b39c73d97d027a1309788a3d8e529d5444412d6e4445d362b16e01c9ea918cc7c994635c240ca7f7848a2c06f528d832485
diff --git a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
index 541cdeb..203948e 100644
--- a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20120905-1511Z"
+MY_EXTRAS_VER="20120906-1344Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.12-r1.ebuild b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
index 541cdeb..203948e 100644
--- a/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20120905-1511Z"
+MY_EXTRAS_VER="20120906-1344Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.7.ebuild b/dev-db/mariadb/mariadb-5.3.7.ebuild
index d7a65db..886b2a3 100644
--- a/dev-db/mariadb/mariadb-5.3.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.7.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20120905-1511Z"
+MY_EXTRAS_VER="20120906-1344Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
index 42a393f..4ab0808 100644
--- a/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="4"
-MY_EXTRAS_VER="20120905-1511Z"
+MY_EXTRAS_VER="20120906-1344Z"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-09-05 15:23 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-09-05 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 1e12d90da9b1bccac435c3d94276f340f2d8edd5
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 5 15:22:12 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:22:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1e12d90d
Revbump / update mysql ebuilds to apply the patches that fix an sql issue.
---
dev-db/mariadb/Manifest | 2 +
dev-db/mariadb/mariadb-5.1.62-r1.ebuild | 171 ++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.2.12-r1.ebuild | 171 ++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.3.7.ebuild | 174 +++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.5.25-r1.ebuild | 134 ++++++++++++++++++++++++
5 files changed, 652 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 43181ff..454b9b0 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -2,7 +2,9 @@ DIST mariadb-5.1.55.tar.gz 24613002 SHA256 df031b2f7dcc92a36da3a76b346034c286e5c
DIST mariadb-5.1.62.tar.gz 24931609 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da SHA512 a579e7fb9421a7de1a77881575c35d43bfaa2cdfc398477f80373fad4faec0bcc7bea3248cd67972787745744653dbf0c27b226d79dccbc4ffe77bab7dda0c35 WHIRLPOOL 5e8207c5344309a7263570cbd6beca438b4287024ff48aedf33465327d81b2360977fe8da44d1f49500e6c3181e6dea664eb425b73185bbc0c10d3ed55c57e72
DIST mariadb-5.2.12.tar.gz 25364319 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 SHA512 d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333 WHIRLPOOL 10cdec3090f733110c762daae945f6a77f61103f3c14ccf38884df41b036497c360d98cc3be3c754563f8a0affb6ad012224f2f31905b709eb34a61e0613bf90
DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 SHA512 ccf61f42084318a9084f742bdf03786b6590b0969b42c17c05503fac9608a56e39ee1a0ad0276aea413c61822cf5edfddcf25bfe9d421d76e01824332b7fee67 WHIRLPOOL cf5887291affd437f755e63d2c79e3fcc63fa5687dfab8c069b62caced59ced2cdae2a54e560e54a1435ec52c5a21ea19efe081704d98de104fc3c8688713b85
+DIST mariadb-5.3.7.tar.gz 26741196 SHA256 463386ca84128a162e63137c8f6666859b94e2abf490b6ab2306f846a13fe9bc SHA512 08eefd9eabedf4b6097b2fcc6d7a853e9b3b7c262d02fb3aaa37f0f241b98368ca4b052cc8a47ab7fc45714a28720edd203e7f2c9227d6af2a36de7f1274fe6a WHIRLPOOL d4364585e2db4c4d7e823d22468aac21343f0f6d051533372c24c914f4b03939f6f98128872b80169d53aeb7ce4d1f4e42f6fbf38fb9baf6b240c58d7ee17cff
DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
+DIST mysql-extras-20120905-1511Z.tar.bz2 1898445 SHA256 068a935aa739374a44b77b5d178364d2b6d065d54dac3ec4a69229207d5bfae5 SHA512 7d379bb4f3d7aff042d7c85994b4e038b0879fb45f923b7346329c6525f1168e1edf8a4effecd24f48c0169eed44901c8dccecc05cef1a52752cfd8bdab1e10d WHIRLPOOL 356f9d8fd4bbb81fcd9115dbbca2957de19df7fb30b26c695172169c45592a2332d7562df328e6827e0a8b79d6678ea2a6f678d990630b0d26af873f86819094
diff --git a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
new file mode 100644
index 0000000..541cdeb
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120905-1511Z"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.2.12-r1.ebuild b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
new file mode 100644
index 0000000..541cdeb
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120905-1511Z"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.3.7.ebuild b/dev-db/mariadb/mariadb-5.3.7.ebuild
new file mode 100644
index 0000000..d7a65db
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.7.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120905-1511Z"
+
+# Build system
+BUILD="autotools"
+
+# Suffix on files...
+#MY_PV="$PV-ga"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.25-r1.ebuild b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
new file mode 100644
index 0000000..42a393f
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.25-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120905-1511Z"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-08-02 19:27 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-08-02 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 394cc0b12035a6dab8159f8cb720d00cc97a1ed1
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 2 19:27:15 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 2 19:27:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=394cc0b1
Respin Manifest.
---
dev-db/mariadb/Manifest | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 149418e..43181ff 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,4 +6,3 @@ DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3af
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
-DIST mysql-extras-20120425-1449Z.tar.bz2 1836573 SHA256 92d7a3f425225bc4d9774e1b7617a7aaaa65097bc62ca7106698c976afc47e50
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-08-02 19:27 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-08-02 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 0bf036cffb078a08180c0c57e6a6af3a099a3a74
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Aug 2 19:04:35 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 2 19:04:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0bf036cf
Remove custom revisions that point to a non-existant patch file
The patch file was meant to be a local test.
---
dev-db/mariadb/mariadb-5.1.62-r1.ebuild | 171 ------------------------------
dev-db/mariadb/mariadb-5.2.12-r1.ebuild | 171 ------------------------------
dev-db/mariadb/mariadb-5.3.6-r1.ebuild | 174 -------------------------------
3 files changed, 0 insertions(+), 516 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
deleted file mode 100644
index 4a5d5c1..0000000
--- a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20120425-1449Z"
-
-# Build system
-BUILD="autotools"
-
-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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.12-r1.ebuild b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
deleted file mode 100644
index c692615..0000000
--- a/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120425-1449Z"
-
-# Build system
-BUILD="autotools"
-
-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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.6-r1.ebuild b/dev-db/mariadb/mariadb-5.3.6-r1.ebuild
deleted file mode 100644
index acff40f..0000000
--- a/dev-db/mariadb/mariadb-5.3.6-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20120425-1449Z"
-
-# Build system
-BUILD="autotools"
-
-# Suffix on files...
-#MY_PV="$PV-ga"
-
-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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 47c8dfaeb9c4c2c992104d615099c9642b784ff3
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 27 16:08:34 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 16:08:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=47c8dfae
Regen with thin manifests.
(Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d02fca1..149418e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,27 +1,9 @@
-DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.1.55.tar.gz 24613002 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b SHA512 233e9fc07144aa266e4d0f65117e0f47d6445162469860e98351926c98f269c89e466bb0da8fdb9b46874f5fa5d1fdfdc63fe092218272fe02519abdadcc84b8 WHIRLPOOL 9750d587db600687465e1acc9431613a0adec734964a68752d1c2884052e1d27fdb476bbaaec9e914a90ef939d5b51f3886e2d14caeab6b451800f4329074171
-DIST mariadb-5.1.62.tar.gz 24931609 RMD160 873961f72de719fed085085c8cb8560c7cef5e06 SHA1 b08c7d5b229eee5f646f839d924223dac9b82a38 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da
DIST mariadb-5.1.62.tar.gz 24931609 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da SHA512 a579e7fb9421a7de1a77881575c35d43bfaa2cdfc398477f80373fad4faec0bcc7bea3248cd67972787745744653dbf0c27b226d79dccbc4ffe77bab7dda0c35 WHIRLPOOL 5e8207c5344309a7263570cbd6beca438b4287024ff48aedf33465327d81b2360977fe8da44d1f49500e6c3181e6dea664eb425b73185bbc0c10d3ed55c57e72
-DIST mariadb-5.2.10.tar.gz 25242675 SHA256 dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
-DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.2.12.tar.gz 25364319 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 SHA512 d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333 WHIRLPOOL 10cdec3090f733110c762daae945f6a77f61103f3c14ccf38884df41b036497c360d98cc3be3c754563f8a0affb6ad012224f2f31905b709eb34a61e0613bf90
-DIST mariadb-5.2.7.tar.gz 25099195 SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3 SHA512 a2912899a53cfb53f76f66fa303d295d61e3328948cf2fa58efc234ebccf8fb766b7019f38525ed03d85792ef3ad9bcad34f6baa2f4f9ed70a597effd7ed92fc WHIRLPOOL 67e410f02ec4e7d027be16d1a68b95a82f732b90d0eeb2da463c23f8d4547a26221ca5fa99d376440d19f2360970c343f7cc532461f2a82488716b00aebba0f6
-DIST mariadb-5.2.8.tar.gz 25105533 SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
-DIST mariadb-5.2.9.tar.gz 25107185 SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
-DIST mariadb-5.3.0-beta.tar.gz 26244818 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
-DIST mariadb-5.3.1-beta.tar.gz 26294191 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
-DIST mariadb-5.3.3-rc.tar.gz 26578753 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
-DIST mariadb-5.3.5-ga.tar.gz 26610363 SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3 SHA512 ec756b4b3a32d525d95b6b990f8d98fc0e25b15567a4d883394734d378079c6fee0af6479502963b21cd33a912c4d33362b44be06433b1ed021acedaca86a158 WHIRLPOOL 1b0fdf3210b61d30e91676b138d8c06ffefeefbbad04c6be7e60fd4514b1b6c6c32f8834cf53c8294b4a6299113e65e765ac64e9f84a811f5cdbeafc6aa445e4
-DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 SHA512 ccf61f42084318a9084f742bdf03786b6590b0969b42c17c05503fac9608a56e39ee1a0ad0276aea413c61822cf5edfddcf25bfe9d421d76e01824332b7fee67 WHIRLPOOL cf5887291affd437f755e63d2c79e3fcc63fa5687dfab8c069b62caced59ced2cdae2a54e560e54a1435ec52c5a21ea19efe081704d98de104fc3c8688713b85
-DIST mariadb-5.5.22.tar.gz 27412188 SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016 SHA512 fe37939ca5ec190378b25e9cb8f19ecc734dfd9017e79e8f843a62c031b7010c8eebf70cc0281f5ef081253d557c05d12d40362e6cdccab605ddaf62cd691054 WHIRLPOOL bfb79c790b103537fe32c107e24858b4484c8000d6d3f69d4feefb4862636484eb1cbdd2385cbab8b6d7f9eac9fc751bb0edbb415353ba8689f0f58bc8659586
-DIST mariadb-5.5.23.tar.gz 27432223 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797 SHA512 969836bdc4cf8a0c850b7b5aabbe148b31f5e5be387f986e59d35b83b0d10e93f89c65cdb7541d34c18b5cddbb1b7379f73bc52c4bd08f8a0c92ae958d566ad6 WHIRLPOOL f54fc3da96bbc6663bde43ce4d692fd453cc5dca9c697aaf6da33241b08e746e52dbebfc54c360c3d0bee9cfb65413379cb6d221f1fe849c2882abd070a7b893
-DIST mariadb-5.5.24.tar.gz 27438507 RMD160 237dd9e77c110c11d078362cb7c84c3dcefbf785 SHA1 70b5190c58508ae269853e3fbd75c1f850306ff5 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
-DIST mariadb-5.5.25.tar.gz 27488554 RMD160 9ba60ac2d768b4f89b76ed65f14de3c18e8590b2 SHA1 18101986c45d97766eb67293d8995b8835ab592a SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb
+DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
-DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
-DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f SHA512 9432f7bc95118f5fcf0c18779391af27f98bfed3eab4bc26e33266ed2411ba9ed1699b13c5450e59ff8c420bd6cac3122586a2d50d041a9a67adc8eeda639971 WHIRLPOOL d24b123899bccda6758e0f70398a68ae3340592320f641d112e3c0e317da864ef8ef0b65534554557381b60af4b697faef3181c03b395eebcbc2c45e2bc3baf4
-DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
-DIST mysql-extras-20120425-1449Z.tar.bz2 1836573 RMD160 13bc759ef9c4ce7dddaca46e49f60ff3e5b8133c SHA1 119f009ab4f07ccccdc276445afdaf5bd86e1c54 SHA256 92d7a3f425225bc4d9774e1b7617a7aaaa65097bc62ca7106698c976afc47e50
+DIST mysql-extras-20120425-1449Z.tar.bz2 1836573 SHA256 92d7a3f425225bc4d9774e1b7617a7aaaa65097bc62ca7106698c976afc47e50
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 8d4e0e49963c3adbb7042a4988e8667e5c0ce50f
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 27 15:59:29 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 15:59:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8d4e0e49
Re-add Manifest details for 5.5.23.
---
dev-db/mariadb/Manifest | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index eedc354..0147f0d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -14,6 +14,7 @@ DIST mariadb-5.3.5-ga.tar.gz 26610363 SHA256 8b90d52d48de27f43b3f5480fdda80868b9
DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 SHA512 ccf61f42084318a9084f742bdf03786b6590b0969b42c17c05503fac9608a56e39ee1a0ad0276aea413c61822cf5edfddcf25bfe9d421d76e01824332b7fee67 WHIRLPOOL cf5887291affd437f755e63d2c79e3fcc63fa5687dfab8c069b62caced59ced2cdae2a54e560e54a1435ec52c5a21ea19efe081704d98de104fc3c8688713b85
DIST mariadb-5.5.22.tar.gz 27412188 SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016 SHA512 fe37939ca5ec190378b25e9cb8f19ecc734dfd9017e79e8f843a62c031b7010c8eebf70cc0281f5ef081253d557c05d12d40362e6cdccab605ddaf62cd691054 WHIRLPOOL bfb79c790b103537fe32c107e24858b4484c8000d6d3f69d4feefb4862636484eb1cbdd2385cbab8b6d7f9eac9fc751bb0edbb415353ba8689f0f58bc8659586
DIST mariadb-5.5.23.tar.gz 27432223 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797 SHA512 969836bdc4cf8a0c850b7b5aabbe148b31f5e5be387f986e59d35b83b0d10e93f89c65cdb7541d34c18b5cddbb1b7379f73bc52c4bd08f8a0c92ae958d566ad6 WHIRLPOOL f54fc3da96bbc6663bde43ce4d692fd453cc5dca9c697aaf6da33241b08e746e52dbebfc54c360c3d0bee9cfb65413379cb6d221f1fe849c2882abd070a7b893
+DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 SHA512 4441715d9b46b4b100b5e3ff05675a5408ad53f304cb9c476c98008ef276a7b68206231b54dd01ea562491ab6f37e42bb5f49f9549862ad161e26adbbc04e267 WHIRLPOOL 34bbe9cd7151d9635b62a09c8a4d3850e1d2757113050b581363b93aea3185f2a35f372d30f12e42f65fdb6a454b3dc3809a05b1e16392ae2c07dfe1b9160de8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f SHA512 9432f7bc95118f5fcf0c18779391af27f98bfed3eab4bc26e33266ed2411ba9ed1699b13c5450e59ff8c420bd6cac3122586a2d50d041a9a67adc8eeda639971 WHIRLPOOL d24b123899bccda6758e0f70398a68ae3340592320f641d112e3c0e317da864ef8ef0b65534554557381b60af4b697faef3181c03b395eebcbc2c45e2bc3baf4
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
@@ -31,5 +32,6 @@ EBUILD mariadb-5.3.5.ebuild 6071 SHA256 3951dd789bfd9434ab19e80c8c632e9ddff6addf
EBUILD mariadb-5.3.6.ebuild 6072 SHA256 f10c3de112d2fb09486bea4387b85f54521bd8a97f5ace2eff4d5714a92cf16e SHA512 6e65eeb928a265b41df8da2e77b7fe8d6b005590491756c4e271d7579f0e106f83be50c81786f44e3b822d5764baf2721fc4ddd126cc21c94e44afac300cc7ae WHIRLPOOL ff61b34c4ad794115c77e5cd37000b4c596dce646ed2fb4d9eed3548e7f9c7669885a438b292156dc3407fafa5d2f16a0dbc39683473e68dbd384b23b4e6a6f2
EBUILD mariadb-5.5.22.ebuild 6030 SHA256 c2c9aa0f2862b8ec16111cf916ee35b5d1340e956ebe3de4d305ca9d45f91cd2 SHA512 0cee1ae6fee1d236213a1a3ce5a45fead096056d5c0589b5d418dbba35be06f0b31618751a349f3ea41eccbade7e71d80457dc83ae6cec8fb7278b9d10bb708c WHIRLPOOL e00eb3ade42ef58ef80e579f255c2ac00fda216f96472a9c83dd9422dc4e9b9b18b61de9dc0413bd82281e9636a38ccc8cfc677f4907e4ec3a0987dae5286d84
EBUILD mariadb-5.5.23.ebuild 6030 SHA256 5f0c6bd23878abcb4a89b249d460b4ceacb1dada169076c5cd01f9e1791cce92 SHA512 78ff94091a75ade25ce2985db82afaad60c5c934f4195e415da632b10d75a32cb4451054c4cb8249651e10527209bc11950dd7a97335c7085ebb6c6dac46465b WHIRLPOOL 29a69ae614f2b22bfbe366de16b58c9fe7a66fb559ed4663fb97fa0fa64202f29e2bb208b713ab4c717daad126c7a4d1da0c341f7e0581012662ec0c8f26ba6e
+EBUILD mariadb-5.5.25.ebuild 6030 SHA256 5f0c6bd23878abcb4a89b249d460b4ceacb1dada169076c5cd01f9e1791cce92 SHA512 78ff94091a75ade25ce2985db82afaad60c5c934f4195e415da632b10d75a32cb4451054c4cb8249651e10527209bc11950dd7a97335c7085ebb6c6dac46465b WHIRLPOOL 29a69ae614f2b22bfbe366de16b58c9fe7a66fb559ed4663fb97fa0fa64202f29e2bb208b713ab4c717daad126c7a4d1da0c341f7e0581012662ec0c8f26ba6e
MISC ChangeLog 5202 SHA256 7446f05fafadc91d5d386f5c24ffbcaaf12820e9fef8c12ab003f6dc3802b042 SHA512 dd6e3b367c0fa766a0eae9ba6443feadb9ac9331c61e3595944f50655fe1d4098472f3d4b60db927bb2cb804143b2ae3dc85a66794d5f476536149b8fa34da0a WHIRLPOOL a24cfced90dec9cbde7e5387589f1f55a551b953ba8022166ad9da7715169c8f610f510eca1abb3b1b649d68b5c95590b27b9439d5592b1c6dc1f0a6e7e260d0
MISC metadata.xml 1378 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a SHA512 21c8e3dd712aabc47906688a353b49446a8374a737b850bfed597c8a21808b9f8852ac53416ed138eca7575873c7521e8682c4e1b56868a92bd42df1236fbd41 WHIRLPOOL 793eff08479395e7aa14575725da00d8e3dd57e90d204556b5f3f45acb6ee682a97d53e1fc6e059ecc1fd1ef7dd68ed4bccc65713691910c267c63ead181429b
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: c76e8c81d7e65b6159fe51ebcfd9e005bb786301
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Jun 25 13:36:57 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 13:36:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c76e8c81
Version bump
---
dev-db/mariadb/Manifest | 4 +
dev-db/mariadb/mariadb-5.5.24.ebuild | 134 ++++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.5.25.ebuild | 134 ++++++++++++++++++++++++++++++++++
3 files changed, 272 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bea7cdd..5959949 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,6 +5,8 @@ DIST mariadb-5.1.62.tar.gz 24931609 RMD160 873961f72de719fed085085c8cb8560c7cef5
DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797
+DIST mariadb-5.5.24.tar.gz 27438507 RMD160 237dd9e77c110c11d078362cb7c84c3dcefbf785 SHA1 70b5190c58508ae269853e3fbd75c1f850306ff5 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
+DIST mariadb-5.5.25.tar.gz 27488554 RMD160 9ba60ac2d768b4f89b76ed65f14de3c18e8590b2 SHA1 18101986c45d97766eb67293d8995b8835ab592a SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
DIST mysql-extras-20120425-1449Z.tar.bz2 1836573 RMD160 13bc759ef9c4ce7dddaca46e49f60ff3e5b8133c SHA1 119f009ab4f07ccccdc276445afdaf5bd86e1c54 SHA256 92d7a3f425225bc4d9774e1b7617a7aaaa65097bc62ca7106698c976afc47e50
@@ -16,5 +18,7 @@ EBUILD mariadb-5.2.12.ebuild 6046 RMD160 474a23da89d8530a8f368c0a2a691646cfaf36e
EBUILD mariadb-5.3.6-r1.ebuild 6072 RMD160 2c28f7e09f0e6b57d22592411184c5bda7757756 SHA1 0d1571e7991e3f37288d9bb1f9f1dac373e1b584 SHA256 0c3dcdb04bb346749842f2261f4c05f93e412518d7f709d0e75bc7e69115f665
EBUILD mariadb-5.3.6.ebuild 6072 RMD160 c38b9b1e538b68d1e51df194f49c674f021c598f SHA1 087692428be05007f463e7bf1a3de14398a55ce2 SHA256 f10c3de112d2fb09486bea4387b85f54521bd8a97f5ace2eff4d5714a92cf16e
EBUILD mariadb-5.5.23.ebuild 4531 RMD160 e0933a095d5d7267d6a4d02ea62a1c9eceea48e5 SHA1 ed731058038a62f1d8b5eebf9e6b20c14ef6bd65 SHA256 1a4c62cdb210f9742e72db123af39e7a867b64a1ecb76b2828da42dfab58d345
+EBUILD mariadb-5.5.24.ebuild 4531 RMD160 e0933a095d5d7267d6a4d02ea62a1c9eceea48e5 SHA1 ed731058038a62f1d8b5eebf9e6b20c14ef6bd65 SHA256 1a4c62cdb210f9742e72db123af39e7a867b64a1ecb76b2828da42dfab58d345
+EBUILD mariadb-5.5.25.ebuild 4531 RMD160 e0933a095d5d7267d6a4d02ea62a1c9eceea48e5 SHA1 ed731058038a62f1d8b5eebf9e6b20c14ef6bd65 SHA256 1a4c62cdb210f9742e72db123af39e7a867b64a1ecb76b2828da42dfab58d345
MISC ChangeLog 5202 RMD160 b1347ba86cc4baee8678289b8d8dd7363b3cc7cd SHA1 42300e5bfa29446eb01daaf0771fe6e2050341d5 SHA256 7446f05fafadc91d5d386f5c24ffbcaaf12820e9fef8c12ab003f6dc3802b042
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.5.24.ebuild b/dev-db/mariadb/mariadb-5.5.24.ebuild
new file mode 100644
index 0000000..46fb196
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.24.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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.25.ebuild b/dev-db/mariadb/mariadb-5.5.25.ebuild
new file mode 100644
index 0000000..46fb196
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.25.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${CMAKE_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))"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+ # 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, 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.
+ #
+ # sys_vars.plugin_dir_basic
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+ # instead of MYSQL_LIBDIR/plugin
+ #
+ # main.flush_read_lock_kill
+ # fails because of unknown system variable 'DEBUG_SYNC'
+ #
+ # main.openssl_1
+ # error message changing
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: ASN: bad other signature confirmation
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection
+ # error: error:00000001:lib(0):func(0):reason(1)
+ #
+ # plugins.unix_socket
+ # fails because portage strips out the USER enviornment variable
+ #
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help main.flush_read_lock_kill \
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+ 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="${S}/mysql-test/var-tests"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 197e0e3eaa9ad25e4231ea158ed4fb49c7ba950d
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Apr 12 13:58:44 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 13:58:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=197e0e3e
Add new version 5.1.62.
Requires patches: https://github.com/downloads/grknight/gentoo-mysql/mysql-extras-20120411-2000Z.tar.bz2
---
dev-db/mariadb/Manifest | 3 +
dev-db/mariadb/mariadb-5.1.62.ebuild | 171 ++++++++++++++++++++++++++++++++++
2 files changed, 174 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7ea8e95..63dec85 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,13 +1,16 @@
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
+DIST mariadb-5.1.62.tar.gz 24931609 RMD160 873961f72de719fed085085c8cb8560c7cef5e06 SHA1 b08c7d5b229eee5f646f839d924223dac9b82a38 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da
DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
+DIST mysql-extras-20120411-2000Z.tar.bz2 3984865 RMD160 027f4c0ce06820abfea1d0e2bf13517125d70cdf SHA1 06dc4b942fd1663252320b2e3165ae076b5f2c0d SHA256 be52fa540259b7ed3b473141d0ccef723495f9babc472bc59a49e0340cd64124
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
+EBUILD mariadb-5.1.62.ebuild 6034 RMD160 c6987c716ebae6542a52555445e74c9a90f4221a SHA1 5491c982f4abec08ea75ac3128ab7e53b2ac6018 SHA256 e81936ea48ca5aebdc2ba15c54ab7f8d140559f9162335538c897a8bdda4ebee
EBUILD mariadb-5.2.12.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
EBUILD mariadb-5.3.6.ebuild 5927 RMD160 2e6ff9328c5e1c07c3e53c233a54b4af4cb7343a SHA1 a66164dadde6d87cff93af791a071d5d7f71711e SHA256 bbdd621bcafcd5ff6d722ee5cdcf527d278d90fbe5cb7138a40e94fe7a33bd8f
EBUILD mariadb-5.5.23.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
diff --git a/dev-db/mariadb/mariadb-5.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
new file mode 100644
index 0000000..088abe3
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.62.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
+
+MY_EXTRAS_VER="20120411-2000Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 833aa2e4cb6775f0dc944e18bb5a86ecbb731e4d
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Apr 26 17:02:32 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 17:02:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=833aa2e4
Revision bump for new patch on unit tests
---
dev-db/mariadb/Manifest | 4 +
dev-db/mariadb/mariadb-5.1.62-r1.ebuild | 171 ++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.2.12-r1.ebuild | 171 ++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.3.6-r1.ebuild | 174 +++++++++++++++++++++++++++++++
4 files changed, 520 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4aff89c..641df53 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,9 +7,13 @@ DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d
DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
+DIST mysql-extras-20120425-1449Z.tar.bz2 1836573 RMD160 13bc759ef9c4ce7dddaca46e49f60ff3e5b8133c SHA1 119f009ab4f07ccccdc276445afdaf5bd86e1c54 SHA256 92d7a3f425225bc4d9774e1b7617a7aaaa65097bc62ca7106698c976afc47e50
EBUILD mariadb-5.1.55.ebuild 6142 RMD160 d37d437fb6ca06ed401562d940b2e3fd247bdb58 SHA1 9fd86aef888681f6153b34a9a1726cdab64768d4 SHA256 02ac78bb31848b3d2146c3e34942716ed800d383bcf87698c26af03155868676
+EBUILD mariadb-5.1.62-r1.ebuild 6142 RMD160 0171a3a40e5b228d3f5da1679cc71569925c502a SHA1 e63fea90056cc60f81b57fcc38afb708cfff520b SHA256 a639e9a097cc28bc109f789d505d85b504259e07b88356f90501311176520649
EBUILD mariadb-5.1.62.ebuild 6142 RMD160 74136010c7440e6cbe836dbb92fdc205f3f5df8b SHA1 082ec1bc120988a4c591d67b4443be05dd5b390d SHA256 3f2a5bc08df049564a7139f9d5a6ccf13c7ca721473161773203b83d88d6fd13
+EBUILD mariadb-5.2.12-r1.ebuild 6046 RMD160 af90a34c3edc97e9e66b03602e9af252a9188517 SHA1 9097926f67a9d8e4a7a70a290b809c02db6ce100 SHA256 56a6b154ca1014ea18dde3fe1bec15981220eb50d914496db00755225ac66f72
EBUILD mariadb-5.2.12.ebuild 6046 RMD160 c317f66b2697f6a8ea7deb77d6622a69b0359499 SHA1 bf0e7f28626fad0d1e1cc52d5577e8c8857664b7 SHA256 db2572c5088e5588a3d42dc9b6028e5227be58453f75496d64eda5d32b251a2f
+EBUILD mariadb-5.3.6-r1.ebuild 6072 RMD160 f585fd23af45573f58860eb44671a27b8b9d69f3 SHA1 d6bc5eb24c2ce3e2195db13be8bb88af73d40be0 SHA256 0a70660b819466cd4120db8ea9e8e259f79f021c20f4d9e643714e0fdd9f1c82
EBUILD mariadb-5.3.6.ebuild 6072 RMD160 5a998436022c66d34609c0cdf5c107078ca23873 SHA1 7fbfa71d03f315920886dda4f638fec54a9c0975 SHA256 33225bdde427062b0562bf4efb6c5030ad69c1393586a6d5ad9e3c79fb52f972
EBUILD mariadb-5.5.23.ebuild 4531 RMD160 46f81c31bf8934d9f0f5b5eea79d0a44abbdd05f SHA1 89ebd0ef358fe85e611dc3821cbe296f4edb78bf SHA256 63c86e8e3be008bee8ce10bb155965e3afdac8f0e6a519adc19906df02ca2cd8
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
diff --git a/dev-db/mariadb/mariadb-5.1.62-r1.ebuild b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
new file mode 100644
index 0000000..0c7a7e3
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.62-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
+
+MY_EXTRAS_VER="20120425-1449Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.2.12-r1.ebuild b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
new file mode 100644
index 0000000..6b00eea
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.12-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20120425-1449Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.3.6-r1.ebuild b/dev-db/mariadb/mariadb-5.3.6-r1.ebuild
new file mode 100644
index 0000000..91c0198
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.6-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20120425-1449Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+# Suffix on files...
+#MY_PV="$PV-ga"
+
+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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 17071d4680c444f80478efdd30f2625990e44d1a
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Apr 9 15:21:22 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 15:21:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=17071d46
Security commit. MariaDB 5.2.12 includes a important remote security fix.
See http://kb.askmonty.org/en/mariadb-5212-release-notes.
Remove old 5.2 series versions.
---
dev-db/mariadb/Manifest | 10 +-
...mariadb-5.2.10.ebuild => mariadb-5.2.12.ebuild} | 0
dev-db/mariadb/mariadb-5.2.7.ebuild | 171 --------------------
dev-db/mariadb/mariadb-5.2.8.ebuild | 171 --------------------
dev-db/mariadb/mariadb-5.2.9.ebuild | 171 --------------------
5 files changed, 2 insertions(+), 521 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4e5d0b7..9bf0b70 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,20 +1,14 @@
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
-DIST mariadb-5.2.10.tar.gz 25242675 RMD160 f5b5a7776e41e29449f60dc0528ccefba0d73d36 SHA1 053326aed589b4cdb23560269890ed12ae6885a2 SHA256 dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
-DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
-DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
-DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
+DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
-EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
-EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
-EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
-EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
+EBUILD mariadb-5.2.12.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
EBUILD mariadb-5.3.6.ebuild 5927 RMD160 2e6ff9328c5e1c07c3e53c233a54b4af4cb7343a SHA1 a66164dadde6d87cff93af791a071d5d7f71711e SHA256 bbdd621bcafcd5ff6d722ee5cdcf527d278d90fbe5cb7138a40e94fe7a33bd8f
EBUILD mariadb-5.5.22.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
diff --git a/dev-db/mariadb/mariadb-5.2.10.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.2.10.ebuild
rename to dev-db/mariadb/mariadb-5.2.12.ebuild
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
deleted file mode 100644
index efb1ba4..0000000
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.8.ebuild b/dev-db/mariadb/mariadb-5.2.8.ebuild
deleted file mode 100644
index efb1ba4..0000000
--- a/dev-db/mariadb/mariadb-5.2.8.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
deleted file mode 100644
index efb1ba4..0000000
--- a/dev-db/mariadb/mariadb-5.2.9.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: bc6f75ef5c2b213b8eb8088cf3f03fdefdeec620
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Apr 9 15:01:15 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 15:01:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bc6f75ef
Security commit. MariaDB 5.3.6 includes a important remote security fix.
See http://kb.askmonty.org/en/mariadb-536-release-notes.
Remove old 5.3 series versions.
---
dev-db/mariadb/Manifest | 12 +-
dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 171 --------------------
dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 171 --------------------
dev-db/mariadb/mariadb-5.3.3_rc.ebuild | 171 --------------------
.../{mariadb-5.3.5.ebuild => mariadb-5.3.6.ebuild} | 0
5 files changed, 3 insertions(+), 522 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d2405e1..4e5d0b7 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,10 +5,7 @@ DIST mariadb-5.2.10.tar.gz 25242675 RMD160 f5b5a7776e41e29449f60dc0528ccefba0d73
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
-DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
-DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
-DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
-DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3
+DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
@@ -18,10 +15,7 @@ EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e3
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
-EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
-EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df6883345836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382
-EBUILD mariadb-5.5.22.ebuild 4184 RMD160 fc4a1468e5db24a8be919960b69ebb972eeff379 SHA1 a1e7d9f733bba7357f51ea70d1888a0e68714859 SHA256 dc079c6447715da7c3d8cefdfe72843291af6e239676dd6fe1c2cb970d62824e
+EBUILD mariadb-5.3.6.ebuild 5927 RMD160 2e6ff9328c5e1c07c3e53c233a54b4af4cb7343a SHA1 a66164dadde6d87cff93af791a071d5d7f71711e SHA256 bbdd621bcafcd5ff6d722ee5cdcf527d278d90fbe5cb7138a40e94fe7a33bd8f
+EBUILD mariadb-5.5.22.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
deleted file mode 100644
index 75579d1..0000000
--- a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
deleted file mode 100644
index 75579d1..0000000
--- a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.3_rc.ebuild b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
deleted file mode 100644
index a461c4f..0000000
--- a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.1.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.2.*|5.3.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.3.5.ebuild
rename to dev-db/mariadb/mariadb-5.3.6.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 2417149783f1353f372a879a0f1a40d00a0b77a4
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Apr 9 15:22:04 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 15:22:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=24171497
Fix MY_PV which is not needed for this release
---
dev-db/mariadb/mariadb-5.3.6.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
index 573efa2..ace7037 100644
--- a/dev-db/mariadb/mariadb-5.3.6.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.6.ebuild
@@ -9,7 +9,7 @@ EAPI="4"
BUILD="autotools"
# Suffix on files...
-MY_PV="$PV-ga"
+#MY_PV="$PV-ga"
inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-27 16:09 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 8c7f96f41b7f93c30459d95908136511c7cfdc19
Author: Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Apr 11 19:04:23 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 19:04:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8c7f96f4
Security commit. MariaDB 5.5.23 includes a important remote security fix.
See http://kb.askmonty.org/en/mariadb-5523-release-notes.
Remove old 5.5 series versions.
---
dev-db/mariadb/Manifest | 4 ++--
...mariadb-5.5.22.ebuild => mariadb-5.5.23.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9bf0b70..7ea8e95 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,13 +3,13 @@ AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
-DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016
+DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
EBUILD mariadb-5.2.12.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
EBUILD mariadb-5.3.6.ebuild 5927 RMD160 2e6ff9328c5e1c07c3e53c233a54b4af4cb7343a SHA1 a66164dadde6d87cff93af791a071d5d7f71711e SHA256 bbdd621bcafcd5ff6d722ee5cdcf527d278d90fbe5cb7138a40e94fe7a33bd8f
-EBUILD mariadb-5.5.22.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
+EBUILD mariadb-5.5.23.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.23.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.22.ebuild
rename to dev-db/mariadb/mariadb-5.5.23.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-26 4:51 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-26 4:51 UTC (permalink / raw
To: gentoo-commits
commit: 2ee885044fd9da5bab2619f431949a8ce721c8db
Author: jbergstroem <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Thu Jul 26 03:30:12 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 26 03:30:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2ee88504
Version bump
Signed-off-by: jbergstroem <bugs <AT> bergstroem.nu>
---
...mariadb-5.5.23.ebuild => mariadb-5.5.25.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/mariadb-5.5.23.ebuild b/dev-db/mariadb/mariadb-5.5.25.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.5.23.ebuild
rename to dev-db/mariadb/mariadb-5.5.25.ebuild
^ permalink raw reply [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-07-26 4:47 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-07-26 4:47 UTC (permalink / raw
To: gentoo-commits
commit: b625e69cbb020e79a6fd15ebf4589a6dc328c55c
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Jun 3 19:36:27 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 3 19:36:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b625e69c
Fix order of EAPI header.
(Portage version: 2.2.0_alpha107/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 28 ++++++++++++++--------------
dev-db/mariadb/mariadb-5.1.55.ebuild | 2 +-
dev-db/mariadb/mariadb-5.1.62.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.10.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.12.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.7.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.8.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.9.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.3_rc.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.5.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.6.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.22.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.23.ebuild | 2 +-
15 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6f0eb7f..91ac84b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -17,19 +17,19 @@ DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a69945
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
-EBUILD mariadb-5.1.55.ebuild 6142 RMD160 d37d437fb6ca06ed401562d940b2e3fd247bdb58 SHA1 9fd86aef888681f6153b34a9a1726cdab64768d4 SHA256 02ac78bb31848b3d2146c3e34942716ed800d383bcf87698c26af03155868676
-EBUILD mariadb-5.1.62.ebuild 6142 RMD160 74136010c7440e6cbe836dbb92fdc205f3f5df8b SHA1 082ec1bc120988a4c591d67b4443be05dd5b390d SHA256 3f2a5bc08df049564a7139f9d5a6ccf13c7ca721473161773203b83d88d6fd13
-EBUILD mariadb-5.2.10.ebuild 6046 RMD160 0ae9bd1704f0d281c8323b874f252fd620afbe94 SHA1 fa6864cecc7276ff7cdaf81e465cb3e2ba74de0b SHA256 729c091004fad7e6271c422eb5bb5cb6e78d054fbfa065eab7022585b7f0816c
-EBUILD mariadb-5.2.12.ebuild 6046 RMD160 c317f66b2697f6a8ea7deb77d6622a69b0359499 SHA1 bf0e7f28626fad0d1e1cc52d5577e8c8857664b7 SHA256 db2572c5088e5588a3d42dc9b6028e5227be58453f75496d64eda5d32b251a2f
-EBUILD mariadb-5.2.7.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
-EBUILD mariadb-5.2.8.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
-EBUILD mariadb-5.2.9.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
-EBUILD mariadb-5.3.0_beta.ebuild 6034 RMD160 df865c2d66e1ea136fada93afdc08ec8671bee29 SHA1 386821ab30b7023004fd9b0226969abb05d710a5 SHA256 3431e4592ca14db09c749df6c12d9e3f22439f3eb7a4d554a7a94a8f85da4e00
-EBUILD mariadb-5.3.1_beta.ebuild 6034 RMD160 df865c2d66e1ea136fada93afdc08ec8671bee29 SHA1 386821ab30b7023004fd9b0226969abb05d710a5 SHA256 3431e4592ca14db09c749df6c12d9e3f22439f3eb7a4d554a7a94a8f85da4e00
-EBUILD mariadb-5.3.3_rc.ebuild 6034 RMD160 4a0d12cefe58258c6a38b5cb2402700f95812641 SHA1 a5b369e6695db2f0d34eeca6ec377f722a2acfc8 SHA256 9fee967fc4cda386433e63c187111a1b6378ae3eeb4f2ccc23a5df0e7d85f512
-EBUILD mariadb-5.3.5.ebuild 6071 RMD160 3284c0229c1d144a52578b8c9f778c20e5e9b885 SHA1 c174545fd05211492e30f1220411aa9f2a78e479 SHA256 17f095f9acde77f44df7898f0ae7902884b596240a9e460ebaba044ff5c4bec1
-EBUILD mariadb-5.3.6.ebuild 6072 RMD160 5a998436022c66d34609c0cdf5c107078ca23873 SHA1 7fbfa71d03f315920886dda4f638fec54a9c0975 SHA256 33225bdde427062b0562bf4efb6c5030ad69c1393586a6d5ad9e3c79fb52f972
-EBUILD mariadb-5.5.22.ebuild 6030 RMD160 92745efdf2c1a4c84d4f873c1c89d78353dfe1d8 SHA1 286bc3ce915e2a60ce934e127ff17fc95c451d5b SHA256 c102ea45821ea6b51b1392014c35f35b9361bf563814103a6100ce979132a507
-EBUILD mariadb-5.5.23.ebuild 6030 RMD160 5e2d288a0345e13a3ebd8425a6f5f6679d8924ed SHA1 959ac4fdccade464ffc3e50c18ac50080748af88 SHA256 c08e9f6b02e6bac14e5d67821448f9dd6b3de852309b40aec45cdb429841b543
+EBUILD mariadb-5.1.55.ebuild 6142 RMD160 570d49325eb6eb9c0dab3ffa622691446c1ab775 SHA1 661fe701c9767cd04a489f5b160be7847fc52c6b SHA256 5fee2c0ecba723a548d4e077975eae5cb443b9a45865c6744d87393cbb63903f
+EBUILD mariadb-5.1.62.ebuild 6142 RMD160 9856e2b6c158e51923413d9487e5e0f4b66673ae SHA1 509c455a519001821909de9d82ed058266cb09bf SHA256 53e28a2c6dedc41da7927f7b3bd70b6401bfca9ca35204462fa028ab9051dd1c
+EBUILD mariadb-5.2.10.ebuild 6046 RMD160 abb863607b499f2dc32b0cc63bab41528e312ac4 SHA1 6798c55599a0620d3eee9d8b2ea651d12d5951c8 SHA256 3c1e9b7b1e55ef26b18838ff1a472c891e7c1e2ded6129c3a7d386ca9bec0fb8
+EBUILD mariadb-5.2.12.ebuild 6046 RMD160 474a23da89d8530a8f368c0a2a691646cfaf36e4 SHA1 03453ad8a87d063cd8622760fcb6e7715df17bab SHA256 61742537e36f197bc00b5aa448201d96e58033bea08d8776f85d85600f6da6ec
+EBUILD mariadb-5.2.7.ebuild 6046 RMD160 d074950f1363443c3ead9a44b358c51857e20d62 SHA1 faab67e156f1d6e93173c95e8285a711eb9746b5 SHA256 8eda34b8a2350c6558b6d8143d65c0eb4c4cf32c39920f9ffbffbc7836966380
+EBUILD mariadb-5.2.8.ebuild 6046 RMD160 d074950f1363443c3ead9a44b358c51857e20d62 SHA1 faab67e156f1d6e93173c95e8285a711eb9746b5 SHA256 8eda34b8a2350c6558b6d8143d65c0eb4c4cf32c39920f9ffbffbc7836966380
+EBUILD mariadb-5.2.9.ebuild 6046 RMD160 d074950f1363443c3ead9a44b358c51857e20d62 SHA1 faab67e156f1d6e93173c95e8285a711eb9746b5 SHA256 8eda34b8a2350c6558b6d8143d65c0eb4c4cf32c39920f9ffbffbc7836966380
+EBUILD mariadb-5.3.0_beta.ebuild 6034 RMD160 4b22637603794ecf8d6a7d05cf5a75cc1b40150a SHA1 b985ef1545331a5315db4ee24066ac1fcbcef6fd SHA256 90a23226b687a51a954251d69cb273507494ad14bbc7213a35b4382a745359d8
+EBUILD mariadb-5.3.1_beta.ebuild 6034 RMD160 4b22637603794ecf8d6a7d05cf5a75cc1b40150a SHA1 b985ef1545331a5315db4ee24066ac1fcbcef6fd SHA256 90a23226b687a51a954251d69cb273507494ad14bbc7213a35b4382a745359d8
+EBUILD mariadb-5.3.3_rc.ebuild 6034 RMD160 ec1ba022ca11ef0f338b93a555fba7ca3ab93d13 SHA1 7e191e0dcbb89c684f5fc4b69444d813216f0a5f SHA256 6438e64341a9c1383bf0a295c445568289bf8f83ff49396dff534a5f776c1786
+EBUILD mariadb-5.3.5.ebuild 6071 RMD160 f63d49466377c4751cf27854dc535d3c8b6c8ade SHA1 ef9dec3d60c20a698f1cf131e83fa8d8f038734f SHA256 3951dd789bfd9434ab19e80c8c632e9ddff6addf76252fccfac130ce7f572ff9
+EBUILD mariadb-5.3.6.ebuild 6072 RMD160 c38b9b1e538b68d1e51df194f49c674f021c598f SHA1 087692428be05007f463e7bf1a3de14398a55ce2 SHA256 f10c3de112d2fb09486bea4387b85f54521bd8a97f5ace2eff4d5714a92cf16e
+EBUILD mariadb-5.5.22.ebuild 6030 RMD160 d17cef57303106fc240b1bd3278a02693db4f3da SHA1 3993592f9b0cd1128aabb42597af152d4cd4fa85 SHA256 c2c9aa0f2862b8ec16111cf916ee35b5d1340e956ebe3de4d305ca9d45f91cd2
+EBUILD mariadb-5.5.23.ebuild 6030 RMD160 15022285071a6e69b44da597ab8477ffcb266b23 SHA1 598680b26c52bf4f62f61a7f61d7e625e1dc73a3 SHA256 5f0c6bd23878abcb4a89b249d460b4ceacb1dada169076c5cd01f9e1791cce92
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index 50d7fd1..b9ecd82 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-MY_EXTRAS_VER="20110426-1046Z"
EAPI="4"
+MY_EXTRAS_VER="20110426-1046Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
index b8dc472..5bc66d3 100644
--- a/dev-db/mariadb/mariadb-5.1.62.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.62.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.10.ebuild b/dev-db/mariadb/mariadb-5.2.10.ebuild
index 5fa6b7c..6c8673c 100644
--- a/dev-db/mariadb/mariadb-5.2.10.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.10.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.12.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
index 3780aa5..cbab031 100644
--- a/dev-db/mariadb/mariadb-5.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.12.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index 409a470..d5933d4 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.8.ebuild b/dev-db/mariadb/mariadb-5.2.8.ebuild
index 409a470..d5933d4 100644
--- a/dev-db/mariadb/mariadb-5.2.8.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.8.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
index 409a470..d5933d4 100644
--- a/dev-db/mariadb/mariadb-5.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
index ba0a62f..f256f3f 100644
--- a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
index ba0a62f..f256f3f 100644
--- a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
index a0a4e64..2d42b92 100644
--- a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.5.ebuild
index 0eb25c7..58c1607 100644
--- a/dev-db/mariadb/mariadb-5.3.5.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
index 75bfd00..f54ca59 100644
--- a/dev-db/mariadb/mariadb-5.3.6.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.6.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild
index be2a45a..875f7bc 100644
--- a/dev-db/mariadb/mariadb-5.5.22.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="cmake"
diff --git a/dev-db/mariadb/mariadb-5.5.23.ebuild b/dev-db/mariadb/mariadb-5.5.23.ebuild
index a22b4de..36e417b 100644
--- a/dev-db/mariadb/mariadb-5.5.23.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.23.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-05-22 12:09 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-05-22 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 00f38b9e7e37c31353653a6a8f1cc69b5464ee68
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 11:35:30 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue May 22 11:35:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=00f38b9e
Move EAPI assignment to the top.
Whitespace.
(Portage version: 2.2.0_alpha107/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 9 +++++
dev-db/mariadb/Manifest | 50 +++++++++++++++++++++---------
dev-db/mariadb/mariadb-5.1.55.ebuild | 6 ++--
dev-db/mariadb/mariadb-5.1.62.ebuild | 6 ++--
dev-db/mariadb/mariadb-5.2.10.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.12.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.7.ebuild | 4 +-
dev-db/mariadb/mariadb-5.2.8.ebuild | 4 +-
dev-db/mariadb/mariadb-5.2.9.ebuild | 4 +-
dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 4 +-
dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 4 +-
dev-db/mariadb/mariadb-5.3.3_rc.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.5.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.6.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.22.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.23.ebuild | 2 +-
16 files changed, 67 insertions(+), 38 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 479786c..c02a627 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mariadb-5.1.55.ebuild, mariadb-5.1.62.ebuild, mariadb-5.2.7.ebuild,
+ mariadb-5.2.8.ebuild, mariadb-5.2.9.ebuild, mariadb-5.2.10.ebuild,
+ mariadb-5.2.12.ebuild, mariadb-5.3.0_beta.ebuild, mariadb-5.3.1_beta.ebuild,
+ mariadb-5.3.3_rc.ebuild, mariadb-5.3.5.ebuild, mariadb-5.3.6.ebuild,
+ mariadb-5.5.22.ebuild, mariadb-5.5.23.ebuild:
+ Move EAPI assignment to the top.
+ Whitespace.
+
*mariadb-5.3.3_rc (12 Jan 2012)
12 Jan 2012; <atlantis@gentoo.org> +mariadb-5.3.3_rc.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6f0eb7f..d78ce6a 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
@@ -17,19 +20,36 @@ DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a69945
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
-EBUILD mariadb-5.1.55.ebuild 6142 RMD160 d37d437fb6ca06ed401562d940b2e3fd247bdb58 SHA1 9fd86aef888681f6153b34a9a1726cdab64768d4 SHA256 02ac78bb31848b3d2146c3e34942716ed800d383bcf87698c26af03155868676
-EBUILD mariadb-5.1.62.ebuild 6142 RMD160 74136010c7440e6cbe836dbb92fdc205f3f5df8b SHA1 082ec1bc120988a4c591d67b4443be05dd5b390d SHA256 3f2a5bc08df049564a7139f9d5a6ccf13c7ca721473161773203b83d88d6fd13
-EBUILD mariadb-5.2.10.ebuild 6046 RMD160 0ae9bd1704f0d281c8323b874f252fd620afbe94 SHA1 fa6864cecc7276ff7cdaf81e465cb3e2ba74de0b SHA256 729c091004fad7e6271c422eb5bb5cb6e78d054fbfa065eab7022585b7f0816c
-EBUILD mariadb-5.2.12.ebuild 6046 RMD160 c317f66b2697f6a8ea7deb77d6622a69b0359499 SHA1 bf0e7f28626fad0d1e1cc52d5577e8c8857664b7 SHA256 db2572c5088e5588a3d42dc9b6028e5227be58453f75496d64eda5d32b251a2f
-EBUILD mariadb-5.2.7.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
-EBUILD mariadb-5.2.8.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
-EBUILD mariadb-5.2.9.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
-EBUILD mariadb-5.3.0_beta.ebuild 6034 RMD160 df865c2d66e1ea136fada93afdc08ec8671bee29 SHA1 386821ab30b7023004fd9b0226969abb05d710a5 SHA256 3431e4592ca14db09c749df6c12d9e3f22439f3eb7a4d554a7a94a8f85da4e00
-EBUILD mariadb-5.3.1_beta.ebuild 6034 RMD160 df865c2d66e1ea136fada93afdc08ec8671bee29 SHA1 386821ab30b7023004fd9b0226969abb05d710a5 SHA256 3431e4592ca14db09c749df6c12d9e3f22439f3eb7a4d554a7a94a8f85da4e00
-EBUILD mariadb-5.3.3_rc.ebuild 6034 RMD160 4a0d12cefe58258c6a38b5cb2402700f95812641 SHA1 a5b369e6695db2f0d34eeca6ec377f722a2acfc8 SHA256 9fee967fc4cda386433e63c187111a1b6378ae3eeb4f2ccc23a5df0e7d85f512
-EBUILD mariadb-5.3.5.ebuild 6071 RMD160 3284c0229c1d144a52578b8c9f778c20e5e9b885 SHA1 c174545fd05211492e30f1220411aa9f2a78e479 SHA256 17f095f9acde77f44df7898f0ae7902884b596240a9e460ebaba044ff5c4bec1
-EBUILD mariadb-5.3.6.ebuild 6072 RMD160 5a998436022c66d34609c0cdf5c107078ca23873 SHA1 7fbfa71d03f315920886dda4f638fec54a9c0975 SHA256 33225bdde427062b0562bf4efb6c5030ad69c1393586a6d5ad9e3c79fb52f972
-EBUILD mariadb-5.5.22.ebuild 6030 RMD160 92745efdf2c1a4c84d4f873c1c89d78353dfe1d8 SHA1 286bc3ce915e2a60ce934e127ff17fc95c451d5b SHA256 c102ea45821ea6b51b1392014c35f35b9361bf563814103a6100ce979132a507
-EBUILD mariadb-5.5.23.ebuild 6030 RMD160 5e2d288a0345e13a3ebd8425a6f5f6679d8924ed SHA1 959ac4fdccade464ffc3e50c18ac50080748af88 SHA256 c08e9f6b02e6bac14e5d67821448f9dd6b3de852309b40aec45cdb429841b543
-MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
+EBUILD mariadb-5.1.55.ebuild 6046 RMD160 9ceeb1bf5611ec6ec58dceb159ae135f0c541220 SHA1 8ce2aa6ac5f38384f65a7fe66e452fafe985c365 SHA256 2db4fda8580ca3d40c9d2a3aee078f173cef38d3910e33785dc42ec166c803cf
+EBUILD mariadb-5.1.62.ebuild 6046 RMD160 474a23da89d8530a8f368c0a2a691646cfaf36e4 SHA1 03453ad8a87d063cd8622760fcb6e7715df17bab SHA256 61742537e36f197bc00b5aa448201d96e58033bea08d8776f85d85600f6da6ec
+EBUILD mariadb-5.2.10.ebuild 6046 RMD160 abb863607b499f2dc32b0cc63bab41528e312ac4 SHA1 6798c55599a0620d3eee9d8b2ea651d12d5951c8 SHA256 3c1e9b7b1e55ef26b18838ff1a472c891e7c1e2ded6129c3a7d386ca9bec0fb8
+EBUILD mariadb-5.2.12.ebuild 6046 RMD160 474a23da89d8530a8f368c0a2a691646cfaf36e4 SHA1 03453ad8a87d063cd8622760fcb6e7715df17bab SHA256 61742537e36f197bc00b5aa448201d96e58033bea08d8776f85d85600f6da6ec
+EBUILD mariadb-5.2.7.ebuild 6046 RMD160 abb863607b499f2dc32b0cc63bab41528e312ac4 SHA1 6798c55599a0620d3eee9d8b2ea651d12d5951c8 SHA256 3c1e9b7b1e55ef26b18838ff1a472c891e7c1e2ded6129c3a7d386ca9bec0fb8
+EBUILD mariadb-5.2.8.ebuild 6046 RMD160 abb863607b499f2dc32b0cc63bab41528e312ac4 SHA1 6798c55599a0620d3eee9d8b2ea651d12d5951c8 SHA256 3c1e9b7b1e55ef26b18838ff1a472c891e7c1e2ded6129c3a7d386ca9bec0fb8
+EBUILD mariadb-5.2.9.ebuild 6046 RMD160 abb863607b499f2dc32b0cc63bab41528e312ac4 SHA1 6798c55599a0620d3eee9d8b2ea651d12d5951c8 SHA256 3c1e9b7b1e55ef26b18838ff1a472c891e7c1e2ded6129c3a7d386ca9bec0fb8
+EBUILD mariadb-5.3.0_beta.ebuild 6034 RMD160 ec1ba022ca11ef0f338b93a555fba7ca3ab93d13 SHA1 7e191e0dcbb89c684f5fc4b69444d813216f0a5f SHA256 6438e64341a9c1383bf0a295c445568289bf8f83ff49396dff534a5f776c1786
+EBUILD mariadb-5.3.1_beta.ebuild 6034 RMD160 ec1ba022ca11ef0f338b93a555fba7ca3ab93d13 SHA1 7e191e0dcbb89c684f5fc4b69444d813216f0a5f SHA256 6438e64341a9c1383bf0a295c445568289bf8f83ff49396dff534a5f776c1786
+EBUILD mariadb-5.3.3_rc.ebuild 6034 RMD160 ec1ba022ca11ef0f338b93a555fba7ca3ab93d13 SHA1 7e191e0dcbb89c684f5fc4b69444d813216f0a5f SHA256 6438e64341a9c1383bf0a295c445568289bf8f83ff49396dff534a5f776c1786
+EBUILD mariadb-5.3.5.ebuild 6071 RMD160 f63d49466377c4751cf27854dc535d3c8b6c8ade SHA1 ef9dec3d60c20a698f1cf131e83fa8d8f038734f SHA256 3951dd789bfd9434ab19e80c8c632e9ddff6addf76252fccfac130ce7f572ff9
+EBUILD mariadb-5.3.6.ebuild 6072 RMD160 c38b9b1e538b68d1e51df194f49c674f021c598f SHA1 087692428be05007f463e7bf1a3de14398a55ce2 SHA256 f10c3de112d2fb09486bea4387b85f54521bd8a97f5ace2eff4d5714a92cf16e
+EBUILD mariadb-5.5.22.ebuild 6030 RMD160 d17cef57303106fc240b1bd3278a02693db4f3da SHA1 3993592f9b0cd1128aabb42597af152d4cd4fa85 SHA256 c2c9aa0f2862b8ec16111cf916ee35b5d1340e956ebe3de4d305ca9d45f91cd2
+EBUILD mariadb-5.5.23.ebuild 6030 RMD160 15022285071a6e69b44da597ab8477ffcb266b23 SHA1 598680b26c52bf4f62f61a7f61d7e625e1dc73a3 SHA256 5f0c6bd23878abcb4a89b249d460b4ceacb1dada169076c5cd01f9e1791cce92
+MISC ChangeLog 5202 RMD160 b1347ba86cc4baee8678289b8d8dd7363b3cc7cd SHA1 42300e5bfa29446eb01daaf0771fe6e2050341d5 SHA256 7446f05fafadc91d5d386f5c24ffbcaaf12820e9fef8c12ab003f6dc3802b042
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPu3oCAAoJEC8ZTXQF1qEPmMMQAIlRBaLM4gANDk0eNYe2Wsdh
+I4I+lx3S2XYIcfi4x21Gv1VQf24TcmTjuIlGZtYt2dNdyqzancGjzkHQ7j9/+aZ8
+sw2Je7cqMsmVt9OEaFUOooKygJxHC3mssvhWPHithuNmFKnzaLvFueoivhQKDdN/
+i7sJeBSjnjdE1Q4IdW7de9Uju3kI1MJyflcJ6ReKju5ZPMx3kcrBlhqeiieU9oFF
+c61cg5zHkejsKhimmxAGnpr2iYTrNd7t7zMjmpUYXhOw8Dmog0KFI85z3j1T0Ap+
+ORq5gULApTPviYlrlktGH9kDbm1a+WW5Q7mMZx8b6UJ/TDvR85nA3rJBgTCRJbvE
+vHb6vsc1eVsNIPQUFJAUhDnZyL47fgOryGnH8fhqIGmSYplI0DT4wv1tsW/2JmgN
+DUXVF4b0bAW+d664jkQs8Bz/xfwzZSBTeOQat4SLkKxNfoEZpDzSmhLoQUuHpIcq
+oWPzpMAQeW5bLFhD5ON1eMPwlgiewxbWU42lMEyzfkiyifB/OxaZ/oFB5zlI2erk
+aEOodXvusZYjJzN8fn0vEGQYSLVZLtWXom6++3x7At8LDBzZcm83l1xqmVzrBvyT
+e+TeXU0T/pXDZqgpK91mTlv/FnHmet1fZ5CBviUXbe6U3hSLs6X/IAIPn3H0iqtZ
+XRHe/foh1Ol6cNKRMgr2
+=7SSm
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index 50d7fd1..128239b 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
+# $Header: $
-MY_EXTRAS_VER="20110426-1046Z"
EAPI="4"
+MY_EXTRAS_VER="20110426-1046Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
index b8dc472..cbab031 100644
--- a/dev-db/mariadb/mariadb-5.1.62.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.62.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
+# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.10.ebuild b/dev-db/mariadb/mariadb-5.2.10.ebuild
index 5fa6b7c..6c8673c 100644
--- a/dev-db/mariadb/mariadb-5.2.10.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.10.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.12.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
index 3780aa5..cbab031 100644
--- a/dev-db/mariadb/mariadb-5.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.12.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index 409a470..6c8673c 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.8.ebuild b/dev-db/mariadb/mariadb-5.2.8.ebuild
index 409a470..6c8673c 100644
--- a/dev-db/mariadb/mariadb-5.2.8.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
index 409a470..6c8673c 100644
--- a/dev-db/mariadb/mariadb-5.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
index ba0a62f..2d42b92 100644
--- a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
index ba0a62f..2d42b92 100644
--- a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
index a0a4e64..2d42b92 100644
--- a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.5.ebuild
index 0eb25c7..58c1607 100644
--- a/dev-db/mariadb/mariadb-5.3.5.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
index 75bfd00..f54ca59 100644
--- a/dev-db/mariadb/mariadb-5.3.6.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.6.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild
index be2a45a..875f7bc 100644
--- a/dev-db/mariadb/mariadb-5.5.22.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110819-0415Z"
EAPI="4"
+MY_EXTRAS_VER="20110819-0415Z"
# Build system
BUILD="cmake"
diff --git a/dev-db/mariadb/mariadb-5.5.23.ebuild b/dev-db/mariadb/mariadb-5.5.23.ebuild
index a22b4de..36e417b 100644
--- a/dev-db/mariadb/mariadb-5.5.23.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.23.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
+MY_EXTRAS_VER="20120416-2021Z"
# Build system
BUILD="cmake"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-04-18 7:21 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-04-18 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 5eb67228552ae17231a813121f4ff0f3c533bdff
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Wed Apr 18 07:18:22 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 07:18:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5eb67228
These need all of the keywords from mysql, same eclass. Pending bug #412475 for the RDEPEND.bad to go away.
(Portage version: 2.2.0_alpha100/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 28 ++++++++++++++--------------
dev-db/mariadb/mariadb-5.1.55.ebuild | 2 +-
dev-db/mariadb/mariadb-5.1.62.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.10.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.12.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.7.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.8.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.9.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.3_rc.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.5.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.6.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.22.ebuild | 2 +-
dev-db/mariadb/mariadb-5.5.23.ebuild | 2 +-
15 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b349ba4..6f0eb7f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -17,19 +17,19 @@ DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a69945
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
-EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
-EBUILD mariadb-5.1.62.ebuild 6034 RMD160 2bd2bc8af72e6eb305a50de989a6d50ed2b9b80e SHA1 7ce54b7dadad540b0275d63f8b12463856270222 SHA256 eae54663a8e11fc4c5fd7547a1a5d62de2714c8bbc8790746dfffa9799b102c5
-EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
-EBUILD mariadb-5.2.12.ebuild 5901 RMD160 e30f08e62165336b5e47f5d8d7a1d20dd9d55a69 SHA1 8b58fcbde8d0d039f3b8ecfef47e5c8767cde0ae SHA256 00f2ea6ddacd7253ed2a0ec903f5923aec274e8eb86dd5847e762968427176cf
-EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
-EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
-EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
-EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
-EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df6883345836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382
-EBUILD mariadb-5.3.6.ebuild 5927 RMD160 b52017f170b8d75e08e2a6614212896aa0aff9d4 SHA1 f5d7cae16f97d156d7f6619505e433443958bdd4 SHA256 3bdf1268019b423463d617bf528190ce8b5a5066ecf026e4f95a627297330f62
-EBUILD mariadb-5.5.22.ebuild 5885 RMD160 bd589ea7d8f9f9f51284b259c24e461a2f0ea41b SHA1 f353cae595b5184dbb5514c8238acb4b1da22eca SHA256 a9cef0c80dc97ec6085c8c729b22078d3f51d51ef852218a7e51fef4be0c91e1
-EBUILD mariadb-5.5.23.ebuild 5885 RMD160 0a4d75b945f9a853709366d7ca08c7419d829899 SHA1 302ffcffd1e0d713d7a8923b9c35b3c1650fcd40 SHA256 d91ef8cc06e3892fd1c0708410ef8c81be36270d641632ba2157b402a927139d
+EBUILD mariadb-5.1.55.ebuild 6142 RMD160 d37d437fb6ca06ed401562d940b2e3fd247bdb58 SHA1 9fd86aef888681f6153b34a9a1726cdab64768d4 SHA256 02ac78bb31848b3d2146c3e34942716ed800d383bcf87698c26af03155868676
+EBUILD mariadb-5.1.62.ebuild 6142 RMD160 74136010c7440e6cbe836dbb92fdc205f3f5df8b SHA1 082ec1bc120988a4c591d67b4443be05dd5b390d SHA256 3f2a5bc08df049564a7139f9d5a6ccf13c7ca721473161773203b83d88d6fd13
+EBUILD mariadb-5.2.10.ebuild 6046 RMD160 0ae9bd1704f0d281c8323b874f252fd620afbe94 SHA1 fa6864cecc7276ff7cdaf81e465cb3e2ba74de0b SHA256 729c091004fad7e6271c422eb5bb5cb6e78d054fbfa065eab7022585b7f0816c
+EBUILD mariadb-5.2.12.ebuild 6046 RMD160 c317f66b2697f6a8ea7deb77d6622a69b0359499 SHA1 bf0e7f28626fad0d1e1cc52d5577e8c8857664b7 SHA256 db2572c5088e5588a3d42dc9b6028e5227be58453f75496d64eda5d32b251a2f
+EBUILD mariadb-5.2.7.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
+EBUILD mariadb-5.2.8.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
+EBUILD mariadb-5.2.9.ebuild 6046 RMD160 1577fc8b7a76c59ebd9475d63f0c30055681e7f1 SHA1 c7088934b798da39520c44974d27b0d4094fa550 SHA256 61d240a64eabb874d7533f5582f00aeb6e9ee6d4015edc52cf0185aa6b02dca6
+EBUILD mariadb-5.3.0_beta.ebuild 6034 RMD160 df865c2d66e1ea136fada93afdc08ec8671bee29 SHA1 386821ab30b7023004fd9b0226969abb05d710a5 SHA256 3431e4592ca14db09c749df6c12d9e3f22439f3eb7a4d554a7a94a8f85da4e00
+EBUILD mariadb-5.3.1_beta.ebuild 6034 RMD160 df865c2d66e1ea136fada93afdc08ec8671bee29 SHA1 386821ab30b7023004fd9b0226969abb05d710a5 SHA256 3431e4592ca14db09c749df6c12d9e3f22439f3eb7a4d554a7a94a8f85da4e00
+EBUILD mariadb-5.3.3_rc.ebuild 6034 RMD160 4a0d12cefe58258c6a38b5cb2402700f95812641 SHA1 a5b369e6695db2f0d34eeca6ec377f722a2acfc8 SHA256 9fee967fc4cda386433e63c187111a1b6378ae3eeb4f2ccc23a5df0e7d85f512
+EBUILD mariadb-5.3.5.ebuild 6071 RMD160 3284c0229c1d144a52578b8c9f778c20e5e9b885 SHA1 c174545fd05211492e30f1220411aa9f2a78e479 SHA256 17f095f9acde77f44df7898f0ae7902884b596240a9e460ebaba044ff5c4bec1
+EBUILD mariadb-5.3.6.ebuild 6072 RMD160 5a998436022c66d34609c0cdf5c107078ca23873 SHA1 7fbfa71d03f315920886dda4f638fec54a9c0975 SHA256 33225bdde427062b0562bf4efb6c5030ad69c1393586a6d5ad9e3c79fb52f972
+EBUILD mariadb-5.5.22.ebuild 6030 RMD160 92745efdf2c1a4c84d4f873c1c89d78353dfe1d8 SHA1 286bc3ce915e2a60ce934e127ff17fc95c451d5b SHA256 c102ea45821ea6b51b1392014c35f35b9361bf563814103a6100ce979132a507
+EBUILD mariadb-5.5.23.ebuild 6030 RMD160 5e2d288a0345e13a3ebd8425a6f5f6679d8924ed SHA1 959ac4fdccade464ffc3e50c18ac50080748af88 SHA256 c08e9f6b02e6bac14e5d67821448f9dd6b3de852309b40aec45cdb429841b543
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index 0da41c8..50d7fd1 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
index bc143ea..b8dc472 100644
--- a/dev-db/mariadb/mariadb-5.1.62.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.62.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.2.10.ebuild b/dev-db/mariadb/mariadb-5.2.10.ebuild
index 14a62d3..5fa6b7c 100644
--- a/dev-db/mariadb/mariadb-5.2.10.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.10.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.2.12.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
index 3b85819..3780aa5 100644
--- a/dev-db/mariadb/mariadb-5.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.12.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index efb1ba4..409a470 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.2.8.ebuild b/dev-db/mariadb/mariadb-5.2.8.ebuild
index efb1ba4..409a470 100644
--- a/dev-db/mariadb/mariadb-5.2.8.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.8.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
index efb1ba4..409a470 100644
--- a/dev-db/mariadb/mariadb-5.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
index 75579d1..ba0a62f 100644
--- a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
index 75579d1..ba0a62f 100644
--- a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
index a461c4f..a0a4e64 100644
--- a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.5.ebuild
index 573efa2..0eb25c7 100644
--- a/dev-db/mariadb/mariadb-5.3.5.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
index dd27b39..75bfd00 100644
--- a/dev-db/mariadb/mariadb-5.3.6.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.6.ebuild
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild
index 411f56a..be2a45a 100644
--- a/dev-db/mariadb/mariadb-5.5.22.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
diff --git a/dev-db/mariadb/mariadb-5.5.23.ebuild b/dev-db/mariadb/mariadb-5.5.23.ebuild
index b415b16..a22b4de 100644
--- a/dev-db/mariadb/mariadb-5.5.23.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.23.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+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=''
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-04-16 20:39 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-04-16 20:39 UTC (permalink / raw
To: gentoo-commits
commit: a14860746989abc41a899e99a4dde4754419ef75
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 20:25:59 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 20:25:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a1486074
Bump for security vuln per http://monty-says.blogspot.ca/2012/04/lots-of-mariadb-releases.html.
(Portage version: 2.2.0_alpha99/git/Linux x86_64, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 9 ++
dev-db/mariadb/mariadb-5.1.62.ebuild | 171 +++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.2.12.ebuild | 171 +++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.3.6.ebuild | 174 ++++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.5.23.ebuild | 171 +++++++++++++++++++++++++++++++++
5 files changed, 696 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7545171..b349ba4 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,9 @@
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
+DIST mariadb-5.1.62.tar.gz 24931609 RMD160 873961f72de719fed085085c8cb8560c7cef5e06 SHA1 b08c7d5b229eee5f646f839d924223dac9b82a38 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da
DIST mariadb-5.2.10.tar.gz 25242675 RMD160 f5b5a7776e41e29449f60dc0528ccefba0d73d36 SHA1 053326aed589b4cdb23560269890ed12ae6885a2 SHA256 dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
+DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
@@ -9,11 +11,16 @@ DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3
+DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016
+DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
+DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
+EBUILD mariadb-5.1.62.ebuild 6034 RMD160 2bd2bc8af72e6eb305a50de989a6d50ed2b9b80e SHA1 7ce54b7dadad540b0275d63f8b12463856270222 SHA256 eae54663a8e11fc4c5fd7547a1a5d62de2714c8bbc8790746dfffa9799b102c5
EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
+EBUILD mariadb-5.2.12.ebuild 5901 RMD160 e30f08e62165336b5e47f5d8d7a1d20dd9d55a69 SHA1 8b58fcbde8d0d039f3b8ecfef47e5c8767cde0ae SHA256 00f2ea6ddacd7253ed2a0ec903f5923aec274e8eb86dd5847e762968427176cf
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
@@ -21,6 +28,8 @@ EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c070795
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df6883345836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382
+EBUILD mariadb-5.3.6.ebuild 5927 RMD160 b52017f170b8d75e08e2a6614212896aa0aff9d4 SHA1 f5d7cae16f97d156d7f6619505e433443958bdd4 SHA256 3bdf1268019b423463d617bf528190ce8b5a5066ecf026e4f95a627297330f62
EBUILD mariadb-5.5.22.ebuild 5885 RMD160 bd589ea7d8f9f9f51284b259c24e461a2f0ea41b SHA1 f353cae595b5184dbb5514c8238acb4b1da22eca SHA256 a9cef0c80dc97ec6085c8c729b22078d3f51d51ef852218a7e51fef4be0c91e1
+EBUILD mariadb-5.5.23.ebuild 5885 RMD160 0a4d75b945f9a853709366d7ca08c7419d829899 SHA1 302ffcffd1e0d713d7a8923b9c35b3c1650fcd40 SHA256 d91ef8cc06e3892fd1c0708410ef8c81be36270d641632ba2157b402a927139d
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.1.62.ebuild b/dev-db/mariadb/mariadb-5.1.62.ebuild
new file mode 100644
index 0000000..bc143ea
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.1.62.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
+
+MY_EXTRAS_VER="20120416-2021Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.2.12.ebuild b/dev-db/mariadb/mariadb-5.2.12.ebuild
new file mode 100644
index 0000000..3b85819
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.12.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20120416-2021Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.3.6.ebuild b/dev-db/mariadb/mariadb-5.3.6.ebuild
new file mode 100644
index 0000000..dd27b39
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20120416-2021Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+# Suffix on files...
+#MY_PV="$PV-ga"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.23.ebuild b/dev-db/mariadb/mariadb-5.5.23.ebuild
new file mode 100644
index 0000000..b415b16
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.23.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20120416-2021Z"
+EAPI="4"
+
+# 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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-04-05 20:41 Robin H. Johnson
0 siblings, 0 replies; 141+ messages in thread
From: Robin H. Johnson @ 2012-04-05 20:41 UTC (permalink / raw
To: gentoo-commits
commit: bd4e937a49bde6db34a6c7aea8a7d74c579f471b
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 09:05:17 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 09:05:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bd4e937a
Bump.
(Portage version: 2.2.0_alpha93/git/Linux x86_64, unsigned Manifest commit)
---
dev-db/mariadb/Manifest | 4 +
dev-db/mariadb/mariadb-5.3.5.ebuild | 174 ++++++++++++++++++++++++++++++++++
dev-db/mariadb/mariadb-5.5.22.ebuild | 171 +++++++++++++++++++++++++++++++++
3 files changed, 349 insertions(+), 0 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6559d5b..7545171 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,6 +8,8 @@ DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a44
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
+DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3
+DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
@@ -18,5 +20,7 @@ EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
+EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df6883345836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382
+EBUILD mariadb-5.5.22.ebuild 5885 RMD160 bd589ea7d8f9f9f51284b259c24e461a2f0ea41b SHA1 f353cae595b5184dbb5514c8238acb4b1da22eca SHA256 a9cef0c80dc97ec6085c8c729b22078d3f51d51ef852218a7e51fef4be0c91e1
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.5.ebuild
new file mode 100644
index 0000000..573efa2
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+# Suffix on files...
+MY_PV="$PV-ga"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild
new file mode 100644
index 0000000..411f56a
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="4"
+
+# 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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-01-12 19:17 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-01-12 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 64538ef5f5a4737463f14d20a3bcfd50a1d709d7
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 19:17:35 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 19:17:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=64538ef5
[dev-db/mariadb] 5.3.3_rc version bump.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
---
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 24 +----
dev-db/mariadb/mariadb-5.3.3_rc.ebuild | 171 ++++++++++++++++++++++++++++++++
3 files changed, 179 insertions(+), 21 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 3760a24..479786c 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.3.3_rc (12 Jan 2012)
+
+ 12 Jan 2012; <atlantis@gentoo.org> +mariadb-5.3.3_rc.ebuild:
+ [dev-db/mariadb] 5.3.3_rc version bump.
+
*mariadb-5.2.10 (12 Jan 2012)
12 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4524fb6..6559d5b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
@@ -10,6 +7,7 @@ DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754
DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
+DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
@@ -19,22 +17,6 @@ EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0
EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-MISC ChangeLog 4609 RMD160 908d75d3133038de72935ca12b3296b507f645ec SHA1 d49c7c2d31b9af509cef08e6ed5f3d2aa33c8ec0 SHA256 c829dc72f0b945e339cbce7dee93bbe4299b5a3d2f9ca80b19a72dc0adc5bec8
+EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
+MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPDyUgAAoJEC8ZTXQF1qEP5BEP/jUSoJK92Yke/0coHNMxSZ9d
-H9+m+To5+1URyRmmCPqFL0q5RJJAX4MFcbB5QRRS5NCOt/SEnCxKMScOHJUCmCry
-ShBnhjbK9yJ5m84wHDGM7xPFz/SSN1/kKZifim2u5aeU497APEZnMKE311gf53vu
-CsoD3FEYXquNKSb88bNNN9e72cQN4YVDfYwWGsqE+h8+/cFny1U3UwrJg9SFMEmA
-VbNXHTbpxZrYxY9k2BvpseLCEH1JpRNjUFDfaTLoSxjKzIxh99+bcAIekXaTERPh
-S0L8ti+3jblL+zVItNsIuVnMFuo1v63RsuQrvwQ3CAkKZiKo44mMgpQj1eyfLNzO
-qB8jUuwYpVAAzvF8ko+3ayJwE7J0S8WPGvIdn2rzbIEvc6yYonAKt5Hswe4y17Gn
-r4Gg0aoEl/vpxGdT+eKM+kYY+dkhiVih5ddDA7zN3aFwUMQcn8sB9ybnzF2GKYXa
-+BpBC49bRC01CP3gpWG5N8Att2u5ahHlJaFqWq349dsC43/aHsgEc+rI1ZVO9Dyz
-fKc5iuBkNaZ4VOTCwoCS+2KrvwBvhOVc8HtD8tLirR6MPs/NTeV+QnYOd+LK2SCG
-ye4HKZGWTovkTrcAedNgU1UB/Wd874N4h3Je4GkA9+KisUqHBbPIxEO4ADeRSDPw
-CKD7SlbwvLtx6BqxJ7J6
-=41Lf
------END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.3.3_rc.ebuild b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
new file mode 100644
index 0000000..a461c4f
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.3_rc.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2012-01-12 18:26 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-01-12 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 46a7cca87bee7d5dda99e43af31984470a318991
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 18:23:28 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 18:23:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=46a7cca8
[dev-db/mariadb] Bump to 5.2.10 revision.
(Portage version: 2.2.0_alpha83/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 8 ++-
dev-db/mariadb/Manifest | 24 +++++-
dev-db/mariadb/mariadb-5.2.10.ebuild | 171 ++++++++++++++++++++++++++++++++++
3 files changed, 201 insertions(+), 2 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index e513b66..3760a24 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.2.10 (12 Jan 2012)
+
+ 12 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +mariadb-5.2.10.ebuild:
+ [dev-db/mariadb] Bump to 5.2.10 revision.
+
20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mariadb-5.2.7.ebuild, mariadb-5.2.8.ebuild, mariadb-5.3.0_beta.ebuild:
[dev-db/mariadb] Bump EAPI to 4 on old mariadb versions.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 41b28fd..4524fb6 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
+DIST mariadb-5.2.10.tar.gz 25242675 RMD160 f5b5a7776e41e29449f60dc0528ccefba0d73d36 SHA1 053326aed589b4cdb23560269890ed12ae6885a2 SHA256 dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
@@ -9,10 +13,28 @@ DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5d
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
+EBUILD mariadb-5.2.10.ebuild 5901 RMD160 663af5bdb45490943c7b281445216c21ab713e37 SHA1 dede7518a3580d2864f7d5936acf1fd212a3b013 SHA256 c1dcb9256730b56fd12a9bd660ca7fd5d17c67967978e21bd2b8c62449b58d8e
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-MISC ChangeLog 4440 RMD160 1071dcf3e8cf66865acb6843d9053b268302f285 SHA1 d11503484dd489f698ea850a1374165134b1e884 SHA256 93545c9f4bef597ecc445feb7662aca2695a20f00b43b74b158064b5a677d1ab
+MISC ChangeLog 4609 RMD160 908d75d3133038de72935ca12b3296b507f645ec SHA1 d49c7c2d31b9af509cef08e6ed5f3d2aa33c8ec0 SHA256 c829dc72f0b945e339cbce7dee93bbe4299b5a3d2f9ca80b19a72dc0adc5bec8
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPDyUgAAoJEC8ZTXQF1qEP5BEP/jUSoJK92Yke/0coHNMxSZ9d
+H9+m+To5+1URyRmmCPqFL0q5RJJAX4MFcbB5QRRS5NCOt/SEnCxKMScOHJUCmCry
+ShBnhjbK9yJ5m84wHDGM7xPFz/SSN1/kKZifim2u5aeU497APEZnMKE311gf53vu
+CsoD3FEYXquNKSb88bNNN9e72cQN4YVDfYwWGsqE+h8+/cFny1U3UwrJg9SFMEmA
+VbNXHTbpxZrYxY9k2BvpseLCEH1JpRNjUFDfaTLoSxjKzIxh99+bcAIekXaTERPh
+S0L8ti+3jblL+zVItNsIuVnMFuo1v63RsuQrvwQ3CAkKZiKo44mMgpQj1eyfLNzO
+qB8jUuwYpVAAzvF8ko+3ayJwE7J0S8WPGvIdn2rzbIEvc6yYonAKt5Hswe4y17Gn
+r4Gg0aoEl/vpxGdT+eKM+kYY+dkhiVih5ddDA7zN3aFwUMQcn8sB9ybnzF2GKYXa
++BpBC49bRC01CP3gpWG5N8Att2u5ahHlJaFqWq349dsC43/aHsgEc+rI1ZVO9Dyz
+fKc5iuBkNaZ4VOTCwoCS+2KrvwBvhOVc8HtD8tLirR6MPs/NTeV+QnYOd+LK2SCG
+ye4HKZGWTovkTrcAedNgU1UB/Wd874N4h3Je4GkA9+KisUqHBbPIxEO4ADeRSDPw
+CKD7SlbwvLtx6BqxJ7J6
+=41Lf
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.10.ebuild b/dev-db/mariadb/mariadb-5.2.10.ebuild
new file mode 100644
index 0000000..14a62d3
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.10.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="4"
+
+# Build system
+BUILD="autotools"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-10-26 19:45 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-10-26 19:45 UTC (permalink / raw
To: gentoo-commits
commit: d7d67ec1c3d92824871a85e8fabdbfdd4f273774
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 02:26:46 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 02:26:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d7d67ec1
[dev-db/mariadb] Use EAPI-4 to support the new Prefix support of the eclasses.
(Portage version: 2.2.0_alpha69/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 5 +++++
dev-db/mariadb/Manifest | 28 ++++++++++++++++++++++++----
dev-db/mariadb/mariadb-5.1.55.ebuild | 2 +-
dev-db/mariadb/mariadb-5.2.9.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 2 +-
5 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index ba33f24..9a56469 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mariadb-5.1.55.ebuild, mariadb-5.2.9.ebuild, mariadb-5.3.1_beta.ebuild:
+ [dev-db/mariadb] Use EAPI-4 to support the new Prefix support of the
+ eclasses.
+
*mariadb-5.2.9 (27 Sep 2011)
27 Sep 2011; <atlantis@gentoo.org> +mariadb-5.2.9.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index a7361da..470b2eb 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
@@ -8,11 +11,28 @@ DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
-EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
+EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
-EBUILD mariadb-5.2.9.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
+EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 SHA1 b5615f03d2341fa7f6745042645175f901e28e43 SHA256 458a3cfc7d275050c234fa45e14a7e91923ea44f937c6a6ee77d67d40c1f98e0
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
-EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
-MISC ChangeLog 4015 RMD160 2e32e9a249b9e42e5cda380ec15e3d7013f18b07 SHA1 50378f4458d4b20bc816fa96595e935428198c7d SHA256 eb6f48c2d477ef016c9f3422cb495856a8707b1c9e404097eabbab55513b0c09
+EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
+MISC ChangeLog 4240 RMD160 8119ceb0d669af9d10cd7a70d7e8c161cd77609b SHA1 d584cd7371a2c03ffe53768e5b5c6fb3dd1d7184 SHA256 da54d85f9d504c5b124f85acaa4e51753593d0b7a47cfd8f147041b605603034
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOph5mAAoJEC8ZTXQF1qEPVXcP/jJBK/pA3hGCNN7nVG+oGeZb
+hpYZemBPyWUsvadGRmr/RdcXB6WZ9QZB/7E3SpnqwfMZdu2alsNh2je01z3dju1R
+0pZcjCPKGUkxbpbPENkSFHgG6MahAaq41WnJo9c3x/gyiz1LaUr/Lg51mmG0QcR2
+bxJAyqPoPtTERIWQLX0ZQHFiV2SI21IKoC9whI4yEUXrnf3zR85VzHWZMq41Az/e
+setqazSiNKfYTVcG8J79jfd4CucUrQFCYmL/3+Kclijan8PrxeGknd7wnUuVLGO3
+nZ3DJ9LmoYGFJjN+WKrE5k/ZRTNJHRkVwo+SKc+ebUz/UFOu0rK49EVMNIEbd1oo
+dBu62VjVLHE+YZkO1jgT31+EUUkJpLXLrB062uJxI0sKf3ujNALJYhhr0hfpEUBw
+nPi1dGCb3vpvVdql58IqPq2RMa4Oj+Nt1mvjf+IByzANnXb4PPE+Kzli0zPyKlzj
+682smT5Hda//5ckEidwdm5x2/pmKVZYJ20kLHlj4XSZ9To+FcbFfPm8y0KjCAsXm
+c1Hylls1xF0UkGy4VFAPvW+aaKsSDYy+s8clN8aOXiBew4EE89NkKZke1r5AHsvR
+C64FxdAfrMaU3C8alM0MIgdxpN8tFPUjjVgMKix3jjPHb69VRRPk0LV2MhVp9bhf
+I3LcJ84roaBNN6/73BMm
+=G/eC
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index cc30840..0da41c8 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
MY_EXTRAS_VER="20110426-1046Z"
-EAPI="2"
+EAPI="4"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
index 76cd16e..efb1ba4 100644
--- a/dev-db/mariadb/mariadb-5.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -3,7 +3,7 @@
# $Header: $
MY_EXTRAS_VER="20110819-0415Z"
-EAPI="2"
+EAPI="4"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
index d535519..75579d1 100644
--- a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
@@ -3,7 +3,7 @@
# $Header: $
MY_EXTRAS_VER="20110819-0415Z"
-EAPI="2"
+EAPI="4"
# Build system
BUILD="autotools"
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-09-27 2:26 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-09-27 2:26 UTC (permalink / raw
To: gentoo-commits
commit: b4137d4999e54013061fc32818077f9d10df9f43
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 02:25:59 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 02:25:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4137d49
Bumped mariadb to 5.2.9 release.
(Portage version: 2.2.0_alpha59/git/Linux x86_64, unsigned Manifest commit)
---
dev-db/mariadb/ChangeLog | 5 +
dev-db/mariadb/Manifest | 24 +-----
dev-db/mariadb/mariadb-5.2.9.ebuild | 171 +++++++++++++++++++++++++++++++++++
3 files changed, 179 insertions(+), 21 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 7dbdc8f..ba33f24 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.2.9 (27 Sep 2011)
+
+ 27 Sep 2011; <atlantis@gentoo.org> +mariadb-5.2.9.ebuild:
+ Bumped mariadb to 5.2.9 release.
+
*mariadb-5.3.1_beta (22 Sep 2011)
22 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ee83813..a7361da 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
+DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
@@ -13,24 +11,8 @@ DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
+EBUILD mariadb-5.2.9.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
-MISC ChangeLog 3889 RMD160 59d6018e24ca8de383013b6cda5850831c8f5dad SHA1 27dde9e14984470ec8baab15061e0962022949d7 SHA256 79b916284091304769df376e04fd013a031d9aa7cab908969d54c5d36dd3bab3
+MISC ChangeLog 4015 RMD160 2e32e9a249b9e42e5cda380ec15e3d7013f18b07 SHA1 50378f4458d4b20bc816fa96595e935428198c7d SHA256 eb6f48c2d477ef016c9f3422cb495856a8707b1c9e404097eabbab55513b0c09
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOeqV7AAoJEC8ZTXQF1qEP8WQP/3+DzXmD87f+yWv0Vn4KgSVh
-25/RRYwhxb7YyMsfZoD0afDzVdc1e+zR8HJ/QJ7ZkODxjviS0unHg7B335swc1hj
-xXPUnIa8eg8KLgSOu2c/DXuWp8m7bQNnOOJVaysPx99ewrqyvGlJB2o9js2f5utC
-nv6k6UAu+7qjQVNvHv/t3YBFVZMiRXBmwMpaQit5Sg5lB3I7Td83TCC7J5+v2MYo
-DTQJpeVkCSZI2XDemMq54ZN0rjd/hOJJr6UZOKZhI1ChfkH7Bw/3NVgcCv9JOcVA
-91DCHZ0LX3n2FujvHGCrvZ/14SvZ623nvLor+7l3fPuYfwuTqTyjUvTVfNg2Cfg9
-jKlWFB4hijZN8aCVLN+iI3q2v8JbftO6KcLL/iDa159rHpqRdAgiTgAim9hg9ClL
-rlkym78vbQQAIgehYHT6FeRYUQpPkIsn/DguWSDD7Q7Df9C9O/TPV89HLlnLhrq8
-ZUY7pS+Ho8o+TjA0luaOGR+d0O+hlkTgxNImwkSw1BM2aBOLY34ctO1URUPBsqag
-xYiyxMt2Zx3ij2LZ5P5abt+Ij1WFztvYRLraA/nDF7s3Rm57uzodfX583P2TlH4X
-s+lA74zOzXCBnZva9FfpJU/b/j6XrCFDv3MgD87YfLeUOrjB9rnzbz3WAaT+L7ZA
-MGxLhNQnHZ5cbTQ0UP8Z
-=thUg
------END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
new file mode 100644
index 0000000..76cd16e
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="2"
+
+# Build system
+BUILD="autotools"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-09-22 3:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-09-22 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 51dd8ead51bb52a706bd886043d12d0fa5abc9eb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 03:03:23 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 03:03:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=51dd8ead
Bumped mariadb to the 5.3.1_beta release. This needs more work as even unit tests are failing.
(Portage version: 2.2.0_alpha58/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 7 ++
dev-db/mariadb/Manifest | 30 +++---
dev-db/mariadb/mariadb-5.3.1_beta.ebuild | 171 ++++++++++++++++++++++++++++++
3 files changed, 194 insertions(+), 14 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index ffd423d..7dbdc8f 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.3.1_beta (22 Sep 2011)
+
+ 22 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +mariadb-5.3.1_beta.ebuild:
+ Bumped mariadb to the 5.3.1_beta release. This needs more work as even unit
+ tests are failing.
+
*mariadb-5.2.8 (19 Aug 2011)
19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 64658f9..ee83813 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,28 +7,30 @@ DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
+DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
-MISC ChangeLog 3657 RMD160 93916481f5026ceb42ecf83744cf37d43b22f8f6 SHA1 cb08374b233431de689f1be8863a62bc281e46f9 SHA256 8f5887826d4e5db6c96b8c5fcd6ad567753f24ccd59ad9f9b2f384e79948d6ad
+EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
+MISC ChangeLog 3889 RMD160 59d6018e24ca8de383013b6cda5850831c8f5dad SHA1 27dde9e14984470ec8baab15061e0962022949d7 SHA256 79b916284091304769df376e04fd013a031d9aa7cab908969d54c5d36dd3bab3
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJOTlE7AAoJEC8ZTXQF1qEPiQYP/147kFbb7Sw/uwahk1FXVhWY
-uJqICADyRVVWOlFwDDqxlBwO4B0cIBMp4GQHcyDAqXNUiPd/uYVyJ6OjfxGVBl1H
-mNtdROnjpG89LwrgxzmrhzP6/XlEfoOffei/LjN2V4Wgbt+kc+MBryYELGAQ6D3v
-eNIF1Pf8a+M0uOcG9C2RCKJpiHs9GOiyYdM0ijspbWeX/XKOTJABJKED/gKtveZP
-uQGWBzsSwKCA2/7C6i9bYIc8si9PVCeAh0XxAqqofN+P3B9upIYVlQ2qu+ZWrzmr
-C+BFeB1ZJ3Uf1bYJLsdUfMAYae1CP+7gd/d6Ze6qRj0WNNr38sWosfbUOn1Mitl1
-/BAmcvL68dryk+Tsgrs4Zzxu5K32DdIZvdUuuRXZOt58XXAMpj07QqeZE/U3udB5
-TzRreyYMc67RBXXz8mhYnKTgMUXEahsFkhE4UH97+Ej+LYsKxkaCumO8c9IptNgP
-ViSasoSFylw4Hz9tMOw1tSGtYj1ox2CrWweED8dkOHAAQcVKAwyj3X6W2ZO9i/lW
-vH4eSIgulpqjrGdbGOiJoP2SWaAka21GSTgigKZCuDLRmEwYfDDf5AhXjs3M4atk
-IJegMRKD3dxdJp7dp9CwzMtq1XOnqzJcnFl9Ga/4seQoFnNccAp7hbyeWKV6bgZH
-fcHkkkJ/QgKjMgbGzek5
-=mb22
+iQIcBAEBAgAGBQJOeqV7AAoJEC8ZTXQF1qEP8WQP/3+DzXmD87f+yWv0Vn4KgSVh
+25/RRYwhxb7YyMsfZoD0afDzVdc1e+zR8HJ/QJ7ZkODxjviS0unHg7B335swc1hj
+xXPUnIa8eg8KLgSOu2c/DXuWp8m7bQNnOOJVaysPx99ewrqyvGlJB2o9js2f5utC
+nv6k6UAu+7qjQVNvHv/t3YBFVZMiRXBmwMpaQit5Sg5lB3I7Td83TCC7J5+v2MYo
+DTQJpeVkCSZI2XDemMq54ZN0rjd/hOJJr6UZOKZhI1ChfkH7Bw/3NVgcCv9JOcVA
+91DCHZ0LX3n2FujvHGCrvZ/14SvZ623nvLor+7l3fPuYfwuTqTyjUvTVfNg2Cfg9
+jKlWFB4hijZN8aCVLN+iI3q2v8JbftO6KcLL/iDa159rHpqRdAgiTgAim9hg9ClL
+rlkym78vbQQAIgehYHT6FeRYUQpPkIsn/DguWSDD7Q7Df9C9O/TPV89HLlnLhrq8
+ZUY7pS+Ho8o+TjA0luaOGR+d0O+hlkTgxNImwkSw1BM2aBOLY34ctO1URUPBsqag
+xYiyxMt2Zx3ij2LZ5P5abt+Ij1WFztvYRLraA/nDF7s3Rm57uzodfX583P2TlH4X
+s+lA74zOzXCBnZva9FfpJU/b/j6XrCFDv3MgD87YfLeUOrjB9rnzbz3WAaT+L7ZA
+MGxLhNQnHZ5cbTQ0UP8Z
+=thUg
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.3.1_beta.ebuild b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
new file mode 100644
index 0000000..d535519
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.1_beta.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="2"
+
+# Build system
+BUILD="autotools"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.3.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-08-19 12:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-08-19 12:04 UTC (permalink / raw
To: gentoo-commits
commit: edeb1ec73cc6132c04fa9673d07ae513ad83b631
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 11:58:54 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 11:58:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=edeb1ec7
Added patch by Diego to fix the multiple install of files.
(Portage version: 2.2.0_alpha50/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 4 +++
dev-db/mariadb/Manifest | 35 +++++++++++++++--------------
dev-db/mariadb/mariadb-5.2.7.ebuild | 2 +-
dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 2 +-
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index f6eded5..ee2868c 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mariadb-5.2.7.ebuild, mariadb-5.3.0_beta.ebuild:
+ Added patch by Diego to fix the multiple install of files.
+
*mariadb-5.3.0_beta (29 Jul 2011)
29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9192aa1..0e94f6d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,25 +7,26 @@ DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
+DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
-EBUILD mariadb-5.2.7.ebuild 5901 RMD160 056b6bdb6064e5dae224b5671568196f65f5e34a SHA1 64abe85e4b59255ab728eedd3ea7a4f3e728dd3f SHA256 e52526c53b64bfec59dc53dfa7080806fad641e1086ae602232e81b981c413e3
-EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 d5ed7b10ad72dcb60892988867f540705b113bd9 SHA1 1d4e81918735530dbe2209a8f216425a3a2577ea SHA256 442fa0bb6f19b641bbb8fe6c3eaf9c1827e8be75630c0d9ee8ff78ab1ace32cc
-MISC ChangeLog 3312 RMD160 9795f9ff9be31c5cac0bebe4f1f79622058405ec SHA1 7dce78149c43b5f28e32e593d4906b286cb02685 SHA256 b3a6403b63854d2e62bcd4349713db40738688122df5a8fb290b6cb6cb6ed71a
+EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
+EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
+MISC ChangeLog 3492 RMD160 384b8917da6f1c6f72a0cdcfc8deb9cc3495e56d SHA1 61383793f9c34570730d188249a08c71aaa73fbf SHA256 0e3aa91adf0d46250f01eebe1a828240206f3fc164e752dadf1510ea66a7eaed
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJOMh18AAoJEC8ZTXQF1qEPUaIQAJoML1wQBIGU3ptPlGpb/4+g
-wnLADzB0gnspCQkB7788W/LhCBHe8cBG0J/oaFpOoMC3bWAABulRkqw4zPUn83J+
-7e+p6NCCi1hnEG3oKrFL0z/Hz4bFcaFkeE0cWLaHWjOauXmZk0r7uNbwDxu0FSmi
-01k/eDWA+ar+gTGfKyvij8RIyxCZB3iQPxw0E8wZwTdbri5QWaWmykBeTIiahihc
-XFKqdiEQuJW+3CnfUbXmnjFJ0E6d2/recwglu0wUPryEsQB1iUahl1CAQ2c0/kM7
-xunxEOoTEeq1h98muU0rKYeWNJGOGF5etxdJWbMg18VHtfMA0s+ejbaZbztPafT1
-Gs8FXobinsjY240PjZhid6ibQtJnIC4VNsxWPGiN0kPvwzW07ImDj75VYXuL/1WA
-1GyeuG7ASKDwpZPltGyrjr5B+ib4XTGBBo85kbgF1LS2XTtx64/fZD1zd6rTeCH5
-qtSi6EzZPN2RJ2ek3CYFCtvQe112BMox4qNDtam+uw9LyLGtvlmen4ylxKIIXp/g
-YiKdFhnAPvtfocaFyXOUWWXEBvyuAG1+0t1G4E3paBKExxRU3DqywPpk5THKc0tI
-U4m43y5rGjjBkU9V3YE28IqQuAV1IBOhfZSWydJLGar/uKys3Hfu8PnNEz9g11uP
-qbFZkwy926dv9I0O1A84
-=27vb
+iQIcBAEBAgAGBQJOTk/+AAoJEC8ZTXQF1qEPNNEQALcRsQs5Oxpwc+pY+zrUsT0X
+15ZaNbCwkzksPxj2vziGJUcF59UJOcJBs7Agd3jUoS824aiGCSqTqj1MlQ3EoePb
+wdFX60JaRFjxYrAGv/f4CtKwwUC8EJkKGsw6rpHdtTvZko+/mB66y7AtxL/b/J30
+wdUhGKqRCRRgZAtbTr222G8iNOgcxRKJBmPhehSUppf6Qe8RnWH32nKF8HdPQFhB
+aifESIczSqQFZpHMXlFh8ofNtBjoDeHNUyQ/L1A/Q/m62hMs8B5zhCZs5mXHsMjv
+T0jqSJ+g0KZj8J8VDbrsF4U2Cri+5LaUkPVososZd4cvdlEO8yW0ntJq23kicEXT
+RVL58gKicwLx4iI7nK8fhQiIxdqiW61ggFKogkbU8km5HwZ0I/7ds0hpCUK2HCmr
+aeosAT6oH7CEXsqE2lwYd0o5ou+8DN1AZBFE52ktUu+7hy+DF7XtgQR7yRfrfj63
+uv8LFVn2MgCqm1wu3SGAqctWZSDTzjpv8zrx9dxWLGiVrhCqAh8jFJLgV9YopahW
+jhi/SmjNIKMHV63YKaXHJkWxX/lFIsKWwUGr1XklZqNS+K9v+ERLn/uM6nmDukXk
+bLOKD14EU2eVkru9/e4P5oA8PoOLo5pBsKLQB58Ykf/iNJzUtxEAtAmw+1/pdJxd
+qtdpDikKgAMBfljIuZSK
+=0R8T
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index 14c9468..76cd16e 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110426-1046Z"
+MY_EXTRAS_VER="20110819-0415Z"
EAPI="2"
# Build system
diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
index a7b1306..d535519 100644
--- a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="20110426-1046Z"
+MY_EXTRAS_VER="20110819-0415Z"
EAPI="2"
# Build system
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-08-19 12:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-08-19 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 4156b94bde50061a19477e8956a8bb0bd5be4941
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 12:04:11 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 12:04:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4156b94b
[dev-db/maria] Bumped to release 5.2.8.
(Portage version: 2.2.0_alpha50/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 6 ++
dev-db/mariadb/Manifest | 30 ++++---
dev-db/mariadb/mariadb-5.2.8.ebuild | 171 +++++++++++++++++++++++++++++++++++
3 files changed, 193 insertions(+), 14 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index ee2868c..ffd423d 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.2.8 (19 Aug 2011)
+
+ 19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +mariadb-5.2.8.ebuild:
+ [dev-db/maria] Bumped to release 5.2.8.
+
19 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mariadb-5.2.7.ebuild, mariadb-5.3.0_beta.ebuild:
Added patch by Diego to fix the multiple install of files.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0e94f6d..64658f9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,28 +5,30 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc799
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
+DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
+EBUILD mariadb-5.2.8.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa
-MISC ChangeLog 3492 RMD160 384b8917da6f1c6f72a0cdcfc8deb9cc3495e56d SHA1 61383793f9c34570730d188249a08c71aaa73fbf SHA256 0e3aa91adf0d46250f01eebe1a828240206f3fc164e752dadf1510ea66a7eaed
+MISC ChangeLog 3657 RMD160 93916481f5026ceb42ecf83744cf37d43b22f8f6 SHA1 cb08374b233431de689f1be8863a62bc281e46f9 SHA256 8f5887826d4e5db6c96b8c5fcd6ad567753f24ccd59ad9f9b2f384e79948d6ad
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJOTk/+AAoJEC8ZTXQF1qEPNNEQALcRsQs5Oxpwc+pY+zrUsT0X
-15ZaNbCwkzksPxj2vziGJUcF59UJOcJBs7Agd3jUoS824aiGCSqTqj1MlQ3EoePb
-wdFX60JaRFjxYrAGv/f4CtKwwUC8EJkKGsw6rpHdtTvZko+/mB66y7AtxL/b/J30
-wdUhGKqRCRRgZAtbTr222G8iNOgcxRKJBmPhehSUppf6Qe8RnWH32nKF8HdPQFhB
-aifESIczSqQFZpHMXlFh8ofNtBjoDeHNUyQ/L1A/Q/m62hMs8B5zhCZs5mXHsMjv
-T0jqSJ+g0KZj8J8VDbrsF4U2Cri+5LaUkPVososZd4cvdlEO8yW0ntJq23kicEXT
-RVL58gKicwLx4iI7nK8fhQiIxdqiW61ggFKogkbU8km5HwZ0I/7ds0hpCUK2HCmr
-aeosAT6oH7CEXsqE2lwYd0o5ou+8DN1AZBFE52ktUu+7hy+DF7XtgQR7yRfrfj63
-uv8LFVn2MgCqm1wu3SGAqctWZSDTzjpv8zrx9dxWLGiVrhCqAh8jFJLgV9YopahW
-jhi/SmjNIKMHV63YKaXHJkWxX/lFIsKWwUGr1XklZqNS+K9v+ERLn/uM6nmDukXk
-bLOKD14EU2eVkru9/e4P5oA8PoOLo5pBsKLQB58Ykf/iNJzUtxEAtAmw+1/pdJxd
-qtdpDikKgAMBfljIuZSK
-=0R8T
+iQIcBAEBAgAGBQJOTlE7AAoJEC8ZTXQF1qEPiQYP/147kFbb7Sw/uwahk1FXVhWY
+uJqICADyRVVWOlFwDDqxlBwO4B0cIBMp4GQHcyDAqXNUiPd/uYVyJ6OjfxGVBl1H
+mNtdROnjpG89LwrgxzmrhzP6/XlEfoOffei/LjN2V4Wgbt+kc+MBryYELGAQ6D3v
+eNIF1Pf8a+M0uOcG9C2RCKJpiHs9GOiyYdM0ijspbWeX/XKOTJABJKED/gKtveZP
+uQGWBzsSwKCA2/7C6i9bYIc8si9PVCeAh0XxAqqofN+P3B9upIYVlQ2qu+ZWrzmr
+C+BFeB1ZJ3Uf1bYJLsdUfMAYae1CP+7gd/d6Ze6qRj0WNNr38sWosfbUOn1Mitl1
+/BAmcvL68dryk+Tsgrs4Zzxu5K32DdIZvdUuuRXZOt58XXAMpj07QqeZE/U3udB5
+TzRreyYMc67RBXXz8mhYnKTgMUXEahsFkhE4UH97+Ej+LYsKxkaCumO8c9IptNgP
+ViSasoSFylw4Hz9tMOw1tSGtYj1ox2CrWweED8dkOHAAQcVKAwyj3X6W2ZO9i/lW
+vH4eSIgulpqjrGdbGOiJoP2SWaAka21GSTgigKZCuDLRmEwYfDDf5AhXjs3M4atk
+IJegMRKD3dxdJp7dp9CwzMtq1XOnqzJcnFl9Ga/4seQoFnNccAp7hbyeWKV6bgZH
+fcHkkkJ/QgKjMgbGzek5
+=mb22
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.8.ebuild b/dev-db/mariadb/mariadb-5.2.8.ebuild
new file mode 100644
index 0000000..76cd16e
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.8.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="2"
+
+# Build system
+BUILD="autotools"
+
+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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# 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
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # 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"
+
+ emake check || die "make check failed"
+ 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"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # 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_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ 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
+}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-07-21 21:28 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-21 21:28 UTC (permalink / raw
To: gentoo-commits
commit: d0f84a5801f2610e21a5cc48a26e47db84631d83
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 21:28:41 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 21:28:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d0f84a58
Dropped old versions of mariadb from the overlay.
(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 6 +
dev-db/mariadb/Manifest | 44 ++----
dev-db/mariadb/mariadb-5.1.42-r1.ebuild | 204 ----------------------------
dev-db/mariadb/mariadb-5.1.50-r1.ebuild | 222 ------------------------------
dev-db/mariadb/mariadb-5.1.50.ebuild | 222 ------------------------------
dev-db/mariadb/mariadb-5.1.53.ebuild | 222 ------------------------------
dev-db/mariadb/mariadb-5.2.4.ebuild | 223 ------------------------------
dev-db/mariadb/mariadb-5.2.5.ebuild | 226 -------------------------------
dev-db/mariadb/mariadb-5.2.6.ebuild | 226 -------------------------------
9 files changed, 21 insertions(+), 1574 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 520f62d..4952d1d 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ -mariadb-5.1.42-r1.ebuild, -mariadb-5.1.50.ebuild, -mariadb-5.1.50-r1.ebuild,
+ -mariadb-5.1.53.ebuild, -mariadb-5.2.4.ebuild, -mariadb-5.2.5.ebuild,
+ -mariadb-5.2.6.ebuild:
+ Dropped old versions of mariadb from the overlay.
+
14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mariadb-5.1.55.ebuild:
[dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 136cedd..098af7c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,43 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
-DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e236a3 SHA1 c6082203eea91a4efb95a11d06fccc4215a465a4 SHA256 f93dbf85ad03fe1928738e5552b8a7f911a0c3f2d644784a355a8f1b8fc2c29b
-DIST mariadb-5.1.50.tar.gz 24567591 RMD160 d143e06ea847aab33922749d1e29548354df8f87 SHA1 0f314a6f396192b364d81feb7732ea2544153ffb SHA256 7d2a42374d05de28180985e8f4de98c2133ea1c7e39d8ccb9c12a4323704a5e7
-DIST mariadb-5.1.53.tar.gz 24658055 RMD160 ed019ab1d60c33f23339ecd1a4ffd9f8838d9f8b SHA1 d7b2a931a754dea71d35bce6f0fde172dc8e5c9c SHA256 bfe4388b1fbfb463e35e7a7e7ade4e6f04c65bd2c27451effe5c4e55989c1be5
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
-DIST mariadb-5.2.4.tar.gz 24964617 RMD160 86cd7ae572b2a53193231d500f419d4612874f3a SHA1 ddfb9373ce437ee7bffe680a7ce76d56edab1245 SHA256 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc
-DIST mariadb-5.2.5.tar.gz 24925585 RMD160 520f1f3c238db171fdbe9bff5d5b59a063edca85 SHA1 9d58166f2ef258785beaa3645d378ea461bd63f0 SHA256 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1
-DIST mariadb-5.2.6.tar.gz 25086148 RMD160 878a4d92c004289bac608758875449713b06015b SHA1 618b3abda320b66497c589709caba3936c26433c SHA256 4cf77b7978328e54ce58a2a8c3380e38d8a0039fd2e29d5fa148adbb6b4134c0
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
-DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
-EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f3479ddd5f20dca1c7e3f09f026f7563 SHA1 bd961bd2496f834ad03fc1ba045d6e37b042568d SHA256 ca42b494a3506bffae6cab303b83902c92a751a3bbd656c6ff7aae3944fa3187
-EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
-EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5
-EBUILD mariadb-5.1.53.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
-EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee3508589dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f066aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35
-EBUILD mariadb-5.2.5.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
-EBUILD mariadb-5.2.6.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 056b6bdb6064e5dae224b5671568196f65f5e34a SHA1 64abe85e4b59255ab728eedd3ea7a4f3e728dd3f SHA256 e52526c53b64bfec59dc53dfa7080806fad641e1086ae602232e81b981c413e3
-MISC ChangeLog 2825 RMD160 35effd70f7d7997b97d8a0ad53d8e40665c0a207 SHA1 7ff80b3b933ac18d00642fa045755a76bb27304a SHA256 528b83f353cead56fe8849982a006a5f6c499553232e5ea4d64363db5da31021
+MISC ChangeLog 3122 RMD160 698b002b0e4633c0c98446739b88b2ce3f3f0ddf SHA1 b2440b2b4627cc8c2ffcc21f1ea6bd355c494ab2 SHA256 bf0385cf2b87c12c336b59820234d19f18bbcff52c84ee4aa82f8b9b638fdb8b
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOHm1TAAoJEC8ZTXQF1qEPZ5AQAKsaEPUjGjunZR8inQz6tmu6
-0f+Xe2gAFn2FHx7fvgycFCs6Ud0iP+G61V2k53vmMwjha14cR+b98A0MOek4nsQa
-DZq3h5mo4q7ZJz28Jn9ggqbswK79UVyuxs4VuiMvCnKYSP6BIQ5LmhFdFfkhim24
-Gp1Ge3c5hbBwT5BxTulAZtd7Gsj0X9IbH1XQv+5fv1cLoAluPZVfRo/X/itfg5Qp
-/U3JJhnqAwnHIgCtObSnQjDZ50+OiQ2z5YlEy2qNZq6nNiEUJcBbfRkwll+wooPT
-J1qquHk9HoJj0vB8rKfTpH6CbpUyaAwmW22L1GAdfx/mNLxiU+A7DDHOXB676DHw
-EnL/nwhAeGX4jzotrmr1bq3/Bg7H78P+eQ+hqEE06xOXcKf2UncEAIdiIHY31Cxl
-j+Mkxb9ag+rv7uVauSzw0CAN25uq6NYjTKuoUA8lFZjdTumBasp1jPBbyMlaiOcP
-cd7B50ykJ3ATHdLoxLKf17JVv9sYmaaazBJEfZmy/4Wuc0jd967QTtDZgOCESIm8
-1s+Xpe4bvdmBFO0Q61Zh1u9dZe9SYQE3FsGX2fDwUdx6oDgHgbAA01OtjsWIz7Mu
-dN4v7V6dQ/8qIEgWHo+O/eWXkXeyAThx+5zSKsWzcowUA+POZWi4ofu6fYxzB6ie
-HJEx8sdJ81A+UjMaRTz/
-=VyRN
+iQIcBAEBAgAGBQJOKJoJAAoJEC8ZTXQF1qEPW90QANpv1rPR/6+VLGSWXfB9pqwm
+DtAhUpSa+kH+N4jU/ux7TFVo2+oKEqdzCRTfN1IGYKV1x198Q/emU8ZnhsfiH5Is
+xSBSYA4/MnR66Wd7J4U3UC4aZTt17URwTT8sOylnqDYB8PPT2+Ve6ODvt80bMTnW
+eB3O1QbkObYvm890NGrqlCEtaSAlESlYVa9D/XfiUurPn2Mi8VI4e6Cw4hbgk3/A
+vXjd6kENBvdDgv5TM+h7fCvkTR+mF8q4W5gszirrAZOzhI0CkZRf6pY5sgmgk/QM
+S8DSNIQgq+269ZBS2J2N8RbYEHMZw3t19TRKtJe93rn49/fQA28FgsuqzqtEf8eq
+hde2cQazxEPGe5yN3aGyEnzFi8AtTnM1r7P7A0eG4tt5EgotBKDgOnpH1WyvAmEd
+qpb88HQlje9UdEuZ+usiS9fU0RU+YGwqk5wF63UPcKUrT2kFDh8a0yfUWced8Yqp
+Q7XHSW1dJbGIKTBxuaGlA/hw5dAmWrdEcwWO+g02eMpZfEvg0o3PbsFUXIJdK4mV
+Eh7jq/BnnvXHqrgvemeO0Pzh0h9/qvHJrnCiLy8PC5kJJR/M8bXJaRsTlTCzAvev
+G0xY+1eXVDi7QKRjy+1yVd0vEndYZImp9xwijp47ykS0epKgIaNZ5BieTkOTyPNI
+Temmk1C56eMplB+PaOoF
+=jQgJ
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.1.42-r1.ebuild b/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
deleted file mode 100644
index e35a1fe..0000000
--- a/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-inherit toolchain-funcs mysql
-# 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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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="!media-sound/amarok[embedded]"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.1.50-r1.ebuild b/dev-db/mariadb/mariadb-5.1.50-r1.ebuild
deleted file mode 100644
index 8103c94..0000000
--- a/dev-db/mariadb/mariadb-5.1.50-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-inherit toolchain-funcs mysql
-# 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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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 )"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.1.50.ebuild b/dev-db/mariadb/mariadb-5.1.50.ebuild
deleted file mode 100644
index 65d9af2..0000000
--- a/dev-db/mariadb/mariadb-5.1.50.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="20101006-0004Z"
-EAPI=2
-
-inherit toolchain-funcs mysql
-# 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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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 )"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.1.53.ebuild b/dev-db/mariadb/mariadb-5.1.53.ebuild
deleted file mode 100644
index 8103c94..0000000
--- a/dev-db/mariadb/mariadb-5.1.53.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-inherit toolchain-funcs mysql
-# 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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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 )"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.4.ebuild b/dev-db/mariadb/mariadb-5.2.4.ebuild
deleted file mode 100644
index 7072fb0..0000000
--- a/dev-db/mariadb/mariadb-5.2.4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-inherit toolchain-funcs mysql
-# 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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.5.ebuild b/dev-db/mariadb/mariadb-5.2.5.ebuild
deleted file mode 100644
index bb2acbb..0000000
--- a/dev-db/mariadb/mariadb-5.2.5.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI="2"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql-v2_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql-v2_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql-v2_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql-v2_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql-v2_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql-v2_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.2.6.ebuild b/dev-db/mariadb/mariadb-5.2.6.ebuild
deleted file mode 100644
index bb2acbb..0000000
--- a/dev-db/mariadb/mariadb-5.2.6.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI="2"
-
-# Build system
-BUILD="autotools"
-
-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="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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
-src_prepare() {
- sed -i \
- -e '/^noinst_PROGRAMS/s/basic-t//g' \
- "${S}"/unittest/mytap/t/Makefile.am
- mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql-v2_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql-v2_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql-v2_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql-v2_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql-v2_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql-v2_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates, they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that they are
- # not expiring like this. We cannot do so ourselves as the tests look
- # closely as the cert path data, and we do not have the CA key to regen
- # ourselves. Alternatively, upstream should generate them with at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-v2_disable_test \
- "$t" \
- "These OpenSSL tests break due to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade, main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-v2_disable_test "$t" "False positives in Gentoo"
- done
- ;;
- esac
-
- # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
- # These tests are picking up a 'connect-timeout' config from somewhere,
- # which is not valid, and since it does not have 'loose-' in front of
- # it, it's causing a failure
- case ${PV} in
- 5.1.5*|5.4.*|5.5.*|6*)
- for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-v2_disable_test "$t" \
- "False positives in Gentoo: connect-timeout"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql-v2_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql-v2_disable_test $t "ndb not supported in mariadb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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
-}
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-07-14 4:17 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-14 4:17 UTC (permalink / raw
To: gentoo-commits
commit: e6d02ed29c1e57f619d25917d8421be049768abb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 04:15:15 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 04:15:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e6d02ed2
[dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild.
Drop irrelevant code and use mysql-v2 and not mysql-autotools.
(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 5 ++
dev-db/mariadb/Manifest | 32 +++++++-------
dev-db/mariadb/mariadb-5.1.55.ebuild | 73 ++++-----------------------------
3 files changed, 30 insertions(+), 80 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index f8773b8..520f62d 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mariadb-5.1.55.ebuild:
+ [dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild.
+ Drop irrelevant code and use mysql-v2 and not mysql-autotools.
+
*mariadb-5.2.6 (13 May 2011)
13 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f84c13d..136cedd 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
@@ -17,27 +17,27 @@ EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f3479ddd5f20dca1c7e3f09f026f
EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5
EBUILD mariadb-5.1.53.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
-EBUILD mariadb-5.1.55.ebuild 7643 RMD160 ec1c29f91b72556a6605d86eb44b9c71128b9c7d SHA1 b2a68e6b355a17eff1096ae55a10e0fb45a211ac SHA256 b4f3a01897dc989b5386f1f42759c13748ecd42956382455d545358e06d5aed3
+EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550
EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee3508589dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f066aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35
EBUILD mariadb-5.2.5.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
EBUILD mariadb-5.2.6.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 056b6bdb6064e5dae224b5671568196f65f5e34a SHA1 64abe85e4b59255ab728eedd3ea7a4f3e728dd3f SHA256 e52526c53b64bfec59dc53dfa7080806fad641e1086ae602232e81b981c413e3
-MISC ChangeLog 2594 RMD160 e953d1e10cfac42f2520e771c319421ad9d8b45f SHA1 163dd69a438e51bf3fb9d2f7dc09066b0a995757 SHA256 101340b4c8378b175307929de8d454794b7cc3f601550a6aa1e5fe7c477649d9
+MISC ChangeLog 2825 RMD160 35effd70f7d7997b97d8a0ad53d8e40665c0a207 SHA1 7ff80b3b933ac18d00642fa045755a76bb27304a SHA256 528b83f353cead56fe8849982a006a5f6c499553232e5ea4d64363db5da31021
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJOAAflAAoJEC8ZTXQF1qEPkKUP/0aCLoPfqKbNCh4HUyoT4Fq9
-2aYLGxtZdwcvgMizNpjHQZ3npE1q8Txc21YliO9ykgqQNWbK/id5D9sNMrFBi31w
-jxeoJbosB76XZCb7rHAQ1vaTixP4Ado0OQflaBOPLWFnX2/DuGkccqCpaAzTd+eu
-iKwvojPa9642RHZLlcT14ZuNlv8DEOb0EEWRXiob4POjv3D6VLXQ+101ppNafJmz
-/Gs04XfcukmFwT0QgrMhFj9ifkB/29aixMZoEHBgfaWYQgDZiYZjdtZRHOMv9GF2
-z8DR/+By9WSrKYUdK0rzMisqW+cvPrQBbinfuL5hf3Hb+2RLtXyONxSFjMXR7Oi8
-go3Oy3R4SxMLxTWusIuLOx3nghzFL9bZKmetLeqLZLdRVouDDsOaeDhbNGMlTM/o
-3chz+S1XX6leFA9JqSI2+kRrtCOkcb2GNgrsYqqOa+1lt2i5zYCTSWROyUVLDXvz
-dWfYIdEVqquI63D80C4WBHzLAYgxNyXQOgIch0tv74MmRu7hHGfBi/2Gf0L6HGzQ
-0K8qwQ9OzrQhf4HHfpoROAkGRackaLYXD1BvZ0MgPMlbDAM3HOUzalK6zAIxw3j1
-lvxzKxskswahcHdx5SkmlINJ3oRk1N/4VWYTfe2QxbSScqIJFdOEUAjoNJ7I+ehg
-Z87OPqAOO4eIm4Cjfgdc
-=52Jz
+iQIcBAEBCgAGBQJOHm1TAAoJEC8ZTXQF1qEPZ5AQAKsaEPUjGjunZR8inQz6tmu6
+0f+Xe2gAFn2FHx7fvgycFCs6Ud0iP+G61V2k53vmMwjha14cR+b98A0MOek4nsQa
+DZq3h5mo4q7ZJz28Jn9ggqbswK79UVyuxs4VuiMvCnKYSP6BIQ5LmhFdFfkhim24
+Gp1Ge3c5hbBwT5BxTulAZtd7Gsj0X9IbH1XQv+5fv1cLoAluPZVfRo/X/itfg5Qp
+/U3JJhnqAwnHIgCtObSnQjDZ50+OiQ2z5YlEy2qNZq6nNiEUJcBbfRkwll+wooPT
+J1qquHk9HoJj0vB8rKfTpH6CbpUyaAwmW22L1GAdfx/mNLxiU+A7DDHOXB676DHw
+EnL/nwhAeGX4jzotrmr1bq3/Bg7H78P+eQ+hqEE06xOXcKf2UncEAIdiIHY31Cxl
+j+Mkxb9ag+rv7uVauSzw0CAN25uq6NYjTKuoUA8lFZjdTumBasp1jPBbyMlaiOcP
+cd7B50ykJ3ATHdLoxLKf17JVv9sYmaaazBJEfZmy/4Wuc0jd967QTtDZgOCESIm8
+1s+Xpe4bvdmBFO0Q61Zh1u9dZe9SYQE3FsGX2fDwUdx6oDgHgbAA01OtjsWIz7Mu
+dN4v7V6dQ/8qIEgWHo+O/eWXkXeyAThx+5zSKsWzcowUA+POZWi4ofu6fYxzB6ie
+HJEx8sdJ81A+UjMaRTz/
+=VyRN
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index 3f17a1b..cc30840 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20110426-1046Z"
EAPI="2"
# Build system
@@ -28,7 +28,7 @@ src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
- mysql-autotools_src_prepare
+ mysql-v2_src_prepare
}
# Official test instructions:
@@ -58,61 +58,6 @@ src_test() {
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql-autotools_disable_test "archive_gis" "Totally broken in 5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql-autotools_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql-autotools_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql-autotools_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql-autotools_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql-autotools_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql-autotools_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream bug #41066"
-
# The entire 5.0 series has pre-generated SSL certificates, they have
# mostly expired now. ${S}/mysql-tests/std-data/*.pem
# The certs really SHOULD be generated for the tests, so that they are
@@ -129,10 +74,10 @@ src_test() {
# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
# expired/invalid.
case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
+ 5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql-autotools_disable_test \
+ mysql-v2_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
@@ -153,13 +98,13 @@ src_test() {
# Failure reason unknown at this time, must resolve before package.mask
# removal FIXME
case ${PV} in
- 5.1.*|5.4.*|5.5.*)
+ 5.1.*|5.2.*|5.4.*|5.5.*)
for t in main.mysql_client_test main.mysql_comments \
main.mysql_upgrade \
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql-autotools_disable_test "$t" "False positives in Gentoo"
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
done
;;
esac
@@ -171,21 +116,21 @@ src_test() {
case ${PV} in
5.1.5*|5.4.*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql-autotools_disable_test "$t" \
+ mysql-v2_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
- || mysql-autotools_disable_test main.profiling \
+ || mysql-v2_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
- mysql-autotools_disable_test $t "ndb not supported in mariadb"
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
done
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-06-21 3:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-06-21 3:04 UTC (permalink / raw
To: gentoo-commits
commit: e9f5ebe2ceacb070de4756bde98f0e4bb06e7de6
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 02:54:29 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 02:54:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e9f5ebe2
[dev-db/mariadb-5.2.7] Drop 5.0.* match as we don't support <5.1.50 with the new eclasses.
(Portage version: 2.2.0_alpha40/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/Manifest | 28 ++++++++++++++--------------
dev-db/mariadb/mariadb-5.2.7.ebuild | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4969b15..f84c13d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -21,23 +21,23 @@ EBUILD mariadb-5.1.55.ebuild 7643 RMD160 ec1c29f91b72556a6605d86eb44b9c71128b9c7
EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee3508589dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f066aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35
EBUILD mariadb-5.2.5.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
EBUILD mariadb-5.2.6.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
-EBUILD mariadb-5.2.7.ebuild 5907 RMD160 649db1b2c55f6f39bb1a7d0347e96b39a439c409 SHA1 ee372b2ef76b986c740c83160e46c35e988aa2af SHA256 37f8469e2ecfbf0b5a56ad2b4ade0d94dbf42024592c6e89cbee816be9ab6920
+EBUILD mariadb-5.2.7.ebuild 5901 RMD160 056b6bdb6064e5dae224b5671568196f65f5e34a SHA1 64abe85e4b59255ab728eedd3ea7a4f3e728dd3f SHA256 e52526c53b64bfec59dc53dfa7080806fad641e1086ae602232e81b981c413e3
MISC ChangeLog 2594 RMD160 e953d1e10cfac42f2520e771c319421ad9d8b45f SHA1 163dd69a438e51bf3fb9d2f7dc09066b0a995757 SHA256 101340b4c8378b175307929de8d454794b7cc3f601550a6aa1e5fe7c477649d9
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJOAAdoAAoJEC8ZTXQF1qEPFo0P/i5nB7fD4LqI+Cq+G+1y4GGv
-eONOJ2QOcrWbdNliMrqOds/SSWUyQpW3JijXJNSeb+xRWG1OsuAqx2lJb9YRFw9v
-kxcZZKIjPN1OGeGqgwxTSO2ambr3vvSA3jsiq0oUYshDjJIWvTMGj+BpJTST8Ku6
-sGSy9sJC1ihtVZNfs/7zG9PI3564QLg0wK7P8t1cZBMskiTBMVZQ++O0g66nsp2y
-2VhlcbLaWl5VfTfBrxTcZosEHubX8xa74H1jfZks/CUbZUc8mYinFN9la48upjJ1
-WmLUXlj+9F8sAwaKHCxaTW4PZa0+f6LgZvECj6cyjoUClMg8/1TG0pP8X9ZXkD61
-FyLm+M8nRDwpvuu+Oi6HI6qiqIHkPWflKJkFZ0zkmpeAnxJYqktVQCfznmeFajIC
-ds/cimgrfqdQGDbxJIhnp7y8Kda9RrL2OSTeijug4E+mZftvHVr02+8WYuJ4sX7G
-y9QoWNL4goTSbfUJgw8H60966NE+zlU1yB+QeMpq4pRIHcQ1quIV2xPu4/WeBuoM
-b/5oOuhS/tABr0DMh4DhDekTB+zBQ9TRli6RH23G6dGNyw5D9Z8bDIoFiNPeq12w
-NKfx8/5KQBlbLpztvu63zsoP+EEodthVXOk+HEdQFnIoCD0FHxe6hU63xxLmrF+I
-D3LaDjwF+9DTA+EUFDU9
-=dB+F
+iQIcBAEBCAAGBQJOAAflAAoJEC8ZTXQF1qEPkKUP/0aCLoPfqKbNCh4HUyoT4Fq9
+2aYLGxtZdwcvgMizNpjHQZ3npE1q8Txc21YliO9ykgqQNWbK/id5D9sNMrFBi31w
+jxeoJbosB76XZCb7rHAQ1vaTixP4Ado0OQflaBOPLWFnX2/DuGkccqCpaAzTd+eu
+iKwvojPa9642RHZLlcT14ZuNlv8DEOb0EEWRXiob4POjv3D6VLXQ+101ppNafJmz
+/Gs04XfcukmFwT0QgrMhFj9ifkB/29aixMZoEHBgfaWYQgDZiYZjdtZRHOMv9GF2
+z8DR/+By9WSrKYUdK0rzMisqW+cvPrQBbinfuL5hf3Hb+2RLtXyONxSFjMXR7Oi8
+go3Oy3R4SxMLxTWusIuLOx3nghzFL9bZKmetLeqLZLdRVouDDsOaeDhbNGMlTM/o
+3chz+S1XX6leFA9JqSI2+kRrtCOkcb2GNgrsYqqOa+1lt2i5zYCTSWROyUVLDXvz
+dWfYIdEVqquI63D80C4WBHzLAYgxNyXQOgIch0tv74MmRu7hHGfBi/2Gf0L6HGzQ
+0K8qwQ9OzrQhf4HHfpoROAkGRackaLYXD1BvZ0MgPMlbDAM3HOUzalK6zAIxw3j1
+lvxzKxskswahcHdx5SkmlINJ3oRk1N/4VWYTfe2QxbSScqIJFdOEUAjoNJ7I+ehg
+Z87OPqAOO4eIm4Cjfgdc
+=52Jz
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index 8c6040b..14c9468 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -74,7 +74,7 @@ src_test() {
# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
# expired/invalid.
case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
+ 5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
mysql-v2_disable_test \
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-06-21 3:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-06-21 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 2e925458501e4b0dd6502d37e57730051004b216
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 02:52:24 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 02:52:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2e925458
[dev-db/mariadb-5.2.7] Use a mysql-extras tarball and stop abusing the live repository.
(Portage version: 2.2.0_alpha40/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/Manifest | 29 +++++++++++++++--------------
dev-db/mariadb/mariadb-5.2.7.ebuild | 2 +-
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 4146fd6..4969b15 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -12,6 +12,7 @@ DIST mariadb-5.2.5.tar.gz 24925585 RMD160 520f1f3c238db171fdbe9bff5d5b59a063edca
DIST mariadb-5.2.6.tar.gz 25086148 RMD160 878a4d92c004289bac608758875449713b06015b SHA1 618b3abda320b66497c589709caba3936c26433c SHA256 4cf77b7978328e54ce58a2a8c3380e38d8a0039fd2e29d5fa148adbb6b4134c0
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
+DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f3479ddd5f20dca1c7e3f09f026f7563 SHA1 bd961bd2496f834ad03fc1ba045d6e37b042568d SHA256 ca42b494a3506bffae6cab303b83902c92a751a3bbd656c6ff7aae3944fa3187
EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5
@@ -20,23 +21,23 @@ EBUILD mariadb-5.1.55.ebuild 7643 RMD160 ec1c29f91b72556a6605d86eb44b9c71128b9c7
EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee3508589dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f066aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35
EBUILD mariadb-5.2.5.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
EBUILD mariadb-5.2.6.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
-EBUILD mariadb-5.2.7.ebuild 5897 RMD160 c850094aac261a1d9c0f13c73f4cd3fa7cc4f9aa SHA1 54e8e8c8c84a8bceba6804824bdba92ed8c096b2 SHA256 91f5c3b699d7b5d73280daa582bf6ffe5127f52f9f5ec6158c763ed65cd7716e
+EBUILD mariadb-5.2.7.ebuild 5907 RMD160 649db1b2c55f6f39bb1a7d0347e96b39a439c409 SHA1 ee372b2ef76b986c740c83160e46c35e988aa2af SHA256 37f8469e2ecfbf0b5a56ad2b4ade0d94dbf42024592c6e89cbee816be9ab6920
MISC ChangeLog 2594 RMD160 e953d1e10cfac42f2520e771c319421ad9d8b45f SHA1 163dd69a438e51bf3fb9d2f7dc09066b0a995757 SHA256 101340b4c8378b175307929de8d454794b7cc3f601550a6aa1e5fe7c477649d9
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJOAAcrAAoJEC8ZTXQF1qEPMN8P/RdTzSWA94esuqeX535dS2Et
-YNfz63MJwhRFKWBuqEKn3zfNpT6Uh88dzPII2O74JQZUqolIvF9HebK5SYfqyUce
-1xrlO2DFLXG6nwVe+baCCDS0kbDTN8qJP6fuUGlQpLzGFyf2TOBYajlA3jpF7Ret
-4PCplGv+Ymjgwzg5dHr94AYXFQZ0fawJXoy5rujm4PYHzS/ghGnbtFz21ekpsuyX
-Ycx8kat/O4b5w3RsAMRX+VrPEhvvOmsY/bmVF6JGEgTTxsYV16LGxpYhqthhBHVw
-di8l2cTXySQlMfkTPjDUenLtEQ/r/aD8tC9B1iBfmajTymyUUtjlBRDjfmSJur91
-bQcgMMYDeyo2lyvIvZ24TzPqroGhfJFmtOl+LAYih37nwIcUj02CAy28/6Yszh/U
-jOJ1i9b/QLRWtWyLKAZT1Ki2kSKqTiXIP+0yUS6cfpoNRBMr8s5/DIYEJFLwB3sr
-dK2UQYlruo0DrtUyf6oqE7LuL+W5usjiYwoFiK7Vr7D2wPgsqyQEdyQiJA0z24ON
-BefLufV6btkpkwzih0DMSGLvMNbPAzq4GF4fCl8hTOArXqexIWQx5ILxaf89my7i
-u45Mnp6S/cACrWdfBXEk6ohNwjH+F3Ya7nhD6+8Hg73WpqGrvL7oaA5QbyPHx4cO
-RBOuZ2+ybJqsq+Ejn6ih
-=GSkd
+iQIcBAEBCAAGBQJOAAdoAAoJEC8ZTXQF1qEPFo0P/i5nB7fD4LqI+Cq+G+1y4GGv
+eONOJ2QOcrWbdNliMrqOds/SSWUyQpW3JijXJNSeb+xRWG1OsuAqx2lJb9YRFw9v
+kxcZZKIjPN1OGeGqgwxTSO2ambr3vvSA3jsiq0oUYshDjJIWvTMGj+BpJTST8Ku6
+sGSy9sJC1ihtVZNfs/7zG9PI3564QLg0wK7P8t1cZBMskiTBMVZQ++O0g66nsp2y
+2VhlcbLaWl5VfTfBrxTcZosEHubX8xa74H1jfZks/CUbZUc8mYinFN9la48upjJ1
+WmLUXlj+9F8sAwaKHCxaTW4PZa0+f6LgZvECj6cyjoUClMg8/1TG0pP8X9ZXkD61
+FyLm+M8nRDwpvuu+Oi6HI6qiqIHkPWflKJkFZ0zkmpeAnxJYqktVQCfznmeFajIC
+ds/cimgrfqdQGDbxJIhnp7y8Kda9RrL2OSTeijug4E+mZftvHVr02+8WYuJ4sX7G
+y9QoWNL4goTSbfUJgw8H60966NE+zlU1yB+QeMpq4pRIHcQ1quIV2xPu4/WeBuoM
+b/5oOuhS/tABr0DMh4DhDekTB+zBQ9TRli6RH23G6dGNyw5D9Z8bDIoFiNPeq12w
+NKfx8/5KQBlbLpztvu63zsoP+EEodthVXOk+HEdQFnIoCD0FHxe6hU63xxLmrF+I
+D3LaDjwF+9DTA+EUFDU9
+=dB+F
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index 7f33de5..8c6040b 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20110426-1046Z"
EAPI="2"
# Build system
^ permalink raw reply related [flat|nested] 141+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-06-21 3:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-06-21 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 303deefe14eab2e8f8841b09ec075c640157cfa5
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 02:51:23 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 02:51:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=303deefe
[dev-db/mariadb-5.2.7] Make sure we disable the failing tests (fix the case match).
(Portage version: 2.2.0_alpha40/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/Manifest | 28 ++++++++++++++--------------
dev-db/mariadb/mariadb-5.2.7.ebuild | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 22f578c..4146fd6 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -20,23 +20,23 @@ EBUILD mariadb-5.1.55.ebuild 7643 RMD160 ec1c29f91b72556a6605d86eb44b9c71128b9c7
EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee3508589dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f066aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35
EBUILD mariadb-5.2.5.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
EBUILD mariadb-5.2.6.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe1613add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d1358ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c
-EBUILD mariadb-5.2.7.ebuild 5987 RMD160 43eb1d7c065ab7c3d0461b22508727209bc506c9 SHA1 054c92ef78ce286076d72d37b2172bc6a031c320 SHA256 6124f3be8c80df1adcf585ef04151a1b9c4bdda41e7fa55eb7fd86d06b27d526
+EBUILD mariadb-5.2.7.ebuild 5897 RMD160 c850094aac261a1d9c0f13c73f4cd3fa7cc4f9aa SHA1 54e8e8c8c84a8bceba6804824bdba92ed8c096b2 SHA256 91f5c3b699d7b5d73280daa582bf6ffe5127f52f9f5ec6158c763ed65cd7716e
MISC ChangeLog 2594 RMD160 e953d1e10cfac42f2520e771c319421ad9d8b45f SHA1 163dd69a438e51bf3fb9d2f7dc09066b0a995757 SHA256 101340b4c8378b175307929de8d454794b7cc3f601550a6aa1e5fe7c477649d9
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJN/N+SAAoJEC8ZTXQF1qEPNloP/A+9RRmmeZ+iisIQ98L9QyTn
-jfEPRl3U0Lencn/Pk49z7/vcEeqdqMMYTbiox/pu/+0jof03B3wLMRwORiTrh2U9
-gnkKlMiDblPeULL23lmDUbTdRzWh4QIMVZ5yKwxK5G9oRiWVPMCnzPkJvbdsweOV
-AfDFGjzlri1lEOY1EMZ3xvETD7psP+VAJTPkfMSCA+Qjoh/xpE91bT+WMPRjTav2
-smEa8Iw8Kr3o8WTRTSC9VWXOkglYtZtUkcABoxefLvkD3evOdy0+GHrUjPE2LhkW
-QMVyhDl5bvvD5QkHsjHDr+Pij3w4psBz71zoVG1pXVvTsW+LFg6kg2NOevHnRT6e
-MEvuK5mMVz87E1qBmzyr9y6Pbr9p0Ids3aEVANE4p3Ex6nLmK1h79/W33elWPCU3
-NDyTLYqe6ma5G83ETdon9riJocpkWMk2uMnX3KcaSVx0k8HEEEUUIZ35mmDHIb8e
-dfoZYyk5cY3bRsZ+ZQSKeHhKcJCyHNH1VWlBCeW9vhwE1Vt8p5XDrHusmsTi63eE
-Auo5xAVYs3LJ/y32JNv6tPAZqBTCg+zZ5RTFEDd1JNJscr4AGn6S5zJFkbMHgZAv
-Iso4p6gwTz85HBU+aGakQcA2t9e9fFmH2Ik5RS5gNWP95SAcGIwtc9nqRsN0HG0p
-w7j8cSSRA9BQUcfU04vX
-=wU+A
+iQIcBAEBCAAGBQJOAAcrAAoJEC8ZTXQF1qEPMN8P/RdTzSWA94esuqeX535dS2Et
+YNfz63MJwhRFKWBuqEKn3zfNpT6Uh88dzPII2O74JQZUqolIvF9HebK5SYfqyUce
+1xrlO2DFLXG6nwVe+baCCDS0kbDTN8qJP6fuUGlQpLzGFyf2TOBYajlA3jpF7Ret
+4PCplGv+Ymjgwzg5dHr94AYXFQZ0fawJXoy5rujm4PYHzS/ghGnbtFz21ekpsuyX
+Ycx8kat/O4b5w3RsAMRX+VrPEhvvOmsY/bmVF6JGEgTTxsYV16LGxpYhqthhBHVw
+di8l2cTXySQlMfkTPjDUenLtEQ/r/aD8tC9B1iBfmajTymyUUtjlBRDjfmSJur91
+bQcgMMYDeyo2lyvIvZ24TzPqroGhfJFmtOl+LAYih37nwIcUj02CAy28/6Yszh/U
+jOJ1i9b/QLRWtWyLKAZT1Ki2kSKqTiXIP+0yUS6cfpoNRBMr8s5/DIYEJFLwB3sr
+dK2UQYlruo0DrtUyf6oqE7LuL+W5usjiYwoFiK7Vr7D2wPgsqyQEdyQiJA0z24ON
+BefLufV6btkpkwzih0DMSGLvMNbPAzq4GF4fCl8hTOArXqexIWQx5ILxaf89my7i
+u45Mnp6S/cACrWdfBXEk6ohNwjH+F3Ya7nhD6+8Hg73WpqGrvL7oaA5QbyPHx4cO
+RBOuZ2+ybJqsq+Ejn6ih
+=GSkd
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
index 14a97e3..7f33de5 100644
--- a/dev-db/mariadb/mariadb-5.2.7.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
+# $Header: $
MY_EXTRAS_VER="live"
EAPI="2"
@@ -98,7 +98,7 @@ src_test() {
# Failure reason unknown at this time, must resolve before package.mask
# removal FIXME
case ${PV} in
- 5.1.*|5.4.*|5.5.*)
+ 5.1.*|5.2.*|5.4.*|5.5.*)
for t in main.mysql_client_test main.mysql_comments \
main.mysql_upgrade \
main.information_schema \
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-05-15 23:07 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-15 23:07 UTC (permalink / raw
To: gentoo-commits
commit: d113283c317c93d1a60f0f6bc10da884ca878458
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 14:58:36 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri May 13 14:58:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d113283c
Bumped mariadb to the 5.2.6 release.
Fixed the calls to the mysql-autotools functions in the ebuilds using the mysql-v2 eclass.
(Portage version: 2.2.0_alpha32/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mariadb/ChangeLog | 8 +++++
dev-db/mariadb/Manifest | 28 +++++++++++++++++--
dev-db/mariadb/mariadb-5.1.55.ebuild | 28 ++++++++++----------
dev-db/mariadb/mariadb-5.2.5.ebuild | 28 ++++++++++----------
.../{mariadb-5.2.5.ebuild => mariadb-5.2.6.ebuild} | 28 ++++++++++----------
5 files changed, 75 insertions(+), 45 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 67848fe..f8773b8 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.2.6 (13 May 2011)
+
+ 13 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mariadb-5.1.55.ebuild, mariadb-5.2.5.ebuild, +mariadb-5.2.6.ebuild:
+ Bumped mariadb to the 5.2.6 release.
+ Fixed the calls to the mysql-autotools functions in the ebuilds using the
+ mysql-v2 eclass.
+
28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mariadb-5.1.55.ebuild, mariadb-5.2.4.ebuild, mariadb-5.2.5.ebuild:
Review the build type support in the eclass / ebuilds.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 23b011b..c3ff6cb 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4
DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e236a3 SHA1 c6082203eea91a4efb95a11d06fccc4215a465a4 SHA256 f93dbf85ad03fe1928738e5552b8a7f911a0c3f2d644784a355a8f1b8fc2c29b
@@ -6,13 +9,32 @@ DIST mariadb-5.1.53.tar.gz 24658055 RMD160 ed019ab1d60c33f23339ecd1a4ffd9f8838d9
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.2.4.tar.gz 24964617 RMD160 86cd7ae572b2a53193231d500f419d4612874f3a SHA1 ddfb9373ce437ee7bffe680a7ce76d56edab1245 SHA256 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc
DIST mariadb-5.2.5.tar.gz 24925585 RMD160 520f1f3c238db171fdbe9bff5d5b59a063edca85 SHA1 9d58166f2ef258785beaa3645d378ea461bd63f0 SHA256 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1
+DIST mariadb-5.2.6.tar.gz 25086148 RMD160 878a4d92c004289bac608758875449713b06015b SHA1 618b3abda320b66497c589709caba3936c26433c SHA256 4cf77b7978328e54ce58a2a8c3380e38d8a0039fd2e29d5fa148adbb6b4134c0
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f3479ddd5f20dca1c7e3f09f026f7563 SHA1 bd961bd2496f834ad03fc1ba045d6e37b042568d SHA256 ca42b494a3506bffae6cab303b83902c92a751a3bbd656c6ff7aae3944fa3187
EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5
EBUILD mariadb-5.1.53.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
-EBUILD mariadb-5.1.55.ebuild 7511 RMD160 9e211ae15dcf52eddbe732a7e6489a8b59d7fe91 SHA1 42329f7704694852562661c181afc9d519f1cc02 SHA256 0c6d78f9931f146207929c2a27ca11125c1db5c969cc51170285f7fd48e731e2
+EBUILD mariadb-5.1.55.ebuild 7643 RMD160 ec1c29f91b72556a6605d86eb44b9c71128b9c7d SHA1 b2a68e6b355a17eff1096ae55a10e0fb45a211ac SHA256 b4f3a01897dc989b5386f1f42759c13748ecd42956382455d545358e06d5aed3
EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee3508589dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f066aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35
-EBUILD mariadb-5.2.5.ebuild 7474 RMD160 002af8980ff6b9e29f969c3173fd845eb08da518 SHA1 b3d098e11b82ea6f81feeab1c1e530553aee9e00 SHA256 26bf81d81fea930a240cb595c92aa8f6f217a0f55cf87a10d0b5a2e8809a65a1
-MISC ChangeLog 2292 RMD160 b90cb004809147812ad4c4ae4cc1b6e00a6bf264 SHA1 57a5b2a15b571b552bd62fa59969bf1db37b331d SHA256 e5af830f011d65a82004210b278a2656abd4546c1aa3b83c532f77ae38516788
+EBUILD mariadb-5.2.5.ebuild 7606 RMD160 b99d0b1de9c43c84391dec970ac0f0c844ad207b SHA1 d9539fc01e99cf4f0f4993d7268c73869522a1bd SHA256 a598006a56fddd87495aa6bf5241206f3136efc876689a3a9fcbdc86cec08c69
+EBUILD mariadb-5.2.6.ebuild 7606 RMD160 b99d0b1de9c43c84391dec970ac0f0c844ad207b SHA1 d9539fc01e99cf4f0f4993d7268c73869522a1bd SHA256 a598006a56fddd87495aa6bf5241206f3136efc876689a3a9fcbdc86cec08c69
+MISC ChangeLog 2594 RMD160 e953d1e10cfac42f2520e771c319421ad9d8b45f SHA1 163dd69a438e51bf3fb9d2f7dc09066b0a995757 SHA256 101340b4c8378b175307929de8d454794b7cc3f601550a6aa1e5fe7c477649d9
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNzUccAAoJEC8ZTXQF1qEPiDIP/A1S6pS7PronZyUXbfok/x5g
+/8yJBZH/1ZDP8BfH1k9h4hAB9CcVM10uDiRWdT5migzjGRwjjv3KBjMjZ2eXgAPF
+xwp2rcA+2D1FS4OYoS+lSQ3+JXNqCAITF0uwiESW8LPVTpyh9DxFMfSYHa+4dFkC
+6QaNquJGHRknBEGmASoXt1dGEOxgy3D8mqGoR+n1cZcIvXEV+betp+Eyx/1RrDSY
+H2PkA2t1nse0J7v2iWYMeoWFkff5NEDvOGNjoKA//W4qBd4nTAySRgcelCy09w17
+lYXoHNQXxATb3SRUbESiMf0ti0K3OPsSrViqXeXOvcfWFUwFKWBizy6Ou7twyVuh
+hd6Jk342saooE39RItfEBOuuWe7IEvYzP+KST4Nd4ACuHXF/B3B3SXRjFBSkI88/
+I7XT7EPLaK/4KZWxumqAFY9eaU9aBdp4LOgq4oLXbd4+UpjxE4cJ7wB7zOgCJIyz
+gK+FPVMR4rttK0EsYcac5etKragVPVZLHKLUPubzccaw+e2PR9z/KrmgjWZxiWF1
+yB5HK8WcxOOyqbapiAXwyDP044TWYdwV/1FN5RKS8g+S+SqI+AmRgkDqXj25TAnw
+8hNvvVKljQLLdh/xWMa4j0twUMCkO4D8dcxHqNBusaw6MrwoMU2ydveAppCu1dKA
+Yy+FxD5O5zvlHHMEac3K
+=aXhO
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index 1cb66ec..3f17a1b 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
MY_EXTRAS_VER="live"
-EAPI=2
+EAPI="2"
# Build system
BUILD="autotools"
@@ -28,7 +28,7 @@ src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
+ mysql-autotools_src_prepare
}
# Official test instructions:
@@ -62,12 +62,12 @@ src_test() {
# USE=extraengines case
case ${PV} in
5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+ mysql-autotools_disable_test "archive_gis" "Totally broken in 5.0.42"
;;
5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
[ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"archive_gis" \
"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
;;
@@ -77,7 +77,7 @@ src_test() {
# was fixed.
case ${PV} in
5.0.54|5.0.51*)
- mysql_disable_test \
+ mysql-autotools_disable_test \
"read_only" \
"Broken in 5.0.51-54, output in wrong order"
;;
@@ -85,14 +85,14 @@ src_test() {
# Ditto to read_only
[ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"view" \
"Broken in 5.0.51, output in wrong order"
# x86-specific, OOM issue with some subselects on low memory servers
[ "${PV}" == "5.0.54" ] && \
[ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"subselect" \
"Testcase needs tuning on x86 for oom condition"
@@ -100,7 +100,7 @@ src_test() {
[ "${PV}" == "5.0.56" ] && \
for t in openssl_1 rpl_openssl rpl_ssl ssl \
ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"$t" \
"OpenSSL tests broken on 5.0.56"
done
@@ -109,7 +109,7 @@ src_test() {
# Upstream bug 41066
# http://bugs.mysql.com/bug.php?id=41066
[ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"status2" \
"Broken in 5.0.72, new test is broken, upstream bug #41066"
@@ -132,7 +132,7 @@ src_test() {
5.0.*|5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
@@ -159,7 +159,7 @@ src_test() {
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
+ mysql-autotools_disable_test "$t" "False positives in Gentoo"
done
;;
esac
@@ -171,21 +171,21 @@ src_test() {
case ${PV} in
5.1.5*|5.4.*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
+ mysql-autotools_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
- || mysql_disable_test main.profiling \
+ || mysql-autotools_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
+ mysql-autotools_disable_test $t "ndb not supported in mariadb"
done
fi
diff --git a/dev-db/mariadb/mariadb-5.2.5.ebuild b/dev-db/mariadb/mariadb-5.2.5.ebuild
index f7189be..0232589 100644
--- a/dev-db/mariadb/mariadb-5.2.5.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.5.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
MY_EXTRAS_VER="live"
-EAPI=2
+EAPI="2"
# Build system
BUILD="autotools"
@@ -28,7 +28,7 @@ src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
+ mysql-autotools_src_prepare
}
# Official test instructions:
@@ -62,12 +62,12 @@ src_test() {
# USE=extraengines case
case ${PV} in
5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+ mysql-autotools_disable_test "archive_gis" "Totally broken in 5.0.42"
;;
5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
[ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"archive_gis" \
"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
;;
@@ -77,7 +77,7 @@ src_test() {
# was fixed.
case ${PV} in
5.0.54|5.0.51*)
- mysql_disable_test \
+ mysql-autotools_disable_test \
"read_only" \
"Broken in 5.0.51-54, output in wrong order"
;;
@@ -85,14 +85,14 @@ src_test() {
# Ditto to read_only
[ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"view" \
"Broken in 5.0.51, output in wrong order"
# x86-specific, OOM issue with some subselects on low memory servers
[ "${PV}" == "5.0.54" ] && \
[ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"subselect" \
"Testcase needs tuning on x86 for oom condition"
@@ -100,7 +100,7 @@ src_test() {
[ "${PV}" == "5.0.56" ] && \
for t in openssl_1 rpl_openssl rpl_ssl ssl \
ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"$t" \
"OpenSSL tests broken on 5.0.56"
done
@@ -109,7 +109,7 @@ src_test() {
# Upstream bug 41066
# http://bugs.mysql.com/bug.php?id=41066
[ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"status2" \
"Broken in 5.0.72, new test is broken, upstream bug #41066"
@@ -132,7 +132,7 @@ src_test() {
5.0.*|5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
@@ -159,7 +159,7 @@ src_test() {
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
+ mysql-autotools_disable_test "$t" "False positives in Gentoo"
done
;;
esac
@@ -171,21 +171,21 @@ src_test() {
case ${PV} in
5.1.5*|5.4.*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
+ mysql-autotools_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
- || mysql_disable_test main.profiling \
+ || mysql-autotools_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
+ mysql-autotools_disable_test $t "ndb not supported in mariadb"
done
fi
diff --git a/dev-db/mariadb/mariadb-5.2.5.ebuild b/dev-db/mariadb/mariadb-5.2.6.ebuild
similarity index 92%
copy from dev-db/mariadb/mariadb-5.2.5.ebuild
copy to dev-db/mariadb/mariadb-5.2.6.ebuild
index f7189be..0232589 100644
--- a/dev-db/mariadb/mariadb-5.2.5.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.6.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
MY_EXTRAS_VER="live"
-EAPI=2
+EAPI="2"
# Build system
BUILD="autotools"
@@ -28,7 +28,7 @@ src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
- mysql_src_prepare
+ mysql-autotools_src_prepare
}
# Official test instructions:
@@ -62,12 +62,12 @@ src_test() {
# USE=extraengines case
case ${PV} in
5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+ mysql-autotools_disable_test "archive_gis" "Totally broken in 5.0.42"
;;
5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
[ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"archive_gis" \
"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
;;
@@ -77,7 +77,7 @@ src_test() {
# was fixed.
case ${PV} in
5.0.54|5.0.51*)
- mysql_disable_test \
+ mysql-autotools_disable_test \
"read_only" \
"Broken in 5.0.51-54, output in wrong order"
;;
@@ -85,14 +85,14 @@ src_test() {
# Ditto to read_only
[ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"view" \
"Broken in 5.0.51, output in wrong order"
# x86-specific, OOM issue with some subselects on low memory servers
[ "${PV}" == "5.0.54" ] && \
[ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"subselect" \
"Testcase needs tuning on x86 for oom condition"
@@ -100,7 +100,7 @@ src_test() {
[ "${PV}" == "5.0.56" ] && \
for t in openssl_1 rpl_openssl rpl_ssl ssl \
ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"$t" \
"OpenSSL tests broken on 5.0.56"
done
@@ -109,7 +109,7 @@ src_test() {
# Upstream bug 41066
# http://bugs.mysql.com/bug.php?id=41066
[ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"status2" \
"Broken in 5.0.72, new test is broken, upstream bug #41066"
@@ -132,7 +132,7 @@ src_test() {
5.0.*|5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
+ mysql-autotools_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
@@ -159,7 +159,7 @@ src_test() {
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in Gentoo"
+ mysql-autotools_disable_test "$t" "False positives in Gentoo"
done
;;
esac
@@ -171,21 +171,21 @@ src_test() {
case ${PV} in
5.1.5*|5.4.*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
- mysql_disable_test "$t" \
+ mysql-autotools_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
- || mysql_disable_test main.profiling \
+ || mysql-autotools_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not supported in mariadb"
+ mysql-autotools_disable_test $t "ndb not supported in mariadb"
done
fi
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-03-27 1:58 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-27 1:58 UTC (permalink / raw
To: gentoo-commits
commit: c2dc1390d8a9155a5596aae3986cf1df158609c9
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 01:58:10 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 01:58:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c2dc1390
Bumped mariadb to the 5.2.5 release.
---
dev-db/mariadb/ChangeLog | 6 ++++++
dev-db/mariadb/Manifest | 6 +++---
.../{mariadb-5.2.3.ebuild => mariadb-5.2.5.ebuild} | 0
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 215c00b..24a7ae4 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.2.5 (27 Mar 2011)
+
+ 27 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ -mariadb-5.2.3.ebuild, +mariadb-5.2.5.ebuild:
+ Bumped mariadb to the 5.2.5 release.
+
*mariadb-5.1.55 (05 Mar 2011)
05 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b913890..6b23fa9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,15 +4,15 @@ DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e23
DIST mariadb-5.1.50.tar.gz 24567591 RMD160 d143e06ea847aab33922749d1e29548354df8f87 SHA1 0f314a6f396192b364d81feb7732ea2544153ffb SHA256 7d2a42374d05de28180985e8f4de98c2133ea1c7e39d8ccb9c12a4323704a5e7
DIST mariadb-5.1.53.tar.gz 24658055 RMD160 ed019ab1d60c33f23339ecd1a4ffd9f8838d9f8b SHA1 d7b2a931a754dea71d35bce6f0fde172dc8e5c9c SHA256 bfe4388b1fbfb463e35e7a7e7ade4e6f04c65bd2c27451effe5c4e55989c1be5
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
-DIST mariadb-5.2.3.tar.gz 24895365 RMD160 99fee13b31dc9013f0a28914378f1eff0fac7923 SHA1 f7ae656a020af1c2756d8e985836c557f45685d7 SHA256 2b07123ef1d3568d07443bec3f25b3b7b5935e77482437778f8805c0deda7bd0
DIST mariadb-5.2.4.tar.gz 24964617 RMD160 86cd7ae572b2a53193231d500f419d4612874f3a SHA1 ddfb9373ce437ee7bffe680a7ce76d56edab1245 SHA256 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc
+DIST mariadb-5.2.5.tar.gz 24925585 RMD160 520f1f3c238db171fdbe9bff5d5b59a063edca85 SHA1 9d58166f2ef258785beaa3645d378ea461bd63f0 SHA256 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f3479ddd5f20dca1c7e3f09f026f7563 SHA1 bd961bd2496f834ad03fc1ba045d6e37b042568d SHA256 ca42b494a3506bffae6cab303b83902c92a751a3bbd656c6ff7aae3944fa3187
EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5
EBUILD mariadb-5.1.53.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.1.55.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
-EBUILD mariadb-5.2.3.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
EBUILD mariadb-5.2.4.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
-MISC ChangeLog 1913 RMD160 abb48d65ee6e5c6656a5fc984f2af12229ef871f SHA1 e73cd221eef1cd8f9726b500f0ddcf8055ea7408 SHA256 695a491ad82527cc8ae41b3584f07048be74845a2be27db63cabcfdd588c6e28
+EBUILD mariadb-5.2.5.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
+MISC ChangeLog 2098 RMD160 4950fd1708ab16b346695a5bd55a8469fc56b2f2 SHA1 a0721f74e047dbb3cb1bc429fe536c7f13fb0ad4 SHA256 7ac20986bb3655c6cc42586b436a35f84676ff87567e33d39fda2d478691fae4
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
diff --git a/dev-db/mariadb/mariadb-5.2.3.ebuild b/dev-db/mariadb/mariadb-5.2.5.ebuild
similarity index 100%
rename from dev-db/mariadb/mariadb-5.2.3.ebuild
rename to dev-db/mariadb/mariadb-5.2.5.ebuild
^ permalink raw reply related [flat|nested] 141+ messages in thread* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
@ 2011-03-05 2:32 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 141+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-03-05 2:32 UTC (permalink / raw
To: gentoo-commits
commit: 9112ec230b8f20bab4f26f08086705c5e603013e
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 02:30:43 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 02:30:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9112ec23
Bumped mariadb to the 5.1.55 release.
Updated testing instructions for mariadb ebuilds.
---
dev-db/mariadb/ChangeLog | 11 ++++++++++-
dev-db/mariadb/Manifest | 16 +++++++++-------
dev-db/mariadb/mariadb-5.1.42-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.1.50-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.1.50.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.1.53.ebuild | 4 ++--
...{mariadb-5.2.4.ebuild => mariadb-5.1.55.ebuild} | 4 ++--
dev-db/mariadb/mariadb-5.2.3.ebuild | 4 ++--
dev-db/mariadb/mariadb-5.2.4.ebuild | 4 ++--
9 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 157b7d4..215c00b 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for dev-db/mariadb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mariadb-5.1.55 (05 Mar 2011)
+
+ 05 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ mariadb-5.1.42-r1.ebuild, mariadb-5.1.50.ebuild, mariadb-5.1.50-r1.ebuild,
+ mariadb-5.1.53.ebuild, +mariadb-5.1.55.ebuild, mariadb-5.2.3.ebuild,
+ mariadb-5.2.4.ebuild:
+ Bumped mariadb to the 5.1.55 release.
+ Updated testing instructions for mariadb ebuilds.
+
*mariadb-5.2.3 (29 Nov 2010)
29 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 559ed32..b913890 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,14 +3,16 @@ AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d
DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e236a3 SHA1 c6082203eea91a4efb95a11d06fccc4215a465a4 SHA256 f93dbf85ad03fe1928738e5552b8a7f911a0c3f2d644784a355a8f1b8fc2c29b
DIST mariadb-5.1.50.tar.gz 24567591 RMD160 d143e06ea847aab33922749d1e29548354df8f87 SHA1 0f314a6f396192b364d81feb7732ea2544153ffb SHA256 7d2a42374d05de28180985e8f4de98c2133ea1c7e39d8ccb9c12a4323704a5e7
DIST mariadb-5.1.53.tar.gz 24658055 RMD160 ed019ab1d60c33f23339ecd1a4ffd9f8838d9f8b SHA1 d7b2a931a754dea71d35bce6f0fde172dc8e5c9c SHA256 bfe4388b1fbfb463e35e7a7e7ade4e6f04c65bd2c27451effe5c4e55989c1be5
+DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.2.3.tar.gz 24895365 RMD160 99fee13b31dc9013f0a28914378f1eff0fac7923 SHA1 f7ae656a020af1c2756d8e985836c557f45685d7 SHA256 2b07123ef1d3568d07443bec3f25b3b7b5935e77482437778f8805c0deda7bd0
DIST mariadb-5.2.4.tar.gz 24964617 RMD160 86cd7ae572b2a53193231d500f419d4612874f3a SHA1 ddfb9373ce437ee7bffe680a7ce76d56edab1245 SHA256 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
-EBUILD mariadb-5.1.42-r1.ebuild 6921 RMD160 d7ff8a33eee45fbd74948aea9ff9b2c0480cd368 SHA1 affd7cbd325d1a5a9b4079d90666ea37e94e2950 SHA256 463e5efece60c9ef96bc3f8d1d6d1be0bc0355d928612cdb69b10fb95466d158
-EBUILD mariadb-5.1.50-r1.ebuild 7451 RMD160 3cb1fce7494793ee8cdfc63073ff24c83ea3b543 SHA1 57f43dce3a75f33ab9258fd0f650c720d7a4d62f SHA256 de0bccbe7d04f27f117c0c2f3455dd67986c51eb3b880ab6b8f4f71159411297
-EBUILD mariadb-5.1.50.ebuild 7461 RMD160 821f1aac659fb14591be29693250b9678e08cb14 SHA1 29250c62e43ccb6b630892fdeb2643ca75b940d1 SHA256 aec91d11afe71d5b8d1ddec767ca973cdceca7b4c09a482a8610d47fde859314
-EBUILD mariadb-5.1.53.ebuild 7451 RMD160 3cb1fce7494793ee8cdfc63073ff24c83ea3b543 SHA1 57f43dce3a75f33ab9258fd0f650c720d7a4d62f SHA256 de0bccbe7d04f27f117c0c2f3455dd67986c51eb3b880ab6b8f4f71159411297
-EBUILD mariadb-5.2.3.ebuild 7451 RMD160 3cb1fce7494793ee8cdfc63073ff24c83ea3b543 SHA1 57f43dce3a75f33ab9258fd0f650c720d7a4d62f SHA256 de0bccbe7d04f27f117c0c2f3455dd67986c51eb3b880ab6b8f4f71159411297
-EBUILD mariadb-5.2.4.ebuild 7451 RMD160 3cb1fce7494793ee8cdfc63073ff24c83ea3b543 SHA1 57f43dce3a75f33ab9258fd0f650c720d7a4d62f SHA256 de0bccbe7d04f27f117c0c2f3455dd67986c51eb3b880ab6b8f4f71159411297
-MISC ChangeLog 1550 RMD160 0296909ff7cb3dec88f6292515b29f7f6c5c1c7a SHA1 c9e2686bc37a355c9264c32b29fc5227a641c954 SHA256 4ce4994d50566dfe3f86c1f6ea372bb0de1d236da389879650f5576c6990f04e
+EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f3479ddd5f20dca1c7e3f09f026f7563 SHA1 bd961bd2496f834ad03fc1ba045d6e37b042568d SHA256 ca42b494a3506bffae6cab303b83902c92a751a3bbd656c6ff7aae3944fa3187
+EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
+EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5
+EBUILD mariadb-5.1.53.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
+EBUILD mariadb-5.1.55.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
+EBUILD mariadb-5.2.3.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
+EBUILD mariadb-5.2.4.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f
+MISC ChangeLog 1913 RMD160 abb48d65ee6e5c6656a5fc984f2af12229ef871f SHA1 e73cd221eef1cd8f9726b500f0ddcf8055ea7408 SHA256 695a491ad82527cc8ae41b3584f07048be74845a2be27db63cabcfdd588c6e28
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37
diff --git a/dev-db/mariadb/mariadb-5.1.42-r1.ebuild b/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
index 52d4618..e35a1fe 100644
--- a/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -25,7 +25,7 @@ RDEPEND="!media-sound/amarok[embedded]"
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
diff --git a/dev-db/mariadb/mariadb-5.1.50-r1.ebuild b/dev-db/mariadb/mariadb-5.1.50-r1.ebuild
index 70dfd8a..8103c94 100644
--- a/dev-db/mariadb/mariadb-5.1.50-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -30,7 +30,7 @@ src_prepare() {
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
diff --git a/dev-db/mariadb/mariadb-5.1.50.ebuild b/dev-db/mariadb/mariadb-5.1.50.ebuild
index 1e18c1d..65d9af2 100644
--- a/dev-db/mariadb/mariadb-5.1.50.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -30,7 +30,7 @@ src_prepare() {
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
diff --git a/dev-db/mariadb/mariadb-5.1.53.ebuild b/dev-db/mariadb/mariadb-5.1.53.ebuild
index 70dfd8a..8103c94 100644
--- a/dev-db/mariadb/mariadb-5.1.53.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -30,7 +30,7 @@ src_prepare() {
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
diff --git a/dev-db/mariadb/mariadb-5.2.4.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
similarity index 99%
copy from dev-db/mariadb/mariadb-5.2.4.ebuild
copy to dev-db/mariadb/mariadb-5.1.55.ebuild
index 70dfd8a..8103c94 100644
--- a/dev-db/mariadb/mariadb-5.2.4.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -30,7 +30,7 @@ src_prepare() {
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
diff --git a/dev-db/mariadb/mariadb-5.2.3.ebuild b/dev-db/mariadb/mariadb-5.2.3.ebuild
index 70dfd8a..8103c94 100644
--- a/dev-db/mariadb/mariadb-5.2.3.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -30,7 +30,7 @@ src_prepare() {
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
diff --git a/dev-db/mariadb/mariadb-5.2.4.ebuild b/dev-db/mariadb/mariadb-5.2.4.ebuild
index 70dfd8a..8103c94 100644
--- a/dev-db/mariadb/mariadb-5.2.4.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
@@ -30,7 +30,7 @@ src_prepare() {
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
+# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
^ permalink raw reply related [flat|nested] 141+ messages in thread
end of thread, other threads:[~2018-06-28 2:10 UTC | newest]
Thread overview: 141+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-22 17:05 [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2018-06-28 2:10 Brian Evans
2018-06-28 2:10 Brian Evans
2018-06-27 18:38 Brian Evans
2018-06-27 18:38 Brian Evans
2018-06-07 2:44 Brian Evans
2018-06-01 14:45 Brian Evans
2018-03-12 13:48 Brian Evans
2017-07-19 2:37 Brian Evans
2017-07-19 1:28 Brian Evans
2017-07-19 1:28 Brian Evans
2017-07-19 0:14 Brian Evans
2017-07-17 19:24 Brian Evans
2017-07-09 20:50 Brian Evans
2017-06-28 20:38 Brian Evans
2017-06-13 1:37 Brian Evans
2017-06-13 1:37 Brian Evans
2017-06-09 13:24 Brian Evans
2017-05-31 2:39 Brian Evans
2017-05-29 2:07 Brian Evans
2017-05-28 23:40 Brian Evans
2017-05-28 23:27 Brian Evans
2017-05-02 12:31 Brian Evans
2017-05-02 2:11 Brian Evans
2017-03-02 14:30 Brian Evans
2016-05-12 14:09 Brian Evans
2016-05-10 19:08 Brian Evans
2016-05-02 18:36 Brian Evans
2016-03-30 4:24 Brian Evans
2016-03-09 20:22 Brian Evans
2016-02-27 3:28 Brian Evans
2016-02-19 21:54 Brian Evans
2016-02-12 3:30 Brian Evans
2016-02-12 3:30 Brian Evans
2016-01-31 3:27 Brian Evans
2016-01-29 22:01 Brian Evans
2015-12-29 15:42 Brian Evans
2015-12-29 0:36 Brian Evans
2015-12-28 23:51 Brian Evans
2015-12-28 23:51 Brian Evans
2015-12-23 17:43 Brian Evans
2015-12-23 15:09 Brian Evans
2015-11-23 18:29 Brian Evans
2015-10-29 18:47 Brian Evans
2015-10-29 18:47 Brian Evans
2015-10-21 19:12 Brian Evans
2015-10-12 18:37 Brian Evans
2015-10-12 18:37 Brian Evans
2015-09-14 19:47 Brian Evans
2015-09-12 2:28 Brian Evans
2015-09-11 20:53 Brian Evans
2015-08-08 4:37 Brian Evans
2015-07-27 20:28 Brian Evans
2015-06-20 2:07 Brian Evans
2015-06-10 3:31 Brian Evans
2015-05-09 18:38 Brian Evans
2015-05-07 20:27 Brian Evans
2015-02-24 17:19 Brian Evans
2015-02-10 18:36 Brian Evans
2015-01-28 15:51 Brian Evans
2015-01-27 3:41 Brian Evans
2014-10-20 20:52 Brian Evans
2014-09-26 19:15 Brian Evans
2014-09-26 16:34 Brian Evans
2014-08-18 23:40 Brian Evans
2014-08-12 17:19 Brian Evans
2014-08-05 17:50 Brian Evans
2014-06-17 5:37 Brian Evans
2014-05-14 2:31 Brian Evans
2014-05-13 1:31 Brian Evans
2014-04-26 19:10 Brian Evans
2014-04-24 10:59 Jorge Manuel B. S. Vicetto
2014-04-17 17:24 Brian Evans
2014-03-31 15:27 Brian Evans
2014-02-25 18:05 Brian Evans
2014-02-25 14:23 Brian Evans
2014-02-25 14:05 Brian Evans
2014-02-10 18:45 Brian Evans
2014-02-06 18:12 Brian Evans
2014-02-05 16:29 Jorge Manuel B. S. Vicetto
2014-02-01 2:12 Jorge Manuel B. S. Vicetto
2014-01-30 3:01 Brian Evans
2013-11-22 13:39 Brian Evans
2013-11-19 16:24 Brian Evans
2013-11-19 15:19 Brian Evans
2013-10-10 20:03 Brian Evans
2013-09-20 22:29 Brian Evans
2013-09-18 20:27 Brian Evans
2013-08-29 18:04 Brian Evans
2013-07-19 12:36 Brian Evans
2013-06-12 19:10 Robin H. Johnson
2013-05-28 21:51 Robin H. Johnson
2013-04-25 19:22 Jorge Manuel B. S. Vicetto
2013-04-25 19:10 Jorge Manuel B. S. Vicetto
2013-04-25 0:43 Jorge Manuel B. S. Vicetto
2013-03-21 19:43 Robin H. Johnson
2013-03-16 19:19 Robin H. Johnson
2013-02-12 22:47 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2012-10-26 10:07 Jorge Manuel B. S. Vicetto
2012-10-25 2:58 Jorge Manuel B. S. Vicetto
2012-09-06 13:52 Jorge Manuel B. S. Vicetto
2012-09-05 15:23 Jorge Manuel B. S. Vicetto
2012-08-02 19:27 Robin H. Johnson
2012-08-02 19:27 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-26 4:51 Robin H. Johnson
2012-07-26 4:47 Robin H. Johnson
2012-05-22 12:09 Jorge Manuel B. S. Vicetto
2012-04-18 7:21 Robin H. Johnson
2012-04-16 20:39 Robin H. Johnson
2012-04-05 20:41 Robin H. Johnson
2012-01-12 19:17 Jorge Manuel B. S. Vicetto
2012-01-12 18:26 Jorge Manuel B. S. Vicetto
2011-10-26 19:45 Jorge Manuel B. S. Vicetto
2011-09-27 2:26 Jorge Manuel B. S. Vicetto
2011-09-22 3:04 Jorge Manuel B. S. Vicetto
2011-08-19 12:04 Jorge Manuel B. S. Vicetto
2011-08-19 12:04 Jorge Manuel B. S. Vicetto
2011-07-21 21:28 Jorge Manuel B. S. Vicetto
2011-07-14 4:17 Jorge Manuel B. S. Vicetto
2011-06-21 3:04 Jorge Manuel B. S. Vicetto
2011-06-21 3:04 Jorge Manuel B. S. Vicetto
2011-06-21 3:04 Jorge Manuel B. S. Vicetto
2011-05-15 23:07 Jorge Manuel B. S. Vicetto
2011-03-27 1:58 Jorge Manuel B. S. Vicetto
2011-03-05 2:32 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox