Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
Date: Sat, 27 Feb 2016 03:28:34
Message-Id: 1456543700.d86aa2d3812795731168fdbe4a17341af44cc0f3.grknight@gentoo
1 commit: d86aa2d3812795731168fdbe4a17341af44cc0f3
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 03:28:20 2016 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 03:28:20 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=d86aa2d3
7
8 dev-db/mariadb: Version bump 10.1.12; first to use new EAPI6
9
10 Package-Manager: portage-2.2.27
11 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
12
13 dev-db/mariadb/ChangeLog | 5 +
14 dev-db/mariadb/Manifest | 27 ++---
15 dev-db/mariadb/mariadb-10.1.12.ebuild | 211 ++++++++++++++++++++++++++++++++++
16 3 files changed, 227 insertions(+), 16 deletions(-)
17
18 diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
19 index 002c959..f76ec81 100644
20 --- a/dev-db/mariadb/ChangeLog
21 +++ b/dev-db/mariadb/ChangeLog
22 @@ -2,6 +2,11 @@
23 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
24 # $Id$
25
26 +*mariadb-10.1.12 (27 Feb 2016)
27 +
28 + 27 Feb 2016; Brian Evans <grknight@g.o> +mariadb-10.1.12.ebuild:
29 + dev-db/mariadb: Version bump 10.1.12; first to use new EAPI6
30 +
31 *mariadb-10.0.24 (19 Feb 2016)
32
33 19 Feb 2016; Brian Evans <grknight@g.o> +mariadb-10.0.24.ebuild,
34
35 diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
36 index 0baf41d..a37c638 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.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
41 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
42 DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
43 +DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
44 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
45 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
46 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
47 @@ -13,21 +14,15 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
48 DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
49 DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
50 -----BEGIN PGP SIGNATURE-----
51 -Version: GnuPG v2.1
52 +Version: GnuPG v2.0
53
54 -iQJ8BAEBCABmBQJWx48cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
55 -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
56 -MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RvoP/2r6LoBvP6Ezpw5q5VM2kjXO
57 -KgaDXPRiBK1niwSAF9+mEIcHao+0z6y1wKInYqp+h7vgOgdpc5DBHIjI9VZH1XDP
58 -7WoTa+iaH0WXFGpzwhdLJmt9bXj7AeQNoy4nMf5FppiEoKnlsSG4kGR6AsLJdrb5
59 -wzZiIgr85d6SYv15G/XqK8e8+wBbOorR23wYIOy306HrHR/v1F8Eg6urbQ9x7MFu
60 -fpYedQCdXQvSMrb9BxUk47Ns6XEVoxpASwUzFMoOaeFHxbxrUeyAeGc6Iy90Y7wp
61 -HztTsn2+WYRJz1hHHvRWSo3M0yQVOAlUwuJIdNS3FT7T/nQ7chPqxm2K1fluVLFg
62 -lPTzZJ5q3Z60iLURReYpM+2YIdPWLzmVrjTGoJeuqITtIfAUwLFMVx3fIsRtn/7l
63 -ADFN9177ZEOswz6+YzedSsWNqWtzP+zxFgEK9RF/tGyAxmNDKRtH/29eXQ0crqtd
64 -y5Rp1Kaqjs5C5oXCq51hrrIZ72Ana85qzhz8vuCC9q7lHId1E420AP+AVjOA7le5
65 -aLqG4RiQyTxO+KZG3zoNoK6Pv8EL6ZE8DEh0y23wGGKRqhL6lJ/P6Fmt+vfoHa9L
66 -q3OeCZbcVG4g9wAyiLr58TweLVxQDK7kNJ+Mrd74hkqOk6HbmvhxI1ZkUIt9Qqhs
67 -sl716n0CU4rvKHYO9UoT
68 -=r/dt
69 +iQF8BAEBCABmBQJW0RfUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
70 +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
71 +RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d9/wH/1eKMOkl1uXzmxIM4cno3Dlk
72 +jlBzF3Y5nTcEdGDNdJzqg9mxBo9nyKIk3u2MYSA15f3ZPUGRkZP9c1b46IQaKUWm
73 +zwByawY1zbMFWJoPM0CWzvBu524EEhgIPm5qA3IApuN/wj+YkSd8A2Kh9BxM4boI
74 +i3TbCogpxS6QHRIcaA9eyxyFYYm0g1ZG2gBSgT5qyOfTaADGlu6xG69yPswvXXPE
75 +8zDlvCgf+8oiSIRQL32ppBg/ebFbcSfFU1wI5y65fK/TIKWsHG8zczRPIDjuQqFT
76 +TVMYAENVjw1Z2ZXdxJUutg5O08xDsEAaV89GmdSzdcDudb0latHp+xWrnVq9bII=
77 +=kz8S
78 -----END PGP SIGNATURE-----
79
80 diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
81 new file mode 100644
82 index 0000000..d911253
83 --- /dev/null
84 +++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
85 @@ -0,0 +1,211 @@
86 +# Copyright 1999-2016 Gentoo Foundation
87 +# Distributed under the terms of the GNU General Public License v2
88 +# $Id$
89 +
90 +EAPI="6"
91 +MY_EXTRAS_VER="20160131-0252Z"
92 +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
93 +WSREP_REVISION="25"
94 +SUBSLOT="18"
95 +MYSQL_PV_MAJOR="5.6"
96 +
97 +inherit toolchain-funcs mysql-multilib-r1
98 +
99 +HOMEPAGE="http://mariadb.org/"
100 +DESCRIPTION="An enhanced, drop-in replacement for MySQL"
101 +
102 +IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
103 +RESTRICT="!bindist? ( bindist )"
104 +
105 +REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
106 +
107 +# REMEMBER: also update eclass/mysql*.eclass before committing!
108 +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"
109 +
110 +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
111 +
112 +PATCHES=(
113 + "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
114 + "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
115 + "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
116 + "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
117 + "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch
118 +)
119 +
120 +COMMON_DEPEND="
121 + mroonga? ( app-text/groonga-normalizer-mysql )
122 + kerberos? ( virtual/krb5 )
123 + systemd? ( sys-apps/systemd:= )
124 + !bindist? ( >=sys-libs/readline-4.1:0= )
125 + server? (
126 + cracklib? ( sys-libs/cracklib:0= )
127 + extraengine? (
128 + odbc? ( dev-db/unixODBC:0= )
129 + xml? ( dev-libs/libxml2:2= )
130 + )
131 + innodb-lz4? ( app-arch/lz4 )
132 + innodb-lzo? ( dev-libs/lzo )
133 + innodb-snappy? ( app-arch/snappy )
134 + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
135 + pam? ( virtual/pam:0= )
136 + tokudb? ( app-arch/snappy )
137 + )
138 + >=dev-libs/libpcre-8.35:3=
139 +"
140 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
141 + ${COMMON_DEPEND}"
142 +RDEPEND="${RDEPEND} ${COMMON_DEPEND}
143 + galera? (
144 + sys-apps/iproute2
145 + =sys-cluster/galera-${WSREP_REVISION}*
146 + sst-rsync? ( sys-process/lsof )
147 + sst-xtrabackup? ( net-misc/socat[ssl] )
148 + )
149 + perl? ( !dev-db/mytop
150 + virtual/perl-Getopt-Long
151 + dev-perl/TermReadKey
152 + virtual/perl-Term-ANSIColor
153 + virtual/perl-Time-HiRes )
154 +"
155 +# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
156 +PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
157 +
158 +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
159 +
160 +src_configure(){
161 + # bug 508724 mariadb cannot use ld.gold
162 + tc-ld-disable-gold
163 +
164 + local MYSQL_CMAKE_NATIVE_DEFINES=(
165 + -DWITH_JEMALLOC=$(usex jemalloc system)
166 + -DWITH_PCRE=system
167 + -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
168 + )
169 + if use server ; then
170 + # Federated{,X} must be treated special otherwise they will not be built as plugins
171 + if ! use extraengine ; then
172 + MYSQL_CMAKE_NATIVE_DEFINES+=(
173 + -DPLUGIN_FEDERATED=NO
174 + -DPLUGIN_FEDERATEDX=NO )
175 + fi
176 +
177 + MYSQL_CMAKE_NATIVE_DEFINES+=(
178 + -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
179 + -DPLUGIN_SPHINX=$(usex sphinx YES NO)
180 + -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
181 + -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
182 + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
183 + -DPLUGIN_CASSANDRA=NO
184 + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
185 + -DPLUGIN_SPIDER=$(usex extraengine YES NO)
186 + -DPLUGIN_CONNECT=$(usex extraengine YES NO)
187 + -DCONNECT_WITH_MYSQL=1
188 + -DCONNECT_WITH_LIBXML2=$(usex xml)
189 + -DCONNECT_WITH_ODBC=$(usex odbc)
190 + -DWITH_WSREP=$(usex galera)
191 + -DWITH_INNODB_LZ4=$(usex innodb-lz4)
192 + -DWITH_INNODB_LZO=$(usex innodb-lzo)
193 + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
194 + -DPLUGIN_MROONGA=$(usex mroonga YES NO)
195 + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
196 + )
197 + fi
198 + mysql-multilib-r1_src_configure
199 +}
200 +
201 +# Official test instructions:
202 +# USE='embedded extraengine perl server openssl static-libs' \
203 +# FEATURES='test userpriv -usersandbox' \
204 +# ebuild mariadb-X.X.XX.ebuild \
205 +# digest clean package
206 +multilib_src_test() {
207 +
208 + if ! multilib_is_native_abi ; then
209 + einfo "Server tests not available on non-native abi".
210 + return 0;
211 + fi
212 +
213 + local TESTDIR="${BUILD_DIR}/mysql-test"
214 + local retstatus_unit
215 + local retstatus_tests
216 +
217 + if use server ; then
218 +
219 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
220 + # localhost. Also causes weird failures.
221 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
222 +
223 + if [[ $UID -eq 0 ]]; then
224 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
225 + fi
226 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
227 +
228 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
229 + addpredict /this-dir-does-not-exist/t9.MYI
230 +
231 + # Run CTest (test-units)
232 + cmake-utils_src_test
233 + retstatus_unit=$?
234 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
235 +
236 + # Ensure that parallel runs don't die
237 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
238 + # Enable parallel testing, auto will try to detect number of cores
239 + # You may set this by hand.
240 + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
241 + export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
242 +
243 + # create directories because mysqladmin might run out of order
244 + mkdir -p "${T}"/var-tests{,/log}
245 +
246 + # These are failing in MariaDB 10.0 for now and are believed to be
247 + # false positives:
248 + #
249 + # main.information_schema, binlog.binlog_statement_insert_delayed,
250 + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
251 + # funcs_1.is_columns_mysql main.bootstrap
252 + # fails due to USE=-latin1 / utf8 default
253 + #
254 + # main.mysql_client_test, main.mysql_client_test_nonblock
255 + # main.mysql_client_test_comp:
256 + # segfaults at random under Portage only, suspect resource limits.
257 + #
258 + # plugins.cracklib_password_check
259 + # Can randomly fail due to cracklib return message
260 +
261 + for t in main.mysql_client_test main.mysql_client_test_nonblock \
262 + main.mysql_client_test_comp main.bootstrap \
263 + binlog.binlog_statement_insert_delayed main.information_schema \
264 + main.mysqld--help plugins.cracklib_password_check \
265 + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
266 + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
267 + done
268 +
269 + # Run mysql tests
270 + pushd "${TESTDIR}" || die
271 +
272 + # run mysql-test tests
273 + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
274 +
275 + retstatus_tests=$?
276 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
277 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
278 +
279 + popd || die
280 +
281 + # Cleanup is important for these testcases.
282 + pkill -9 -f "${S}/ndb" 2>/dev/null
283 + pkill -9 -f "${S}/sql" 2>/dev/null
284 +
285 + failures=""
286 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
287 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
288 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
289 +
290 + [[ -z "$failures" ]] || die "Test failures: $failures"
291 + einfo "Tests successfully completed"
292 +
293 + else
294 + einfo "Skipping server tests due to minimal build."
295 + fi
296 +}