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: Sun, 28 May 2017 23:27:14
Message-Id: 1496014013.899bac7f1cba22db87f7786f0b6409385af3e091.grknight@gentoo
1 commit: 899bac7f1cba22db87f7786f0b6409385af3e091
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 28 23:26:53 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sun May 28 23:26:53 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=899bac7f
7
8 dev-db/mariadb: Version bump to 10.2.6 GA
9
10 Needs refinement and lots of testing
11
12 Package-Manager: Portage-2.3.6, Repoman-2.3.2
13 Manifest-Sign-Key: D1F781EFF9F4A3B6
14
15 dev-db/mariadb/ChangeLog | 6 +
16 dev-db/mariadb/Manifest | 27 ++--
17 dev-db/mariadb/mariadb-10.2.6.ebuild | 242 +++++++++++++++++++++++++++++++++++
18 3 files changed, 262 insertions(+), 13 deletions(-)
19
20 diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
21 index d366a03..ffea8ea 100644
22 --- a/dev-db/mariadb/ChangeLog
23 +++ b/dev-db/mariadb/ChangeLog
24 @@ -2,6 +2,12 @@
25 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
26 # $Id$
27
28 +*mariadb-10.2.6 (28 May 2017)
29 +
30 + 28 May 2017; Brian Evans <grknight@g.o> +mariadb-10.2.6.ebuild:
31 + dev-db/mariadb: Version bump to 10.2.6 GA Needs refinement and lots of
32 + testing
33 +
34 02 May 2017; Brian Evans <grknight@g.o> mariadb-10.2.2.ebuild,
35 mariadb-10.2.4.ebuild, mariadb-10.2.5.ebuild:
36 dev-db/mariadb: Remove failed MYSLOT experiment
37
38 diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
39 index 3c9b43a..293ae9c 100644
40 --- a/dev-db/mariadb/Manifest
41 +++ b/dev-db/mariadb/Manifest
42 @@ -9,6 +9,7 @@ DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8
43 DIST mariadb-10.2.2.tar.gz 62683612 SHA256 55cf9e357ae4511fc1330e7cb8a15746d99b3a7875b6da9bcf1acfb1aa6f893a SHA512 f1d0671e31db2f3aef86c26d9dd8765732e609e7d5ea9c1a452fb0f42cf449bfd17c80a4d11f8bf64074b6536070602e11cedb16b0f36acf1c9e889f0c106e4e WHIRLPOOL b9117275adff53c44fa81b255324d806c9f4dcbfd4f40c3b0cd2fd50d898207617e35543e3aab32104a5151ec290ed79ecd25793271b860f5bb05abd29064db7
44 DIST mariadb-10.2.4.tar.gz 63235247 SHA256 b73e353c29a0171d1057f14191c83d1f17e6f58ca09a79dda4b12c0e12b7f975 SHA512 bb6b35b6abd834d4ce2e27f4e06abbf790769e3d56b89d25d06126c21abb1bcce3d8f19c49e2c2052bf89e5ebc3c67c5092dfb25577870f8f561ce87777367ae WHIRLPOOL e2ba3b38e80b47dcca02e741ecc91ec8a1f96d72836422fb890be6d4ffa9cfebcd85c09bf11b1a492ad1edd9923299ff516b0428564c33ac0482c0443229a5f9
45 DIST mariadb-10.2.5.tar.gz 67183039 SHA256 6629bd2392ccba2fb30ce3a27efddba1f695ac739538007ad1d15caeed19ff50 SHA512 1a1911266110e86ef93aad73521d9ddde154357613a6ea7198cc1409aa4532998ddda69d64abcde2a6cf6b8c38c29bf730a6605253fb0f43d5bd4e1db48ed50e WHIRLPOOL d544341ade0705980fc72acdf97428100d5439ed6f2ca747d0fe291d85f597b7bd54e8c162a4771e042e3f31eb6c1ded473f31b5f233e84dec1095d16547ddb7
46 +DIST mariadb-10.2.6.tar.gz 67599197 SHA256 c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 SHA512 142628085f42ef15ceef6aca5e47ba56cc38cbfc0ac4f35f6b37512c14a60430ef4805e54fd51c47e101b7692781e174426bdb49cae6807c4c18cc3d876f8732 WHIRLPOOL e5920a6f0833fa39b706b067037fb6e432e77ba4e7beee51300e408c92cf5962db91013b1958e649947006f0ac2775c70996d9c7f0dcd98d3b40e87ae5abc049
47 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
48 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
49 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
50 @@ -20,19 +21,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d
51 -----BEGIN PGP SIGNATURE-----
52 Version: GnuPG v2
53
54 -iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkH6BJfFIAAAAAALgAo
55 +iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrXLpfFIAAAAAALgAo
56 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
57 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
58 -o7bgORAA1EXfSPk8v+zk8aM4ARnDhhT499Y0TQTgmpDC5lvc09j8nZa1CQrYoNcc
59 -dBGB02LvlELfoCu9oGQHSc2wSyx3B66nfFLEhBFPtDu5ib2LnigubO46zcAB0CLB
60 -FUWZHEN7m3kkpBV1m6NIJoqx1QIc6H+62mRxO/ofMcP9McFFQ2bKi+XJps8857xJ
61 -WFFvaVi+OaFjyrvIbUJa638+OMfNVJKGvvEQRHNgimp8vrV7vdlGbBLSzsvbf6e9
62 -AqslDTXQ08+1KBIxHdz1aJaltwS66U+qQKoef77vhCWP6l9HP4KhcHB4AUtcBacp
63 -RbGe9X9E+49D3XpkB1j5vAqFDHCrlTt0C64DNJ5cw7fmXr+gtT/Qn2PPyMp1le9g
64 -9MZmtlfp/d4vrZ1t3qaqeAlY0yl1uLpVR97RjwCLxva9LFdMzK0M+houPVmaLZEL
65 -/AIWjUhPZa77DfYaLoRmUbLSaqAL24u8Myk6JIiGmcELuhC1glio2PKwsmFxk57/
66 -NerjvVzsZziVSFhVSIwA4JD0VBocJo+Dm2iQM3wqZ7DN1pVHm/qRsSquPnXKHvcw
67 -OQ+05ZvdI5g+3q/VS7tbr/mjM/9aADTadrQigyksiLVLfHm2QvrVVrlXNAqO9MGD
68 -uOjjfxmbrFHpk1VGa7t3Q4iQskPFbFnhDfXESNqskatC/lu7/zM=
69 -=zLXQ
70 +o7aHRw/3bnUIu2LKwPhI/RguY9izGM7lcaysGe/cMJfYNqSupJhBJTlfEmdQt6Ct
71 +9rRQbsaQQvFA+3RkdhUxqHojHLw4Zf9DYLNldhlvQbSWETTne8K1xwz1vHZ46B3q
72 +md1QObh/RWj70/0fwF+7rDMfAFdMJuV+4rHVV6hSgc56EDCjz4LNUpCQ/vSByYcc
73 +gjfOiwZFDfElNpaFXXZwv/XX9ioti/dcan8m4XjolrFWTFE0lRRVNviXgBzJODPO
74 +QyvPsrrtN9Zcx58kpW9rGlSTxr+LLRCKWxwicw53bdiwGxe1ibt03mEqOgGIIDuO
75 +TQvYNg2bHMknqIjYag6NEHMqszm0ThEYJNV/aKj/fRzrap3BDZ76CkiVWL2REmcx
76 +MYb7ItNnyfR8yLiHXfayUTZ8R6kWGbkcJVBDC+nwyNDO9RromrKWl5fKQRX53KAY
77 +9QDRdJ10epfNzUajdQ+EkX9yFr6IQEqYNsxIfSCzxUqDa38UarNgWGMSLt2DVKb0
78 +HZMr5CyRRTdmwLhy/SJdlwhgvuErsABWaVBA37wXLFewbCHp2fShcz573vlmjlKw
79 +HEuDJIynxgUxyPpjA3eB4fFP7HpB+lREqCSe3+JJPyIZJ3glUHVWO4EYTe9lDHhF
80 +VxAGnPSL/fYxZDE4NrUgrwkpLRP1gWIeqvZJVWL9bxM0/AGA8Q==
81 +=zvn5
82 -----END PGP SIGNATURE-----
83
84 diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
85 new file mode 100644
86 index 0000000..d19c155
87 --- /dev/null
88 +++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
89 @@ -0,0 +1,242 @@
90 +# Copyright 1999-2017 Gentoo Foundation
91 +# Distributed under the terms of the GNU General Public License v2
92 +
93 +EAPI="6"
94 +MY_EXTRAS_VER="20160131-0252Z"
95 +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
96 +WSREP_REVISION="25"
97 +SUBSLOT="19"
98 +MYSQL_PV_MAJOR="5.6"
99 +
100 +inherit toolchain-funcs mysql-multilib-r1
101 +
102 +HOMEPAGE="http://mariadb.org/"
103 +DESCRIPTION="An enhanced, drop-in replacement for MySQL"
104 +LICENSE="GPL-2 LGPL-2.1+"
105 +
106 +IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
107 +RESTRICT="!bindist? ( bindist )"
108 +
109 +REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
110 +
111 +# REMEMBER: also update eclass/mysql*.eclass before committing!
112 +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"
113 +
114 +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
115 +
116 +# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
117 +# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
118 +# "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.2-without-clientlibs-tools.patch
119 +PATCHES=(
120 + "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
121 +)
122 +
123 +COMMON_DEPEND="
124 + mroonga? ( app-text/groonga-normalizer-mysql )
125 + kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
126 + systemd? ( sys-apps/systemd:= )
127 + !bindist? (
128 + sys-libs/binutils-libs:0=
129 + >=sys-libs/readline-4.1:0=
130 + )
131 + server? (
132 + cracklib? ( sys-libs/cracklib:0= )
133 + extraengine? (
134 + odbc? ( dev-db/unixODBC:0= )
135 + xml? ( dev-libs/libxml2:2= )
136 + )
137 + innodb-lz4? ( app-arch/lz4 )
138 + innodb-lzo? ( dev-libs/lzo )
139 + innodb-snappy? ( app-arch/snappy )
140 + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
141 + pam? ( virtual/pam:0= )
142 + tokudb? ( app-arch/snappy )
143 + )
144 + >=dev-libs/libpcre-8.35:3=
145 +"
146 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
147 + ${COMMON_DEPEND}"
148 +RDEPEND="${RDEPEND} ${COMMON_DEPEND}
149 + server? ( galera? (
150 + sys-apps/iproute2
151 + =sys-cluster/galera-${WSREP_REVISION}*
152 + sst-rsync? ( sys-process/lsof )
153 + sst-xtrabackup? ( net-misc/socat[ssl] )
154 + ) )
155 + perl? ( !dev-db/mytop
156 + virtual/perl-Getopt-Long
157 + dev-perl/TermReadKey
158 + virtual/perl-Term-ANSIColor
159 + virtual/perl-Time-HiRes )
160 +"
161 +# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
162 +PDEPEND="server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
163 +
164 +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
165 + /usr/include/mariadb/mariadb_version.h
166 + /usr/include/mysql/private/probes_mysql_nodtrace.h
167 + /usr/include/mysql/private/probes_mysql_dtrace.h )
168 +MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
169 +
170 +src_configure(){
171 + # bug 508724 mariadb cannot use ld.gold
172 + tc-ld-disable-gold
173 +
174 + local MYSQL_CMAKE_NATIVE_DEFINES=(
175 + -DWITH_JEMALLOC=$(usex jemalloc system)
176 + -DWITH_PCRE=system
177 + )
178 + local MYSQL_CMAKE_EXTRA_DEFINES=(
179 + -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos ON OFF)
180 + -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
181 + -DCONC_WITH_EXTERNAL_ZLIB=YES
182 + -DWITH_EXTERNAL_ZLIB=YES
183 + -DSUFFIX_INSTALL_DIR=""
184 + -DINSTALL_INCLUDEDIR=include/mariadb
185 + -DINSTALL_INFODIR=share/info
186 + -DINSTALL_LIBDIR=$(get_libdir)
187 + -DINSTALL_ELIBDIR=$(get_libdir)/mariadb
188 + -DINSTALL_MANDIR=share/man
189 + -DINSTALL_MYSQLSHAREDIR=share/mariadb
190 + -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
191 + -DINSTALL_SCRIPTDIR=share/mariadb/scripts
192 + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
193 + )
194 +
195 + if use test ; then
196 + MYSQL_CMAKE_EXTRA_DEFINES+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
197 + fi
198 +
199 + if use server ; then
200 + # Federated{,X} must be treated special otherwise they will not be built as plugins
201 + if ! use extraengine ; then
202 + MYSQL_CMAKE_NATIVE_DEFINES+=(
203 + -DPLUGIN_FEDERATED=NO
204 + -DPLUGIN_FEDERATEDX=NO )
205 + fi
206 +
207 + MYSQL_CMAKE_NATIVE_DEFINES+=(
208 + -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
209 + -DPLUGIN_SPHINX=$(usex sphinx YES NO)
210 + -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
211 + -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
212 + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
213 + -DPLUGIN_CASSANDRA=NO
214 + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
215 + -DPLUGIN_SPIDER=$(usex extraengine YES NO)
216 + -DPLUGIN_CONNECT=$(usex extraengine YES NO)
217 + -DCONNECT_WITH_MYSQL=1
218 + -DCONNECT_WITH_LIBXML2=$(usex xml)
219 + -DCONNECT_WITH_ODBC=$(usex odbc)
220 + -DWITH_WSREP=$(usex galera)
221 + -DWITH_INNODB_LZ4=$(usex innodb-lz4)
222 + -DWITH_INNODB_LZO=$(usex innodb-lzo)
223 + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
224 + -DPLUGIN_MROONGA=$(usex mroonga YES NO)
225 + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
226 + -DINSTALL_SQLBENCHDIR=share/mariadb
227 + )
228 + fi
229 + mysql-multilib-r1_src_configure
230 +}
231 +
232 +# Official test instructions:
233 +# USE='embedded extraengine perl server openssl static-libs' \
234 +# FEATURES='test userpriv -usersandbox' \
235 +# ebuild mariadb-X.X.XX.ebuild \
236 +# digest clean package
237 +multilib_src_test() {
238 +
239 + if ! multilib_is_native_abi ; then
240 + einfo "Server tests not available on non-native abi".
241 + return 0;
242 + fi
243 +
244 + local TESTDIR="${BUILD_DIR}/mysql-test"
245 + local retstatus_unit
246 + local retstatus_tests
247 +
248 + if use server ; then
249 +
250 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
251 + # localhost. Also causes weird failures.
252 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
253 +
254 + if [[ $UID -eq 0 ]]; then
255 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
256 + fi
257 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
258 +
259 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
260 + addpredict /this-dir-does-not-exist/t9.MYI
261 +
262 + # Run CTest (test-units)
263 + cmake-utils_src_test
264 + retstatus_unit=$?
265 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
266 +
267 + # Ensure that parallel runs don't die
268 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
269 + # Enable parallel testing, auto will try to detect number of cores
270 + # You may set this by hand.
271 + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
272 + export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
273 +
274 + # create directories because mysqladmin might run out of order
275 + mkdir -p "${T}"/var-tests{,/log}
276 +
277 + # These are failing in MariaDB 10.0 for now and are believed to be
278 + # false positives:
279 + #
280 + # main.information_schema, binlog.binlog_statement_insert_delayed,
281 + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
282 + # funcs_1.is_columns_mysql main.bootstrap
283 + # fails due to USE=-latin1 / utf8 default
284 + #
285 + # main.mysql_client_test, main.mysql_client_test_nonblock
286 + # main.mysql_client_test_comp:
287 + # segfaults at random under Portage only, suspect resource limits.
288 + #
289 + # plugins.cracklib_password_check
290 + # Can randomly fail due to cracklib return message
291 + #
292 + # plugins.two_password_validations
293 + # Varying policies make it unsuitable for automated testing
294 +
295 + for t in main.mysql_client_test main.mysql_client_test_nonblock \
296 + main.mysql_client_test_comp main.bootstrap \
297 + binlog.binlog_statement_insert_delayed main.information_schema \
298 + main.mysqld--help plugins.cracklib_password_check \
299 + plugins.two_password_validations \
300 + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
301 + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
302 + done
303 +
304 + # Run mysql tests
305 + pushd "${TESTDIR}" || die
306 +
307 + # run mysql-test tests
308 + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
309 +
310 + retstatus_tests=$?
311 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
312 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
313 +
314 + popd || die
315 +
316 + # Cleanup is important for these testcases.
317 + pkill -9 -f "${S}/ndb" 2>/dev/null
318 + pkill -9 -f "${S}/sql" 2>/dev/null
319 +
320 + failures=""
321 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
322 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
323 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
324 +
325 + [[ -z "$failures" ]] || die "Test failures: $failures"
326 + einfo "Tests successfully completed"
327 +
328 + else
329 + einfo "Skipping server tests due to minimal build."
330 + fi
331 +}