1 |
commit: 8b108c88fedad6ffd90d2328fdfc2840fcdd5f41 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 28 23:47:03 2015 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 23:47:03 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=8b108c88 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.1.10 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
12 |
|
13 |
dev-db/mariadb/ChangeLog | 5 + |
14 |
dev-db/mariadb/Manifest | 29 ++--- |
15 |
dev-db/mariadb/mariadb-10.1.10.ebuild | 200 ++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 220 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
19 |
index fb292c5..cbb99ba 100644 |
20 |
--- a/dev-db/mariadb/ChangeLog |
21 |
+++ b/dev-db/mariadb/ChangeLog |
22 |
@@ -2,6 +2,11 @@ |
23 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Id$ |
25 |
|
26 |
+*mariadb-10.1.10 (28 Dec 2015) |
27 |
+ |
28 |
+ 28 Dec 2015; Brian Evans <grknight@g.o> +mariadb-10.1.10.ebuild: |
29 |
+ dev-db/mariadb: Version bump for 10.1.10 |
30 |
+ |
31 |
*mariadb-5.5.47 (23 Dec 2015) |
32 |
|
33 |
23 Dec 2015; Brian Evans <grknight@g.o> +mariadb-5.5.47.ebuild, |
34 |
|
35 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
36 |
index 50ebed3..44ce222 100644 |
37 |
--- a/dev-db/mariadb/Manifest |
38 |
+++ b/dev-db/mariadb/Manifest |
39 |
@@ -4,6 +4,7 @@ Hash: SHA256 |
40 |
DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd |
41 |
DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d |
42 |
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e |
43 |
+DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 |
44 |
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37 |
45 |
DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5 |
46 |
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff |
47 |
@@ -20,19 +21,19 @@ DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb3895 |
48 |
-----BEGIN PGP SIGNATURE----- |
49 |
Version: GnuPG v2.1 |
50 |
|
51 |
-iQJ8BAEBCABmBQJWet1NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
52 |
+iQJ8BAEBCABmBQJWgcnzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
53 |
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
54 |
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2rycP+wSayVg0QEOnW/WoCgEXxaBB |
55 |
-bvIuW8uD6nKAnTmetBYUH96wnwXOWakEC4itOIyHIPqWC/tE4ARfmffpITOb0knl |
56 |
-vdhvPOoxj7XusfRxSyi7g5MQa8dIyUq4wLb4tYDQRTJ0djwv6+6w2ZCt4VLij8sn |
57 |
-M648R9XEiuiCNtshsDQdImvfS6wBzNoZYv+WvvVNXd2vnCJt3blyGvyZOPpOOKeY |
58 |
-ELTkTCE8fCGYxkEz4vrzLgO/ckZYFyG3SOF9l0PvXd8fbYuCjLi90ZnVyF0z80J1 |
59 |
-s7dLgBrEAQIbEUoQXE5XU7PEBdcudbO2/b9YRaWHNdqTsNP1gqim6pIVjG0T6Xe1 |
60 |
-M2/VGPGqvd9gvH51dWlvoXyGlWuoaUqbm4YZkEiIVk4/AooB2VDpFhhZDfEnBNXx |
61 |
-jQyAkaBPqX799q+nLERANA0/wBY9bDGx7tfxz6lhi2pqYAOjQOLlDvrOvRUYDyC9 |
62 |
-NAgLkVVt0bVqpYbrC2Edp2C/ecpgFXiccF56Z7WIPTmxfAVlC8Pna4cHMIUlrOpX |
63 |
-bpGcm0dBYtPYOwpbefmLHHAdH/cFLkgLalR+CWz1Z7fNW51a0AKf9gzFO263xRIv |
64 |
-VXD8wo3hJnJHoCCqMmcoA8YX1msR28rFZYG0WDWKLZRksnNI+Kx9cEVkjkw9UDV+ |
65 |
-ZJFK/S3Snc3oNUGmoYPz |
66 |
-=/xpc |
67 |
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2WYoP/ReopVJYCAJ4wZcesCz3hasZ |
68 |
+TseFoWQrBIGLrHWON1lK1NOsG2tzTDG1e6cLuymNRnSCTkEahs77yvLFYpN/OErx |
69 |
+59QDAxO3Hlbh+BARDDOmhKOArNs/glWuqY/1kVPsGEYwb3OriOvr6coWwuiuDP11 |
70 |
+Ze3Xk74s6hAMYfsutlJh6LJ9Zuuu0wIiyV4NQOCkTrCc2HshId82j3OxbZv4CHMq |
71 |
++xk/MbJs55rz4kOcr4ID0BTN8npjRs1IlDMTFtReIJa+igPijAkPoshNu9MFUR8w |
72 |
+SPYKWLooUYwZa6RG7QriDLwD8Fjjvm0uBblzhAjmC/a9KC50HZQbR7CZljbs3vO7 |
73 |
+Lnb0dIaqA4npBpf8RlBqTz6XI1RRCJReU0zg6DEsBv4rUMIlDxi8k+iPQgLfsHql |
74 |
+nZ0pAwFfpo/YTs68eBWdaXyBoTS0aWAeeIBz8q31LrXska/IMzkaMSs96Cs/WzMB |
75 |
+UzP0D7/r9/o9IW6jmzUPwnj1gFESud/qDcl22M5l06Rp8GNTO97SrYHzuWplIUTi |
76 |
+Z4xP8GNf+5my1Pvz3fIZcGjpm6NiijtPqnkBV0CeWnVJ780JJ5mhCZiWDErf8HJt |
77 |
+1izpXC88xviQVFqP68Rrk1PyQRCW4jIX7tF+u9SjRrrYCxOc+6proAM//Zmf1nB1 |
78 |
+YNHZvptBLP/A2FVm/dMQ |
79 |
+=cjEt |
80 |
-----END PGP SIGNATURE----- |
81 |
|
82 |
diff --git a/dev-db/mariadb/mariadb-10.1.10.ebuild b/dev-db/mariadb/mariadb-10.1.10.ebuild |
83 |
new file mode 100644 |
84 |
index 0000000..dad8418 |
85 |
--- /dev/null |
86 |
+++ b/dev-db/mariadb/mariadb-10.1.10.ebuild |
87 |
@@ -0,0 +1,200 @@ |
88 |
+# Copyright 1999-2015 Gentoo Foundation |
89 |
+# Distributed under the terms of the GNU General Public License v2 |
90 |
+# $Id$ |
91 |
+ |
92 |
+EAPI="5" |
93 |
+MY_EXTRAS_VER="20151223-1501Z" |
94 |
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
95 |
+WSREP_REVISION="25" |
96 |
+SUBSLOT="18" |
97 |
+MYSQL_PV_MAJOR="5.6" |
98 |
+ |
99 |
+inherit toolchain-funcs mysql-multilib-r1 |
100 |
+ |
101 |
+HOMEPAGE="http://mariadb.org/" |
102 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
103 |
+ |
104 |
+IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
105 |
+RESTRICT="!bindist? ( bindist )" |
106 |
+ |
107 |
+REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )" |
108 |
+ |
109 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
110 |
+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" |
111 |
+ |
112 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
113 |
+#EPATCH_EXCLUDE='' |
114 |
+ |
115 |
+COMMON_DEPEND=" |
116 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
117 |
+ systemd? ( sys-apps/systemd:= ) |
118 |
+ !bindist? ( >=sys-libs/readline-4.1:0= ) |
119 |
+ server? ( |
120 |
+ cracklib? ( sys-libs/cracklib:0= ) |
121 |
+ extraengine? ( |
122 |
+ odbc? ( dev-db/unixODBC:0= ) |
123 |
+ xml? ( dev-libs/libxml2:2= ) |
124 |
+ ) |
125 |
+ innodb-lz4? ( app-arch/lz4 ) |
126 |
+ innodb-lzo? ( dev-libs/lzo ) |
127 |
+ innodb-snappy? ( app-arch/snappy ) |
128 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
129 |
+ pam? ( virtual/pam:0= ) |
130 |
+ ) |
131 |
+ >=dev-libs/libpcre-8.35:3= |
132 |
+" |
133 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
134 |
+ ${COMMON_DEPEND}" |
135 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
136 |
+ galera? ( |
137 |
+ sys-apps/iproute2 |
138 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
139 |
+ sst-rsync? ( sys-process/lsof ) |
140 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
141 |
+ ) |
142 |
+ perl? ( !dev-db/mytop |
143 |
+ virtual/perl-Getopt-Long |
144 |
+ dev-perl/TermReadKey |
145 |
+ virtual/perl-Term-ANSIColor |
146 |
+ virtual/perl-Time-HiRes ) |
147 |
+" |
148 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
149 |
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
150 |
+ |
151 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
152 |
+ |
153 |
+src_configure(){ |
154 |
+ # bug 508724 mariadb cannot use ld.gold |
155 |
+ tc-ld-disable-gold |
156 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
157 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
158 |
+ -DWITH_PCRE=system |
159 |
+ ) |
160 |
+ if use server ; then |
161 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
162 |
+ if ! use extraengine ; then |
163 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
164 |
+ -DPLUGIN_FEDERATED=NO |
165 |
+ -DPLUGIN_FEDERATEDX=NO ) |
166 |
+ fi |
167 |
+ |
168 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
169 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
170 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
171 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
172 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
173 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
174 |
+ -DPLUGIN_CASSANDRA=NO |
175 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
176 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
177 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
178 |
+ -DCONNECT_WITH_MYSQL=1 |
179 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
180 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
181 |
+ -DWITH_WSREP=$(usex galera) |
182 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
183 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo) |
184 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
185 |
+ ) |
186 |
+ |
187 |
+ use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 ) |
188 |
+ fi |
189 |
+ mysql-multilib-r1_src_configure |
190 |
+} |
191 |
+ |
192 |
+# Official test instructions: |
193 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
194 |
+# FEATURES='test userpriv -usersandbox' \ |
195 |
+# ebuild mariadb-X.X.XX.ebuild \ |
196 |
+# digest clean package |
197 |
+multilib_src_test() { |
198 |
+ |
199 |
+ if ! multilib_is_native_abi ; then |
200 |
+ einfo "Server tests not available on non-native abi". |
201 |
+ return 0; |
202 |
+ fi |
203 |
+ |
204 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
205 |
+ local retstatus_unit |
206 |
+ local retstatus_tests |
207 |
+ |
208 |
+ if use server ; then |
209 |
+ |
210 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
211 |
+ # localhost. Also causes weird failures. |
212 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
213 |
+ |
214 |
+ if [[ $UID -eq 0 ]]; then |
215 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
216 |
+ fi |
217 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
218 |
+ |
219 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
220 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
221 |
+ |
222 |
+ # Run CTest (test-units) |
223 |
+ cmake-utils_src_test |
224 |
+ retstatus_unit=$? |
225 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
226 |
+ |
227 |
+ # Ensure that parallel runs don't die |
228 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
229 |
+ # Enable parallel testing, auto will try to detect number of cores |
230 |
+ # You may set this by hand. |
231 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
232 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
233 |
+ |
234 |
+ # create directories because mysqladmin might run out of order |
235 |
+ mkdir -p "${T}"/var-tests{,/log} |
236 |
+ |
237 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
238 |
+ # false positives: |
239 |
+ # |
240 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
241 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
242 |
+ # funcs_1.is_columns_mysql main.bootstrap |
243 |
+ # fails due to USE=-latin1 / utf8 default |
244 |
+ # |
245 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
246 |
+ # main.mysql_client_test_comp: |
247 |
+ # segfaults at random under Portage only, suspect resource limits. |
248 |
+ # |
249 |
+ # plugins.cracklib_password_check |
250 |
+ # Can randomly fail due to cracklib return message |
251 |
+ |
252 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
253 |
+ main.mysql_client_test_comp main.bootstrap \ |
254 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
255 |
+ main.mysqld--help plugins.cracklib_password_check \ |
256 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
257 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
258 |
+ done |
259 |
+ |
260 |
+ # Run mysql tests |
261 |
+ pushd "${TESTDIR}" || die |
262 |
+ |
263 |
+ # run mysql-test tests |
264 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
265 |
+ |
266 |
+ retstatus_tests=$? |
267 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
268 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
269 |
+ |
270 |
+ popd || die |
271 |
+ |
272 |
+ # Cleanup is important for these testcases. |
273 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
274 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
275 |
+ |
276 |
+ failures="" |
277 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
278 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
279 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
280 |
+ |
281 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
282 |
+ einfo "Tests successfully completed" |
283 |
+ |
284 |
+ else |
285 |
+ einfo "Skipping server tests due to minimal build." |
286 |
+ fi |
287 |
+} |