1 |
commit: 647e1016b9c4636e3f31bb69a0d5a07f78dd5691 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 23 18:28:21 2015 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 23 18:28:21 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=647e1016 |
7 |
|
8 |
dev-db/mariadb: Version bump to 10.1.9 |
9 |
|
10 |
One test failure on missing warnings: innodb.innodb_uninstall |
11 |
Reported upstream: https://mariadb.atlassian.net/browse/MDEV-9171 |
12 |
|
13 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
14 |
|
15 |
dev-db/mariadb/Manifest | 24 +------ |
16 |
dev-db/mariadb/mariadb-10.1.9.ebuild | 128 +++++++++++++++++++++++++++++++++++ |
17 |
2 files changed, 130 insertions(+), 22 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
20 |
index 423d07c..00b6fd3 100644 |
21 |
--- a/dev-db/mariadb/Manifest |
22 |
+++ b/dev-db/mariadb/Manifest |
23 |
@@ -1,9 +1,7 @@ |
24 |
------BEGIN PGP SIGNED MESSAGE----- |
25 |
-Hash: SHA256 |
26 |
- |
27 |
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd |
28 |
DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d |
29 |
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37 |
30 |
+DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5 |
31 |
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff |
32 |
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 |
33 |
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 |
34 |
@@ -13,22 +11,4 @@ DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6d |
35 |
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa |
36 |
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22 |
37 |
DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777 WHIRLPOOL a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca |
38 |
------BEGIN PGP SIGNATURE----- |
39 |
-Version: GnuPG v2.1 |
40 |
- |
41 |
-iQJ8BAEBCABmBQJWMmmlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
42 |
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
43 |
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RJEQAIGO63ovUeNECFCSnv4EiPXX |
44 |
-kZE4C1H9I6mxE2Ig9VCi/b2vINoGesGuGQgO/CTq7oP63itkkchehSoZJ4O2hw6v |
45 |
-eivRQlFqDgJ5DzywefnFtaWXlKu33nRiyzT11FeWMvb1htHN1y9GSnHU2KoyeMqC |
46 |
-ZYAdGWJfuWduQa8JBVR973/RK1HbtEufd79y5a+CZZvEeeRXzKu6s9xZxXZUmJGG |
47 |
-SEgBcPp7u8c+A+SWkoaY4Fta4kv47wMnIIGGmV0JuNU508rzySmCnEzC7Zfq+fKi |
48 |
-rbcbmcje4T85YQLKGSATGB1znUIpw187+EuY1+V/1pXyp4mK4EbcX1DdOub71zMq |
49 |
-X6ZaqZZsok1S+6HsN5aXmkIA8r1/U6qbkP9z7zvkC9pf9R5Zdg+sJRnawwMhFBBu |
50 |
-ex7e24aj7qnfZwYhC2aSTE4CuqRWpt5OVioAEUKqbcjAh9AaSbbHs/hgRrbLHuXs |
51 |
-jpRqc4CWe/ZABeQhkProhI4DSlOCLDFvefDSFnpiWhKVNZ+jgOnJJ2dnmvSgz4UX |
52 |
-roJEBIfi7xn8/smoPUw4S3F035L8JpHde8yZQsAsUs5mf3YiT2bFpD/MKMEWv2EX |
53 |
-jKPGEmTy69mbfIf/5OrsHvgDX79sL76yO9D6NbWihxMqrgmBoHgF/wEId/KojFEm |
54 |
-Aban1Iu2jPY2rLyAGayA |
55 |
-=s7Eq |
56 |
------END PGP SIGNATURE----- |
57 |
+DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de |
58 |
|
59 |
diff --git a/dev-db/mariadb/mariadb-10.1.9.ebuild b/dev-db/mariadb/mariadb-10.1.9.ebuild |
60 |
new file mode 100644 |
61 |
index 0000000..e4562b0 |
62 |
--- /dev/null |
63 |
+++ b/dev-db/mariadb/mariadb-10.1.9.ebuild |
64 |
@@ -0,0 +1,128 @@ |
65 |
+# Copyright 1999-2015 Gentoo Foundation |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+# $Id$ |
68 |
+ |
69 |
+EAPI="5" |
70 |
+MY_EXTRAS_VER="20151123-1643Z" |
71 |
+WSREP_REVISION="25" |
72 |
+SUBSLOT="18" |
73 |
+HAS_TOOLS_PATCH="yes" |
74 |
+ |
75 |
+inherit toolchain-funcs mysql-multilib |
76 |
+# only to make repoman happy. it is really set in the eclass |
77 |
+IUSE="$IUSE mroonga systemd" |
78 |
+ |
79 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
80 |
+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" |
81 |
+ |
82 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
83 |
+#EPATCH_EXCLUDE='' |
84 |
+ |
85 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
86 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
87 |
+ systemd? ( sys-apps/systemd:= )" |
88 |
+RDEPEND="${RDEPEND}" |
89 |
+ |
90 |
+# Official test instructions: |
91 |
+# USE='client-libs embedded extraengine perl server openssl static-libs tools' \ |
92 |
+# FEATURES='test userpriv -usersandbox' \ |
93 |
+# ebuild mariadb-X.X.XX.ebuild \ |
94 |
+# digest clean package |
95 |
+multilib_src_test() { |
96 |
+ |
97 |
+ if ! multilib_is_native_abi ; then |
98 |
+ einfo "Server tests not available on non-native abi". |
99 |
+ return 0; |
100 |
+ fi |
101 |
+ |
102 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
103 |
+ local retstatus_unit |
104 |
+ local retstatus_tests |
105 |
+ |
106 |
+ if use server ; then |
107 |
+ |
108 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
109 |
+ # localhost. Also causes weird failures. |
110 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
111 |
+ |
112 |
+ if [[ $UID -eq 0 ]]; then |
113 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
114 |
+ fi |
115 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
116 |
+ |
117 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
118 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
119 |
+ |
120 |
+ # Run CTest (test-units) |
121 |
+ cmake-utils_src_test |
122 |
+ retstatus_unit=$? |
123 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
124 |
+ |
125 |
+ # Create a symlink to provided binaries so the tests can find them when client-libs is off |
126 |
+ if ! use client-libs ; then |
127 |
+ ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die |
128 |
+ ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die |
129 |
+ mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" |
130 |
+ fi |
131 |
+ |
132 |
+ # Ensure that parallel runs don't die |
133 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
134 |
+ # Enable parallel testing, auto will try to detect number of cores |
135 |
+ # You may set this by hand. |
136 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
137 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
138 |
+ |
139 |
+ # create directories because mysqladmin might run out of order |
140 |
+ mkdir -p "${T}"/var-tests{,/log} |
141 |
+ |
142 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
143 |
+ # false positives: |
144 |
+ # |
145 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
146 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
147 |
+ # funcs_1.is_columns_mysql main.bootstrap |
148 |
+ # fails due to USE=-latin1 / utf8 default |
149 |
+ # |
150 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
151 |
+ # main.mysql_client_test_comp: |
152 |
+ # segfaults at random under Portage only, suspect resource limits. |
153 |
+ # |
154 |
+ # plugins.cracklib_password_check |
155 |
+ # Can randomly fail due to cracklib return message |
156 |
+ |
157 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
158 |
+ main.mysql_client_test_comp main.bootstrap \ |
159 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
160 |
+ main.mysqld--help plugins.cracklib_password_check \ |
161 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
162 |
+ mysql-multilib_disable_test "$t" "False positives in Gentoo" |
163 |
+ done |
164 |
+ |
165 |
+ # Run mysql tests |
166 |
+ pushd "${TESTDIR}" |
167 |
+ |
168 |
+ # run mysql-test tests |
169 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
170 |
+ |
171 |
+ retstatus_tests=$? |
172 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
173 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
174 |
+ |
175 |
+ popd |
176 |
+ |
177 |
+ # Cleanup is important for these testcases. |
178 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
179 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
180 |
+ |
181 |
+ failures="" |
182 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
183 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
184 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
185 |
+ |
186 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
187 |
+ einfo "Tests successfully completed" |
188 |
+ |
189 |
+ else |
190 |
+ einfo "Skipping server tests due to minimal build." |
191 |
+ fi |
192 |
+} |