Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-cluster/
Date: Sat, 28 Oct 2017 18:11:28
Message-Id: 1509214259.9ddb39a72d861f16653fd4630f0ae563d26b6601.whissi@gentoo
1 commit: 9ddb39a72d861f16653fd4630f0ae563d26b6601
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 28 18:10:35 2017 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 28 18:10:59 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ddb39a7
7
8 dev-db/mysql-cluster: Security cleanup (bug #635708)
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild | 124 --------------------
13 dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild | 143 -----------------------
14 2 files changed, 267 deletions(-)
15
16 diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
17 deleted file mode 100644
18 index 264df842338..00000000000
19 --- a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
20 +++ /dev/null
21 @@ -1,124 +0,0 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=5
26 -MY_EXTRAS_VER="20151117-2040Z"
27 -BUILD="cmake"
28 -
29 -inherit toolchain-funcs java-pkg-opt-2 mysql-v2
30 -# only to make repoman happy. it is really set in the eclass
31 -IUSE="$IUSE"
32 -
33 -# REMEMBER: also update eclass/mysql*.eclass before committing!
34 -KEYWORDS="~amd64 ~x86"
35 -
36 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
37 -# This is often broken still
38 -#EPATCH_EXCLUDE=''
39 -
40 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
41 -RDEPEND="!media-sound/amarok[embedded]"
42 -
43 -# Please do not add a naive src_unpack to this ebuild
44 -# If you want to add a single patch, copy the ebuild to an overlay
45 -# and create your own mysql-extras tarball, looking at 000_index.txt
46 -
47 -# Official test instructions:
48 -# USE='cluster extraengine perl ssl community' \
49 -# FEATURES='test userpriv -usersandbox' \
50 -# ebuild mysql-cluster-X.X.XX.ebuild \
51 -# digest clean package
52 -src_test() {
53 -
54 - local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
55 - local retstatus_unit
56 - local retstatus_tests
57 -
58 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
59 - # localhost. Also causes weird failures.
60 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
61 -
62 - if ! use "minimal" ; then
63 -
64 - if [[ $UID -eq 0 ]]; then
65 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
66 - fi
67 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
68 -
69 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
70 - addpredict /this-dir-does-not-exist/t9.MYI
71 -
72 - # Run CTest (test-units)
73 - cmake-utils_src_test
74 - retstatus_unit=$?
75 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
76 -
77 - # Ensure that parallel runs don't die
78 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
79 -
80 - # create directories because mysqladmin might right out of order
81 - mkdir -p "${T}"/var-tests{,/log}
82 -
83 - # These are failing in MySQL 5.5 for now and are believed to be
84 - # false positives:
85 - #
86 - # main.information_schema, binlog.binlog_statement_insert_delayed,
87 - # main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
88 - # fails due to USE=-latin1 / utf8 default
89 - #
90 - # main.mysql_client_test:
91 - # segfaults at random under Portage only, suspect resource limits.
92 - #
93 - # sys_vars.plugin_dir_basic
94 - # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
95 - # instead of MYSQL_LIBDIR/plugin
96 - #
97 - # main.flush_read_lock_kill
98 - # fails because of unknown system variable 'DEBUG_SYNC'
99 - #
100 - # main.openssl_1
101 - # error message changing
102 - # -mysqltest: Could not open connection 'default': 2026 SSL connection
103 - # error: ASN: bad other signature confirmation
104 - # +mysqltest: Could not open connection 'default': 2026 SSL connection
105 - # error: error:00000001:lib(0):func(0):reason(1)
106 - #
107 -
108 - for t in main.mysql_client_test \
109 - binlog.binlog_statement_insert_delayed main.information_schema \
110 - main.mysqld--help-notwin main.flush_read_lock_kill \
111 - sys_vars.plugin_dir_basic main.openssl_1 \
112 - main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
113 - ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
114 - mysql-v2_disable_test "$t" "False positives in Gentoo"
115 - done
116 -
117 - # Run mysql tests
118 - pushd "${TESTDIR}"
119 -
120 - # run mysql-test tests
121 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
122 - --parallel=auto
123 - retstatus_tests=$?
124 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
125 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
126 -
127 - popd
128 -
129 - # Cleanup is important for these testcases.
130 - pkill -9 -f "${S}/ndb" 2>/dev/null
131 - pkill -9 -f "${S}/sql" 2>/dev/null
132 -
133 - failures=""
134 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
135 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
136 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
137 -
138 - [[ -z "$failures" ]] || die "Test failures: $failures"
139 - einfo "Tests successfully completed"
140 -
141 - else
142 -
143 - einfo "Skipping server tests due to minimal build."
144 - fi
145 -}
146
147 diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
148 deleted file mode 100644
149 index bb3d2a24421..00000000000
150 --- a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
151 +++ /dev/null
152 @@ -1,143 +0,0 @@
153 -# Copyright 1999-2015 Gentoo Foundation
154 -# Distributed under the terms of the GNU General Public License v2
155 -
156 -EAPI=5
157 -MY_EXTRAS_VER="20151117-2040Z"
158 -SUBSLOT="18"
159 -
160 -inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
161 -# only to make repoman happy. it is really set in the eclass
162 -IUSE="$IUSE"
163 -
164 -# REMEMBER: also update eclass/mysql*.eclass before committing!
165 -KEYWORDS="~amd64 ~x86"
166 -
167 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
168 -# This is often broken still
169 -#EPATCH_EXCLUDE=''
170 -
171 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
172 -RDEPEND="!media-sound/amarok[embedded]"
173 -
174 -# Please do not add a naive src_unpack to this ebuild
175 -# If you want to add a single patch, copy the ebuild to an overlay
176 -# and create your own mysql-extras tarball, looking at 000_index.txt
177 -
178 -src_prepare() {
179 - mysql-multilib_src_prepare
180 - if use libressl ; then
181 - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
182 - "${S}/cmake/ssl.cmake" || die
183 - fi
184 -}
185 -
186 -# Official test instructions:
187 -# USE='extraengine perl openssl' \
188 -# FEATURES='test userpriv -usersandbox' \
189 -# ebuild mysql-cluster-X.X.XX.ebuild \
190 -# digest clean package
191 -multilib_src_test() {
192 -
193 - if ! multilib_is_native_abi ; then
194 - einfo "Server tests not available on non-native abi".
195 - return 0;
196 - fi
197 -
198 - local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
199 - local retstatus_unit
200 - local retstatus_tests
201 -
202 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
203 - # localhost. Also causes weird failures.
204 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
205 -
206 - if ! use "minimal" ; then
207 -
208 - if [[ $UID -eq 0 ]]; then
209 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
210 - fi
211 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
212 -
213 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
214 - addpredict /this-dir-does-not-exist/t9.MYI
215 -
216 - # Run CTest (test-units)
217 - cmake-utils_src_test
218 - retstatus_unit=$?
219 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
220 -
221 - # Ensure that parallel runs don't die
222 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
223 - # Enable parallel testing, auto will try to detect number of cores
224 - # You may set this by hand.
225 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
226 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
227 -
228 - # create directories because mysqladmin might right out of order
229 - mkdir -p "${T}"/var-tests{,/log}
230 -
231 - # These are failing in MySQL 5.5/5.6 for now and are believed to be
232 - # false positives:
233 - #
234 - # main.information_schema, binlog.binlog_statement_insert_delayed,
235 - # main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
236 - # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
237 - # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
238 - # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
239 - # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
240 - # fails due to USE=-latin1 / utf8 default
241 - #
242 - # main.mysql_client_test:
243 - # segfaults at random under Portage only, suspect resource limits.
244 - #
245 - for t in \
246 - binlog.binlog_mysqlbinlog_filter \
247 - binlog.binlog_statement_insert_delayed \
248 - funcs_1.is_columns_mysql \
249 - funcs_1.is_tables_mysql \
250 - funcs_1.is_triggers \
251 - main.information_schema \
252 - main.mysqld--help-notwinfuncs_1.is_triggers \
253 - main.mysql_client_test \
254 - mysqld--help-notwin \
255 - main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
256 - perfschema.binlog_edge_mix \
257 - perfschema.binlog_edge_stmt \
258 - ; do
259 - mysql-multilib_disable_test "$t" "False positives in Gentoo"
260 - done
261 - # ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
262 - for t in \
263 - ndb.ndbinfo \
264 - ndb_binlog.ndb_binlog_index ; do
265 - mysql-multilib_disable_test "$t" "False positives in Gentoo (NDB)"
266 - done
267 -
268 - # Run mysql tests
269 - pushd "${TESTDIR}"
270 -
271 - # run mysql-test tests
272 - perl mysql-test-run.pl --force --vardir="${T}/var-tests"
273 - retstatus_tests=$?
274 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
275 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
276 -
277 - popd
278 -
279 - # Cleanup is important for these testcases.
280 - pkill -9 -f "${S}/ndb" 2>/dev/null
281 - pkill -9 -f "${S}/sql" 2>/dev/null
282 -
283 - failures=""
284 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
285 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
286 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
287 -
288 - [[ -z "$failures" ]] || die "Test failures: $failures"
289 - einfo "Tests successfully completed"
290 -
291 - else
292 -
293 - einfo "Skipping server tests due to minimal build."
294 - fi
295 -}