Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date: Sun, 31 Jan 2016 03:29:10
Message-Id: 1454210936.e943347938af7f4db7369fe0fa5f2858a9095064.grknight@gentoo
1 commit: e943347938af7f4db7369fe0fa5f2858a9095064
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 31 03:28:56 2016 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 03:28:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9433479
7
8 dev-db/mariadb: Version bump to 10.1.11
9
10 Package-Manager: portage-2.2.27
11
12 dev-db/mariadb/Manifest | 2 +
13 dev-db/mariadb/mariadb-10.1.11.ebuild | 204 ++++++++++++++++++++++++++++++++++
14 2 files changed, 206 insertions(+)
15
16 diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
17 index de7ce47..0a32ac0 100644
18 --- a/dev-db/mariadb/Manifest
19 +++ b/dev-db/mariadb/Manifest
20 @@ -1,6 +1,7 @@
21 DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
22 DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
23 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
24 +DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
25 DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
26 DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
27 DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
28 @@ -9,3 +10,4 @@ DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409
29 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
30 DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de
31 DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
32 +DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
33
34 diff --git a/dev-db/mariadb/mariadb-10.1.11.ebuild b/dev-db/mariadb/mariadb-10.1.11.ebuild
35 new file mode 100644
36 index 0000000..b71db06
37 --- /dev/null
38 +++ b/dev-db/mariadb/mariadb-10.1.11.ebuild
39 @@ -0,0 +1,204 @@
40 +# Copyright 1999-2016 Gentoo Foundation
41 +# Distributed under the terms of the GNU General Public License v2
42 +# $Id$
43 +
44 +EAPI="5"
45 +MY_EXTRAS_VER="20160131-0252Z"
46 +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
47 +WSREP_REVISION="25"
48 +SUBSLOT="18"
49 +MYSQL_PV_MAJOR="5.6"
50 +
51 +inherit toolchain-funcs mysql-multilib-r1
52 +
53 +HOMEPAGE="http://mariadb.org/"
54 +DESCRIPTION="An enhanced, drop-in replacement for MySQL"
55 +
56 +IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
57 +RESTRICT="!bindist? ( bindist )"
58 +
59 +REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
60 +
61 +# REMEMBER: also update eclass/mysql*.eclass before committing!
62 +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"
63 +
64 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
65 +#EPATCH_EXCLUDE=''
66 +
67 +COMMON_DEPEND="
68 + mroonga? ( app-text/groonga-normalizer-mysql )
69 + kerberos? ( virtual/krb5 )
70 + systemd? ( sys-apps/systemd:= )
71 + !bindist? ( >=sys-libs/readline-4.1:0= )
72 + server? (
73 + cracklib? ( sys-libs/cracklib:0= )
74 + extraengine? (
75 + odbc? ( dev-db/unixODBC:0= )
76 + xml? ( dev-libs/libxml2:2= )
77 + )
78 + innodb-lz4? ( app-arch/lz4 )
79 + innodb-lzo? ( dev-libs/lzo )
80 + innodb-snappy? ( app-arch/snappy )
81 + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
82 + pam? ( virtual/pam:0= )
83 + tokudb? ( app-arch/snappy )
84 + )
85 + >=dev-libs/libpcre-8.35:3=
86 +"
87 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
88 + ${COMMON_DEPEND}"
89 +RDEPEND="${RDEPEND} ${COMMON_DEPEND}
90 + galera? (
91 + sys-apps/iproute2
92 + =sys-cluster/galera-${WSREP_REVISION}*
93 + sst-rsync? ( sys-process/lsof )
94 + sst-xtrabackup? ( net-misc/socat[ssl] )
95 + )
96 + perl? ( !dev-db/mytop
97 + virtual/perl-Getopt-Long
98 + dev-perl/TermReadKey
99 + virtual/perl-Term-ANSIColor
100 + virtual/perl-Time-HiRes )
101 +"
102 +# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
103 +PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
104 +
105 +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
106 +
107 +src_configure(){
108 + # bug 508724 mariadb cannot use ld.gold
109 + tc-ld-disable-gold
110 +
111 + local MYSQL_CMAKE_NATIVE_DEFINES=(
112 + -DWITH_JEMALLOC=$(usex jemalloc system)
113 + -DWITH_PCRE=system
114 + -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
115 + )
116 + if use server ; then
117 + # Federated{,X} must be treated special otherwise they will not be built as plugins
118 + if ! use extraengine ; then
119 + MYSQL_CMAKE_NATIVE_DEFINES+=(
120 + -DPLUGIN_FEDERATED=NO
121 + -DPLUGIN_FEDERATEDX=NO )
122 + fi
123 +
124 + MYSQL_CMAKE_NATIVE_DEFINES+=(
125 + -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
126 + -DPLUGIN_SPHINX=$(usex sphinx YES NO)
127 + -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
128 + -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
129 + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
130 + -DPLUGIN_CASSANDRA=NO
131 + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
132 + -DPLUGIN_SPIDER=$(usex extraengine YES NO)
133 + -DPLUGIN_CONNECT=$(usex extraengine YES NO)
134 + -DCONNECT_WITH_MYSQL=1
135 + -DCONNECT_WITH_LIBXML2=$(usex xml)
136 + -DCONNECT_WITH_ODBC=$(usex odbc)
137 + -DWITH_WSREP=$(usex galera)
138 + -DWITH_INNODB_LZ4=$(usex innodb-lz4)
139 + -DWITH_INNODB_LZO=$(usex innodb-lzo)
140 + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
141 + -DPLUGIN_MROONGA=$(usex mroonga YES NO)
142 + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
143 + )
144 + fi
145 + mysql-multilib-r1_src_configure
146 +}
147 +
148 +# Official test instructions:
149 +# USE='embedded extraengine perl server openssl static-libs' \
150 +# FEATURES='test userpriv -usersandbox' \
151 +# ebuild mariadb-X.X.XX.ebuild \
152 +# digest clean package
153 +multilib_src_test() {
154 +
155 + if ! multilib_is_native_abi ; then
156 + einfo "Server tests not available on non-native abi".
157 + return 0;
158 + fi
159 +
160 + local TESTDIR="${BUILD_DIR}/mysql-test"
161 + local retstatus_unit
162 + local retstatus_tests
163 +
164 + if use server ; then
165 +
166 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
167 + # localhost. Also causes weird failures.
168 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
169 +
170 + if [[ $UID -eq 0 ]]; then
171 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
172 + fi
173 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
174 +
175 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
176 + addpredict /this-dir-does-not-exist/t9.MYI
177 +
178 + # Run CTest (test-units)
179 + cmake-utils_src_test
180 + retstatus_unit=$?
181 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
182 +
183 + # Ensure that parallel runs don't die
184 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
185 + # Enable parallel testing, auto will try to detect number of cores
186 + # You may set this by hand.
187 + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
188 + export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
189 +
190 + # create directories because mysqladmin might run out of order
191 + mkdir -p "${T}"/var-tests{,/log}
192 +
193 + # These are failing in MariaDB 10.0 for now and are believed to be
194 + # false positives:
195 + #
196 + # main.information_schema, binlog.binlog_statement_insert_delayed,
197 + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
198 + # funcs_1.is_columns_mysql main.bootstrap
199 + # fails due to USE=-latin1 / utf8 default
200 + #
201 + # main.mysql_client_test, main.mysql_client_test_nonblock
202 + # main.mysql_client_test_comp:
203 + # segfaults at random under Portage only, suspect resource limits.
204 + #
205 + # plugins.cracklib_password_check
206 + # Can randomly fail due to cracklib return message
207 +
208 + for t in main.mysql_client_test main.mysql_client_test_nonblock \
209 + main.mysql_client_test_comp main.bootstrap \
210 + binlog.binlog_statement_insert_delayed main.information_schema \
211 + main.mysqld--help plugins.cracklib_password_check \
212 + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
213 + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
214 + done
215 +
216 + # Run mysql tests
217 + pushd "${TESTDIR}" || die
218 +
219 + # run mysql-test tests
220 + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
221 +
222 + retstatus_tests=$?
223 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
224 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
225 +
226 + popd || die
227 +
228 + # Cleanup is important for these testcases.
229 + pkill -9 -f "${S}/ndb" 2>/dev/null
230 + pkill -9 -f "${S}/sql" 2>/dev/null
231 +
232 + failures=""
233 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
234 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
235 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
236 +
237 + [[ -z "$failures" ]] || die "Test failures: $failures"
238 + einfo "Tests successfully completed"
239 +
240 + else
241 + einfo "Skipping server tests due to minimal build."
242 + fi
243 +}