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.5.39.ebuild mysql-5.6.20.ebuild ChangeLog mysql-5.6.19.ebuild mysql-5.5.38-r1.ebuild
Date: Sat, 02 Aug 2014 00:23:49
Message-Id: 20140802002343.347132004E@flycatcher.gentoo.org
1 grknight 14/08/02 00:23:42
2
3 Modified: ChangeLog
4 Added: mysql-5.5.39.ebuild mysql-5.6.20.ebuild
5 Removed: mysql-5.6.19.ebuild mysql-5.5.38-r1.ebuild
6 Log:
7 Version bump for security bug 518718. Drop old
8
9 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
10
11 Revision Changes Path
12 1.675 dev-db/mysql/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.675&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.675&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?r1=1.674&r2=1.675
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v
21 retrieving revision 1.674
22 retrieving revision 1.675
23 diff -u -r1.674 -r1.675
24 --- ChangeLog 29 Jul 2014 23:06:42 -0000 1.674
25 +++ ChangeLog 2 Aug 2014 00:23:41 -0000 1.675
26 @@ -1,6 +1,13 @@
27 # ChangeLog for dev-db/mysql
28 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.674 2014/07/29 23:06:42 robbat2 Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.675 2014/08/02 00:23:41 grknight Exp $
31 +
32 +*mysql-5.5.39 (02 Aug 2014)
33 +*mysql-5.6.20 (02 Aug 2014)
34 +
35 + 02 Aug 2014; Brian Evans <grknight@g.o> +mysql-5.5.39.ebuild,
36 + +mysql-5.6.20.ebuild, -mysql-5.5.38-r1.ebuild, -mysql-5.6.19.ebuild:
37 + Version bump for security bug 518718. Drop old
38
39 *mysql-5.6.19 (29 Jul 2014)
40
41
42
43
44 1.1 dev-db/mysql/mysql-5.5.39.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild?rev=1.1&content-type=text/plain
48
49 Index: mysql-5.5.39.ebuild
50 ===================================================================
51 # Copyright 1999-2014 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.1 2014/08/02 00:23:41 grknight Exp $
54
55 EAPI="5"
56
57 MY_EXTRAS_VER="20140801-1950Z"
58 MY_PV="${PV//_alpha_pre/-m}"
59 MY_PV="${MY_PV//_/-}"
60
61 # Build type
62 BUILD="cmake"
63
64 inherit toolchain-funcs mysql-v2
65 # only to make repoman happy. it is really set in the eclass
66 IUSE="$IUSE"
67
68 # Define the mysql-extras source
69 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
70
71 # REMEMBER: also update eclass/mysql*.eclass before committing!
72 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
73
74 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
75 EPATCH_EXCLUDE=''
76
77 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
78 RDEPEND="${RDEPEND}"
79
80 # Please do not add a naive src_unpack to this ebuild
81 # If you want to add a single patch, copy the ebuild to an overlay
82 # and create your own mysql-extras tarball, looking at 000_index.txt
83
84 # Official test instructions:
85 # USE='-cluster embedded extraengine perl ssl static-libs community' \
86 # FEATURES='test userpriv -usersandbox' \
87 # ebuild mysql-X.X.XX.ebuild \
88 # digest clean package
89 src_test() {
90
91 local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
92 local retstatus_unit
93 local retstatus_tests
94
95 # Bug #213475 - MySQL _will_ object strenously if your machine is named
96 # localhost. Also causes weird failures.
97 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
98
99 if ! use "minimal" ; then
100
101 if [[ $UID -eq 0 ]]; then
102 die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
103 fi
104 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
105
106 einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
107 addpredict /this-dir-does-not-exist/t9.MYI
108
109 # Run CTest (test-units)
110 cmake-utils_src_test
111 retstatus_unit=$?
112 [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
113
114 # Ensure that parallel runs don't die
115 export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
116
117 # create directories because mysqladmin might right out of order
118 mkdir -p "${S}"/mysql-test/var-tests{,/log}
119
120 # create symlink for the tests to find mysql_tzinfo_to_sql
121 ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
122
123 # These are failing in MySQL 5.5 for now and are believed to be
124 # false positives:
125 #
126 # main.information_schema, binlog.binlog_statement_insert_delayed,
127 # main.mysqld--help-notwin
128 # fails due to USE=-latin1 / utf8 default
129 #
130 # main.mysql_client_test:
131 # segfaults at random under Portage only, suspect resource limits.
132 #
133 # sys_vars.plugin_dir_basic
134 # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
135 # instead of MYSQL_LIBDIR/plugin
136 #
137 # main.flush_read_lock_kill
138 # fails because of unknown system variable 'DEBUG_SYNC'
139 #
140 # main.openssl_1
141 # error message changing
142 # -mysqltest: Could not open connection 'default': 2026 SSL connection
143 # error: ASN: bad other signature confirmation
144 # +mysqltest: Could not open connection 'default': 2026 SSL connection
145 # error: error:00000001:lib(0):func(0):reason(1)
146 #
147 # main.mysql_tzinfo_to_sql_symlink
148 # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
149
150 for t in main.mysql_client_test \
151 binlog.binlog_statement_insert_delayed main.information_schema \
152 main.mysqld--help-notwin main.flush_read_lock_kill \
153 sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
154 mysql-v2_disable_test "$t" "False positives in Gentoo"
155 done
156
157 # Run mysql tests
158 pushd "${TESTDIR}"
159
160 # run mysql-test tests
161 perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
162 --testcase-timeout=30
163 retstatus_tests=$?
164 [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
165 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
166
167 popd
168
169 # Cleanup is important for these testcases.
170 pkill -9 -f "${S}/ndb" 2>/dev/null
171 pkill -9 -f "${S}/sql" 2>/dev/null
172
173 failures=""
174 [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
175 [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
176 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
177
178 [[ -z "$failures" ]] || die "Test failures: $failures"
179 einfo "Tests successfully completed"
180
181 else
182
183 einfo "Skipping server tests due to minimal build."
184 fi
185 }
186
187
188
189 1.1 dev-db/mysql/mysql-5.6.20.ebuild
190
191 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild?rev=1.1&view=markup
192 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild?rev=1.1&content-type=text/plain
193
194 Index: mysql-5.6.20.ebuild
195 ===================================================================
196 # Copyright 1999-2014 Gentoo Foundation
197 # Distributed under the terms of the GNU General Public License v2
198 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild,v 1.1 2014/08/02 00:23:41 grknight Exp $
199
200 EAPI="5"
201
202 MY_EXTRAS_VER="20140801-1950Z"
203 MY_PV="${PV//_alpha_pre/-m}"
204 MY_PV="${MY_PV//_/-}"
205
206 # Build type
207 BUILD="cmake"
208
209 inherit toolchain-funcs mysql-v2
210 # only to make repoman happy. it is really set in the eclass
211 IUSE="$IUSE"
212
213 # Define the mysql-extras source
214 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
215
216 # REMEMBER: also update eclass/mysql*.eclass before committing!
217 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
218
219 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
220 EPATCH_EXCLUDE=''
221
222 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
223 RDEPEND="${RDEPEND}"
224
225 # Please do not add a naive src_unpack to this ebuild
226 # If you want to add a single patch, copy the ebuild to an overlay
227 # and create your own mysql-extras tarball, looking at 000_index.txt
228
229 # Official test instructions:
230 # USE='-cluster embedded extraengine perl ssl static-libs community' \
231 # FEATURES='test userpriv -usersandbox' \
232 # ebuild mysql-X.X.XX.ebuild \
233 # digest clean package
234 src_test() {
235
236 local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
237 local retstatus_unit
238 local retstatus_tests
239
240 # Bug #213475 - MySQL _will_ object strenously if your machine is named
241 # localhost. Also causes weird failures.
242 [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
243
244 if ! use "minimal" ; then
245
246 if [[ $UID -eq 0 ]]; then
247 die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
248 fi
249 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
250
251 einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
252 addpredict /this-dir-does-not-exist/t9.MYI
253
254 # Run CTest (test-units)
255 cmake-utils_src_test
256 retstatus_unit=$?
257 [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
258
259 # Ensure that parallel runs don't die
260 export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
261
262 # create directories because mysqladmin might right out of order
263 mkdir -p "${S}"/mysql-test/var-tests{,/log}
264
265 # create symlink for the tests to find mysql_tzinfo_to_sql
266 ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
267
268 # These are failing in MySQL 5.5/5.6 for now and are believed to be
269 # false positives:
270 #
271 # main.information_schema, binlog.binlog_statement_insert_delayed,
272 # main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
273 # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
274 # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
275 # mysqld--help-notwin, funcs_1.is_triggers
276 # fails due to USE=-latin1 / utf8 default
277 #
278 # main.mysql_client_test:
279 # segfaults at random under Portage only, suspect resource limits.
280 #
281 # rpl.rpl_plugin_load
282 # fails due to included file not listed in expected result
283 # appears to be poor planning
284 for t in main.mysql_client_test \
285 binlog.binlog_statement_insert_delayed main.information_schema \
286 main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
287 funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
288 perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
289 mysqld--help-notwin rpl.rpl_plugin_load \
290 funcs_1.is_triggers ; do
291 mysql-v2_disable_test "$t" "False positives in Gentoo"
292 done
293
294 # Run mysql tests
295 pushd "${TESTDIR}"
296
297 # Set file limits higher so tests run
298 ulimit -n 3000
299
300 # run mysql-test tests
301 perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
302 --suite-timeout=5000 --parallel=auto
303 retstatus_tests=$?
304 [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
305 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
306
307 popd
308
309 # Cleanup is important for these testcases.
310 pkill -9 -f "${S}/ndb" 2>/dev/null
311 pkill -9 -f "${S}/sql" 2>/dev/null
312
313 failures=""
314 [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
315 [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
316 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
317
318 [[ -z "$failures" ]] || die "Test failures: $failures"
319 einfo "Tests successfully completed"
320
321 else
322
323 einfo "Skipping server tests due to minimal build."
324 fi
325 }