Gentoo Archives: gentoo-commits

From: "Brian Evans (grknight)" <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/mysql: mysql-5.6.26.ebuild mysql-5.6.26-r1.ebuild ChangeLog
Date: Thu, 30 Jul 2015 04:26:38
Message-Id: 20150730042627.ABF15113@oystercatcher.gentoo.org
1 grknight 15/07/30 04:26:27
2
3 Modified: ChangeLog
4 Added: mysql-5.6.26.ebuild mysql-5.6.26-r1.ebuild
5 Log:
6 Version bump for 5.6 series
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)
9
10 Revision Changes Path
11 1.744 dev-db/mysql/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.744&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.744&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?r1=1.743&r2=1.744
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v
20 retrieving revision 1.743
21 retrieving revision 1.744
22 diff -u -r1.743 -r1.744
23 --- ChangeLog 29 Jul 2015 19:16:20 -0000 1.743
24 +++ ChangeLog 30 Jul 2015 04:26:27 -0000 1.744
25 @@ -1,6 +1,13 @@
26 # ChangeLog for dev-db/mysql
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.743 2015/07/29 19:16:20 grknight Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.744 2015/07/30 04:26:27 grknight Exp $
30 +
31 +*mysql-5.6.26 (30 Jul 2015)
32 +*mysql-5.6.26-r1 (30 Jul 2015)
33 +
34 + 30 Jul 2015; Brian Evans <grknight@g.o> +mysql-5.6.26-r1.ebuild,
35 + +mysql-5.6.26.ebuild:
36 + Version bump for 5.6 series
37
38 29 Jul 2015; Brian Evans <grknight@g.o> -mysql-5.5.43.ebuild:
39 Drop vulernable 5.5. version wrt Bug 555478
40
41
42
43 1.1 dev-db/mysql/mysql-5.6.26.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild?rev=1.1&content-type=text/plain
47
48 Index: mysql-5.6.26.ebuild
49 ===================================================================
50 # Copyright 1999-2015 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild,v 1.1 2015/07/30 04:26:27 grknight Exp $
53
54 EAPI="5"
55
56 MY_EXTRAS_VER="20150410-1944Z"
57 MY_PV="${PV//_alpha_pre/-m}"
58 MY_PV="${MY_PV//_/-}"
59 SUBSLOT="18"
60
61 inherit toolchain-funcs mysql-multilib
62 # only to make repoman happy. it is really set in the eclass
63 IUSE="$IUSE"
64
65 # REMEMBER: also update eclass/mysql*.eclass before committing!
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
67
68 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
69 EPATCH_EXCLUDE=''
70
71 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
72 RDEPEND="${RDEPEND}"
73
74 # Please do not add a naive src_unpack to this ebuild
75 # If you want to add a single patch, copy the ebuild to an overlay
76 # and create your own mysql-extras tarball, looking at 000_index.txt
77
78 src_configure() {
79 # validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
80 # disable until we see what happens with it
81 local mycmakeargs
82 mycmakeargs+=( -DWITHOUT_VALIDATE_PASSWORD=1 )
83 mysql-multilib_src_configure
84 }
85
86 # Official test instructions:
87 # USE='embedded extraengine perl ssl static-libs community' \
88 # FEATURES='test userpriv -usersandbox' \
89 # ebuild mysql-X.X.XX.ebuild \
90 # digest clean package
91 multilib_src_test() {
92
93 if ! multilib_is_native_abi ; then
94 einfo "Server tests not available on non-native abi".
95 return 0;
96 fi
97
98 local TESTDIR="${BUILD_DIR}/mysql-test"
99 local retstatus_unit
100 local retstatus_tests
101
102 # Bug #213475 - MySQL _will_ object strenously if your machine is named
103 # localhost. Also causes weird failures.
104 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
105
106 if ! use "minimal" ; then
107
108 if [[ $UID -eq 0 ]]; then
109 die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
110 fi
111 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
112
113 einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
114 addpredict /this-dir-does-not-exist/t9.MYI
115
116 # Run CTest (test-units)
117 cmake-utils_src_test
118 retstatus_unit=$?
119 [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
120
121 # Ensure that parallel runs don't die
122 export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
123 # Enable parallel testing, auto will try to detect number of cores
124 # You may set this by hand.
125 # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
126 export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
127
128 # create directories because mysqladmin might right out of order
129 mkdir -p "${T}"/var-tests{,/log}
130
131 # create symlink for the tests to find mysql_tzinfo_to_sql
132 ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
133
134 # These are failing in MySQL 5.5/5.6 for now and are believed to be
135 # false positives:
136 #
137 # main.information_schema, binlog.binlog_statement_insert_delayed,
138 # funcs_1.is_triggers funcs_1.is_tables_mysql,
139 # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
140 # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
141 # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
142 # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
143 # fails due to USE=-latin1 / utf8 default
144 #
145 # main.mysql_client_test:
146 # segfaults at random under Portage only, suspect resource limits.
147 #
148 # rpl.rpl_plugin_load
149 # fails due to included file not listed in expected result
150 # appears to be poor planning
151 #
152 # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
153 # fails due to bad cleanup of previous tests when run in parallel
154 # The tool is deprecated anyway
155 # Bug 532288
156 for t in \
157 binlog.binlog_mysqlbinlog_filter \
158 binlog.binlog_statement_insert_delayed \
159 funcs_1.is_columns_mysql \
160 funcs_1.is_tables_mysql \
161 funcs_1.is_triggers \
162 main.information_schema \
163 main.mysql_client_test \
164 main.mysqld--help-notwin \
165 perfschema.binlog_edge_mix \
166 perfschema.binlog_edge_stmt \
167 rpl.rpl_plugin_load \
168 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
169 ; do
170 mysql-multilib_disable_test "$t" "False positives in Gentoo"
171 done
172
173 if ! use extraengine ; then
174 # bug 401673, 530766
175 for t in federated.federated_plugin ; do
176 mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
177 done
178 fi
179
180 # Run mysql tests
181 pushd "${TESTDIR}"
182
183 # Set file limits higher so tests run
184 ulimit -n 3000
185
186 # run mysql-test tests
187 perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
188 --suite-timeout=5000 --reorder
189 retstatus_tests=$?
190 [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
191 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
192
193 popd
194
195 # Cleanup is important for these testcases.
196 pkill -9 -f "${S}/ndb" 2>/dev/null
197 pkill -9 -f "${S}/sql" 2>/dev/null
198
199 failures=""
200 [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
201 [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
202 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
203
204 [[ -z "$failures" ]] || die "Test failures: $failures"
205 einfo "Tests successfully completed"
206
207 else
208
209 einfo "Skipping server tests due to minimal build."
210 fi
211 }
212
213
214
215 1.1 dev-db/mysql/mysql-5.6.26-r1.ebuild
216
217 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild?rev=1.1&view=markup
218 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild?rev=1.1&content-type=text/plain
219
220 Index: mysql-5.6.26-r1.ebuild
221 ===================================================================
222 # Copyright 1999-2015 Gentoo Foundation
223 # Distributed under the terms of the GNU General Public License v2
224 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.1 2015/07/30 04:26:27 grknight Exp $
225
226 EAPI="5"
227
228 MY_EXTRAS_VER="20150717-1707Z"
229 MY_PV="${PV//_alpha_pre/-m}"
230 MY_PV="${MY_PV//_/-}"
231 HAS_TOOLS_PATCH="1"
232 SUBSLOT="18"
233
234 inherit toolchain-funcs mysql-multilib
235 # only to make repoman happy. it is really set in the eclass
236 IUSE="$IUSE"
237
238 # REMEMBER: also update eclass/mysql*.eclass before committing!
239 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
240
241 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
242 EPATCH_EXCLUDE=''
243
244 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
245 RDEPEND="${RDEPEND}"
246
247 # Please do not add a naive src_unpack to this ebuild
248 # If you want to add a single patch, copy the ebuild to an overlay
249 # and create your own mysql-extras tarball, looking at 000_index.txt
250
251 src_configure() {
252 # validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
253 # disable until we see what happens with it
254 local mycmakeargs
255 mycmakeargs+=( -DWITHOUT_VALIDATE_PASSWORD=1 )
256 mysql-multilib_src_configure
257 }
258
259 # Official test instructions:
260 # USE='server embedded extraengine perl ssl static-libs community' \
261 # FEATURES='test userpriv -usersandbox' \
262 # ebuild mysql-X.X.XX.ebuild \
263 # digest clean package
264 multilib_src_test() {
265
266 if ! multilib_is_native_abi ; then
267 einfo "Server tests not available on non-native abi".
268 return 0;
269 fi
270
271 local TESTDIR="${BUILD_DIR}/mysql-test"
272 local retstatus_unit
273 local retstatus_tests
274
275 # Bug #213475 - MySQL _will_ object strenously if your machine is named
276 # localhost. Also causes weird failures.
277 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
278
279 if use server ; then
280
281 if [[ $UID -eq 0 ]]; then
282 die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
283 fi
284 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
285
286 einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
287 addpredict /this-dir-does-not-exist/t9.MYI
288
289 # Run CTest (test-units)
290 cmake-utils_src_test
291 retstatus_unit=$?
292 [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
293
294 # Create a symlink to provided binaries so the tests can find them when client-libs is off
295 if ! use client-libs ; then
296 ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
297 ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
298 mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
299 fi
300
301 # Ensure that parallel runs don't die
302 export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
303 # Enable parallel testing, auto will try to detect number of cores
304 # You may set this by hand.
305 # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
306 export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
307
308 # create directories because mysqladmin might right out of order
309 mkdir -p "${T}"/var-tests{,/log}
310
311 # create symlink for the tests to find mysql_tzinfo_to_sql
312 ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
313
314 # These are failing in MySQL 5.5/5.6 for now and are believed to be
315 # false positives:
316 #
317 # main.information_schema, binlog.binlog_statement_insert_delayed,
318 # funcs_1.is_triggers funcs_1.is_tables_mysql,
319 # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
320 # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
321 # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
322 # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
323 # fails due to USE=-latin1 / utf8 default
324 #
325 # main.mysql_client_test:
326 # segfaults at random under Portage only, suspect resource limits.
327 #
328 # rpl.rpl_plugin_load
329 # fails due to included file not listed in expected result
330 # appears to be poor planning
331 #
332 # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
333 # fails due to bad cleanup of previous tests when run in parallel
334 # The tool is deprecated anyway
335 # Bug 532288
336 for t in \
337 binlog.binlog_mysqlbinlog_filter \
338 binlog.binlog_statement_insert_delayed \
339 funcs_1.is_columns_mysql \
340 funcs_1.is_tables_mysql \
341 funcs_1.is_triggers \
342 main.information_schema \
343 main.mysql_client_test \
344 main.mysqld--help-notwin \
345 perfschema.binlog_edge_mix \
346 perfschema.binlog_edge_stmt \
347 rpl.rpl_plugin_load \
348 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
349 ; do
350 mysql-multilib_disable_test "$t" "False positives in Gentoo"
351 done
352
353 if ! use extraengine ; then
354 # bug 401673, 530766
355 for t in federated.federated_plugin ; do
356 mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
357 done
358 fi
359
360 # Run mysql tests
361 pushd "${TESTDIR}"
362
363 # Set file limits higher so tests run
364 ulimit -n 3000
365
366 # run mysql-test tests
367 perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
368 --suite-timeout=5000 --reorder
369 retstatus_tests=$?
370 [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
371 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
372
373 popd
374
375 # Cleanup is important for these testcases.
376 pkill -9 -f "${S}/ndb" 2>/dev/null
377 pkill -9 -f "${S}/sql" 2>/dev/null
378
379 failures=""
380 [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
381 [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
382 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
383
384 [[ -z "$failures" ]] || die "Test failures: $failures"
385 einfo "Tests successfully completed"
386
387 else
388 einfo "Skipping server tests due to minimal build."
389 fi
390 }